commit: 54b4acb81dc95c75a9ed8c521dfed50bd9cefa12
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 25 20:54:56 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Jul 25 20:58:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54b4acb8
net-analyzer/suricata: install logrotate files unconditionally
No revbump in order to avoid forcing everyone to reinstall.
Suggested-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
net-analyzer/suricata/metadata.xml | 1 -
net-analyzer/suricata/suricata-5.0.7.ebuild | 11 ++++-------
net-analyzer/suricata/suricata-6.0.3.ebuild | 11 ++++-------
3 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/net-analyzer/suricata/metadata.xml
b/net-analyzer/suricata/metadata.xml
index 457a2fbd2e8..87689ee5189 100644
--- a/net-analyzer/suricata/metadata.xml
+++ b/net-analyzer/suricata/metadata.xml
@@ -12,7 +12,6 @@
<flag name="control-socket">Enable unix socket</flag>
<flag name="cuda">Enable NVIDIA Cuda computations support</flag>
<flag name="detection">Enable detection modules</flag>
- <flag name="logrotate">Install logrotate rule</flag>
<flag name="lz4">Enable support for compressed pcap logging using the LZ4
algorithm</flag>
<flag name="nflog">Enable libnetfilter_log support</flag>
<flag name="nfqueue">Enable NFQUEUE support for inline IDP</flag>
diff --git a/net-analyzer/suricata/suricata-5.0.7.ebuild
b/net-analyzer/suricata/suricata-5.0.7.ebuild
index d8e5826ae3a..50b8ba84db3 100644
--- a/net-analyzer/suricata/suricata-5.0.7.ebuild
+++ b/net-analyzer/suricata/suricata-5.0.7.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz";
LICENSE="GPL-2"
SLOT="0/5"
KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened
logrotate lua lz4 nflog +nfqueue redis systemd test"
+IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened lua
lz4 nflog +nfqueue redis systemd test"
RESTRICT="!test? ( test )"
@@ -43,7 +43,6 @@ RDEPEND="${PYTHON_DEPS}
bpf? ( >=dev-libs/libbpf-0.1.0 )
cuda? ( dev-util/nvidia-cuda-toolkit )
geoip? ( dev-libs/libmaxminddb )
- logrotate? ( app-admin/logrotate )
lua? ( ${LUA_DEPS} )
lz4? ( app-arch/lz4 )
nflog? ( net-libs/libnetfilter_log )
@@ -142,11 +141,9 @@ src_install() {
systemd_dounit "${FILESDIR}"/${PN}.service
newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
- if use logrotate; then
- insopts -m0644
- insinto /etc/logrotate.d
- newins etc/${PN}.logrotate ${PN}
- fi
+ insopts -m0644
+ insinto /etc/logrotate.d
+ newins etc/${PN}.logrotate ${PN}
}
pkg_postinst() {
diff --git a/net-analyzer/suricata/suricata-6.0.3.ebuild
b/net-analyzer/suricata/suricata-6.0.3.ebuild
index da57e2c8b34..c6dfbc4f14b 100644
--- a/net-analyzer/suricata/suricata-6.0.3.ebuild
+++ b/net-analyzer/suricata/suricata-6.0.3.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz";
LICENSE="GPL-2"
SLOT="0/6"
KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened
logrotate lua lz4 nflog +nfqueue redis systemd test"
+IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened lua
lz4 nflog +nfqueue redis systemd test"
RESTRICT="!test? ( test )"
@@ -43,7 +43,6 @@ RDEPEND="${PYTHON_DEPS}
bpf? ( >=dev-libs/libbpf-0.1.0 )
cuda? ( dev-util/nvidia-cuda-toolkit )
geoip? ( dev-libs/libmaxminddb )
- logrotate? ( app-admin/logrotate )
lua? ( ${LUA_DEPS} )
lz4? ( app-arch/lz4 )
nflog? ( net-libs/libnetfilter_log )
@@ -142,11 +141,9 @@ src_install() {
systemd_dounit "${FILESDIR}"/${PN}.service
newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
- if use logrotate; then
- insopts -m0644
- insinto /etc/logrotate.d
- newins etc/${PN}.logrotate ${PN}
- fi
+ insopts -m0644
+ insinto /etc/logrotate.d
+ newins etc/${PN}.logrotate ${PN}
}
pkg_postinst() {
