From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 78174139337 for ; Sun, 25 Jul 2021 20:58:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70C51E0CEA; Sun, 25 Jul 2021 20:58:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 57E10E0CEA for ; Sun, 25 Jul 2021 20:58:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 23085342C6E for ; Sun, 25 Jul 2021 20:58:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7A7AD581 for ; Sun, 25 Jul 2021 20:58:54 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1627246721.54b4acb81dc95c75a9ed8c521dfed50bd9cefa12.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/suricata/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/suricata/metadata.xml net-analyzer/suricata/suricata-5.0.7.ebuild net-analyzer/suricata/suricata-6.0.3.ebuild X-VCS-Directories: net-analyzer/suricata/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 54b4acb81dc95c75a9ed8c521dfed50bd9cefa12 X-VCS-Branch: master Date: Sun, 25 Jul 2021 20:58:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 56e20c35-0e90-482b-b7b6-cb13d324394d X-Archives-Hash: 0a94469d110dc04fd3c04d4408c0a2a0 commit: 54b4acb81dc95c75a9ed8c521dfed50bd9cefa12 Author: Marek Szuba gentoo org> AuthorDate: Sun Jul 25 20:54:56 2021 +0000 Commit: Marek Szuba gentoo 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 gentoo.org> Signed-off-by: Marek Szuba 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 @@ Enable unix socket Enable NVIDIA Cuda computations support Enable detection modules - Install logrotate rule Enable support for compressed pcap logging using the LZ4 algorithm Enable libnetfilter_log support Enable NFQUEUE support for inline IDP 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() {