From 52fc263f2dd029a99ad4f0e5e1c3dbfd490d6b63 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 22 Jul 2022 02:45:48 +0100
Subject: gentoo auto-resync : 22:07:2022 - 02:45:47

---
 net-firewall/Manifest.gz                     | Bin 4544 -> 4546 bytes
 net-firewall/firehol/Manifest                |   2 +-
 net-firewall/firehol/firehol-3.1.7-r1.ebuild |  67 --------------------------
 net-firewall/firehol/firehol-3.1.7-r2.ebuild |  69 +++++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 68 deletions(-)
 delete mode 100644 net-firewall/firehol/firehol-3.1.7-r1.ebuild
 create mode 100644 net-firewall/firehol/firehol-3.1.7-r2.ebuild

(limited to 'net-firewall')

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 5606cef9820f..d8655fe1b3fb 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest
index bc51759ae290..08aadac44f8e 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -5,5 +5,5 @@ AUX fireqos.initd 829 BLAKE2B f09905f02189f155455886dd1896a183f2f529d0737939a706
 DIST firehol-3.1.6.tar.xz 1484424 BLAKE2B aea45aa424b7b43ed0576916f52a785601a21489263c1b5c6abbf3b2b97db80bf2a2420ae8176cd55e335ab93c18a8209a47f467dba80a63cf2c319b3e3e27d8 SHA512 5ffa7e59d3f10a6c7d3f5b5ef9d93f1b2138063374a10cb0c1ac4e75578d6cf7755e154b51febf546563ba003f100af13f89bca3843b66a8d22b8fc2da3fadfe
 DIST firehol-3.1.7.tar.xz 1457932 BLAKE2B 9a861f2e9c900bce45d0dbd12f4546bc14eb4d74aea27a8d4cb0e5bfe8bea92d9bff3ccf008d46bd64212d689123273c99d0b0faaaadd34f0e1d85e22ee757c9 SHA512 b05cec806c2c8fc410bf9c7a30e3ad1d9f1c06fd2d501a7e5434010f6bb38722aac5b64de9b4285d2c71cacbf6b2f3c758685da5a70c05621df52879eb5148c2
 EBUILD firehol-3.1.6-r3.ebuild 1448 BLAKE2B e0f98abc7590813988cc7a4cc7d0a930e488978e372cda90378306298d3a45eccddf9f1a96f3ab1bc934eae8b886787668e6f154be69abb13f0094683aa8953b SHA512 c5dcb2e0f55951cb48ac82b573b399ba1ec8526e146ce87cae27a5c0dfc0efa37d15d069b63b1b9ebb0099d5a8635bba438b669aa5884ac01b8a76c36f82944c
-EBUILD firehol-3.1.7-r1.ebuild 1450 BLAKE2B 827f1c357427e38374dd99d29753d601fd0e0331f413bbfe7c9eda78500bcd627bd40008d71c485e37127030c713de6f9771760f34af80d4632638ee2e82e396 SHA512 919e1aaa2c2fe83e9803b3b3797d581bdb64dc398fdb9a70ed3eddd841688d22539fbcd534b2f734adf45f27b87014c178352609baf8b55e90afece856dd12d2
+EBUILD firehol-3.1.7-r2.ebuild 1505 BLAKE2B 71f242ca1f5e53e5446b8a45d34685dbe3d6ad69c1762495df23ec11bbc6b10c8738e601087224231448d510ed86388bbf8c69f1389af168e4d3245224d57e27 SHA512 40c26898272185283a16cb54bddacb5c8a5b32b513eb519353248c2450a20dcdbc4cad90ff637daba1798968e8f00d8c62facb3212d8ac1263f6894d211cd92f
 MISC metadata.xml 465 BLAKE2B bfefafde956a4355f827c12438dc41f337e3199f6da88bba92d67d811a6f1d2d086e688c2aa262c40c86535671c0db3a32d424d96a2c7c9525f107711beb9c7f SHA512 36174445bf13870981133d45de5d807cec2178612256a6a51dfe2f4b69ee5fd9f245b6fad52a2a194745bb6d4e83115889ce3f18cfbb69b78ec925408fd3bd16
diff --git a/net-firewall/firehol/firehol-3.1.7-r1.ebuild b/net-firewall/firehol/firehol-3.1.7-r1.ebuild
deleted file mode 100644
index 1432243602f9..000000000000
--- a/net-firewall/firehol/firehol-3.1.7-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-DESCRIPTION="iptables firewall generator"
-HOMEPAGE="https://firehol.org/ https://github.com/firehol/firehol"
-SRC_URI="https://github.com/firehol/firehol/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc ipv6 ipset"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-
-RDEPEND="net-firewall/iptables
-	sys-apps/iproute2[-minimal,ipv6(+)?]
-	sys-apps/kmod[tools]
-	net-misc/iputils[ipv6(+)?]
-	net-misc/iprange
-	net-analyzer/traceroute
-	app-arch/gzip
-	ipset? (
-		net-firewall/ipset
-	)"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	local CONFIG_CHECK=" \
-		~IP_NF_FILTER \
-		~IP_NF_IPTABLES \
-		~IP_NF_MANGLE \
-		~IP_NF_TARGET_MASQUERADE
-		~IP_NF_TARGET_REDIRECT \
-		~IP_NF_TARGET_REJECT \
-		~NETFILTER_XT_CONNMARK \
-		~NETFILTER_XT_MATCH_HELPER \
-		~NETFILTER_XT_MATCH_LIMIT \
-		~NETFILTER_XT_MATCH_OWNER \
-		~NETFILTER_XT_MATCH_STATE \
-		~NF_CONNTRACK \
-		~NF_CONNTRACK_IPV4 \
-		~NF_CONNTRACK_MARK \
-		~NF_NAT \
-		~NF_NAT_FTP \
-		~NF_NAT_IRC \
-	"
-	linux-info_pkg_setup
-}
-
-src_configure() {
-	econf \
-		--disable-vnetbuild \
-		$(use_enable ipset update-ipsets) \
-		$(use_enable doc) \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}"/firehol.confd firehol
-	newinitd "${FILESDIR}"/firehol.initd firehol
-	newconfd "${FILESDIR}"/fireqos.confd fireqos
-	newinitd "${FILESDIR}"/fireqos.initd fireqos
-}
diff --git a/net-firewall/firehol/firehol-3.1.7-r2.ebuild b/net-firewall/firehol/firehol-3.1.7-r2.ebuild
new file mode 100644
index 000000000000..79ef83977169
--- /dev/null
+++ b/net-firewall/firehol/firehol-3.1.7-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info systemd
+
+DESCRIPTION="iptables firewall generator"
+HOMEPAGE="https://firehol.org/ https://github.com/firehol/firehol"
+SRC_URI="https://github.com/firehol/firehol/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc ipv6 ipset"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+RDEPEND="net-firewall/iptables
+	sys-apps/iproute2[-minimal,ipv6(+)?]
+	sys-apps/kmod[tools]
+	net-misc/iputils[ipv6(+)?]
+	net-misc/iprange
+	net-analyzer/traceroute
+	app-arch/gzip
+	ipset? (
+		net-firewall/ipset
+	)"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	local CONFIG_CHECK=" \
+		~IP_NF_FILTER \
+		~IP_NF_IPTABLES \
+		~IP_NF_MANGLE \
+		~IP_NF_TARGET_MASQUERADE
+		~IP_NF_TARGET_REDIRECT \
+		~IP_NF_TARGET_REJECT \
+		~NETFILTER_XT_CONNMARK \
+		~NETFILTER_XT_MATCH_HELPER \
+		~NETFILTER_XT_MATCH_LIMIT \
+		~NETFILTER_XT_MATCH_OWNER \
+		~NETFILTER_XT_MATCH_STATE \
+		~NF_CONNTRACK \
+		~NF_CONNTRACK_IPV4 \
+		~NF_CONNTRACK_MARK \
+		~NF_NAT \
+		~NF_NAT_FTP \
+		~NF_NAT_IRC \
+	"
+	linux-info_pkg_setup
+}
+
+src_configure() {
+	econf \
+		--disable-vnetbuild \
+		$(use_enable ipset update-ipsets) \
+		$(use_enable doc) \
+		$(use_enable ipv6)
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/firehol.confd firehol
+	newinitd "${FILESDIR}"/firehol.initd firehol
+	newconfd "${FILESDIR}"/fireqos.confd fireqos
+	newinitd "${FILESDIR}"/fireqos.initd fireqos
+
+	systemd_dounit contrib/fire{hol,qos}.service
+}
-- 
cgit v1.2.3