gentoo auto-resync : 07:12:2024 - 02:07:26

5 files changed, 6 insertions, 22 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index a744e8ae6bdd..09484038874a 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest
index 6bd984bb9a49..f92de7b0f0bf 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -3,5 +3,5 @@ AUX firehol.initd 1141 BLAKE2B 4bdeb545542780b4544c07ad675a2ab63c80177126841eaea
 AUX fireqos.confd 65 BLAKE2B 121c8df85e9c110e45633c84f3fd4ba9e006bb70dffbdee1507f92d763c13ae9ce370a5807753d31b0033e23d39004ea147d9fb75bf4f2fbadc6baf070ccaca3 SHA512 4dd394f3d896d8bf782cf1157f5bf420ca0e9b2c6238986f3fb17630ec0e12bfcad4ffc6fe2258a7d257e157fed11e01aef26965f3d97c78643c6467639a822c
 AUX fireqos.initd 829 BLAKE2B f09905f02189f155455886dd1896a183f2f529d0737939a7065bb52b57870f22805e3e6c029510cc5b57b36e596eb829bcc7651c6a80657ff4e399acc542fa90 SHA512 8364537d3e10c68d309fc40f4b2f88a2a593c38fd6f134b1c09cf937be00f7d96eeba05c83824c9460367bf892a8f79547321784c8f8a4708f856df9a88693f4
 DIST firehol-3.1.7.tar.xz 1457932 BLAKE2B 9a861f2e9c900bce45d0dbd12f4546bc14eb4d74aea27a8d4cb0e5bfe8bea92d9bff3ccf008d46bd64212d689123273c99d0b0faaaadd34f0e1d85e22ee757c9 SHA512 b05cec806c2c8fc410bf9c7a30e3ad1d9f1c06fd2d501a7e5434010f6bb38722aac5b64de9b4285d2c71cacbf6b2f3c758685da5a70c05621df52879eb5148c2
-EBUILD firehol-3.1.7-r2.ebuild 1922 BLAKE2B 96326ba19cec922c7f8ff0ed5262a3e9a733bd924e0676009943f5a2f90b36af3902773d06713a49c323b898e0246713dacd97b1f1f7e290be83f99b91f8f61b SHA512 b3a9732af70496cea55876d62f0878cf0882662ce7d1d91591d857c1a1fe088962ec180020df0c90195475d4903570619789630e9931a72df598690096a1f8e7
+EBUILD firehol-3.1.7-r2.ebuild 1972 BLAKE2B af30c71e5cd66ce7146356896bfdc68d12688fdd36452db591412d64a40a129a16a0a967d1c3ce34805c60f7aba53587527d53af0b6699ea5ec5f323e69a938b SHA512 1dc28b99c7078b2448ad14e4a1db17c5ef6cd9b9e86ffed52fb7e63d79c95e65c3f9aad001d63339fa32c3473c6a9d4be8cfbf600e94def6759da51f8b7b941c
 MISC metadata.xml 465 BLAKE2B bfefafde956a4355f827c12438dc41f337e3199f6da88bba92d67d811a6f1d2d086e688c2aa262c40c86535671c0db3a32d424d96a2c7c9525f107711beb9c7f SHA512 36174445bf13870981133d45de5d807cec2178612256a6a51dfe2f4b69ee5fd9f245b6fad52a2a194745bb6d4e83115889ce3f18cfbb69b78ec925408fd3bd16
diff --git a/net-firewall/firehol/firehol-3.1.7-r2.ebuild b/net-firewall/firehol/firehol-3.1.7-r2.ebuild
index b1666947f580..701ca0742f2f 100644
--- a/net-firewall/firehol/firehol-3.1.7-r2.ebuild
+++ b/net-firewall/firehol/firehol-3.1.7-r2.ebuild
@@ -46,12 +46,16 @@ pkg_setup() {
 		~NETFILTER_XT_MATCH_OWNER \
 		~NETFILTER_XT_MATCH_STATE \
 		~NF_CONNTRACK \
-		~NF_CONNTRACK_IPV4 \
 		~NF_CONNTRACK_MARK \
 		~NF_NAT \
 		~NF_NAT_FTP \
 		~NF_NAT_IRC \
 	"
+
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4"
+	fi
+
 	linux-info_pkg_setup
 }
 
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 516982ab836b..93f16789ee8a 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,5 +1,4 @@
 AUX firewalld-2.2.1-systemd-service.patch 752 BLAKE2B 2e728ebda2372f755d3c2bddb6ffd9716c22b5a162f7f26b5a4ff2486ca40b56d1c1928c3f98d0d0d703c877a6060584eb431948006af80d98de0178de93f5ea SHA512 2a3c44af1922aad414ef58752c1b49ad02f3ad833716002e66a7d54af5f1ad74883e0c71ae7d7c44a8eab980b7afa423f8daeccb105f2b2ba859b12f4e0bbe09
-AUX firewalld-systemd-service.patch 769 BLAKE2B fbd8392b6f542413ae2896f8830faa0d0ccab11af3e41d427e3497b862ee7245b45a04c217aa84ea976b21661f2ce5311c7f1602d90c72bf9365fd815596bd9b SHA512 de85e40625581d55a476f9502d0172cfd45e01cd78e4b9afebc14a603e0a73deace625899a333f6fe37e55b1b0a606f515daf75b5460ebad63318042bba8541e
 AUX firewalld.init 250 BLAKE2B 1c0f690e24313037b801902aa772a9d1cb6889a05f142bc3d84602002ef053cd059b5193983f9fe6d89065a070a566a6a9ba8212a092435953ebed80ea7c7b40 SHA512 457cda01449f38563e98e1db937fe1c50745eab91797f52687e3ab9f5d94dd42d129740ae6669e99666a3f096d631dd3a44e66010b638b31b9c6ba798362403e
 DIST firewalld-2.2.1.tar.bz2 1295501 BLAKE2B fc7bb401895bc39c34ec585468bdcc1b3c3f8eeb35c786c0cf7d886f456c99840107db73e8f611a7d7ab1db1408c6dc349a3d5eee2fbd1e624fe06dd8a558d91 SHA512 08117be01a25a8e263cf419d7b01a98c80b53108af68f6cfc1d900692e6124c37b9dd6feaf4bc3c6e3f27958a9ee45b9795c7f5a9250eb644b6e903f97672c8a
 DIST firewalld-2.2.3.tar.bz2 1310686 BLAKE2B dba517166e1588195ac76123503a2526ffa6c7bd884953ba7ec2806f9ef3a93a879936e48e0d5b638c6e3e888b558757989f8035106cc103eab92d72d8a077be SHA512 e1b1d5fc372359ecbbc074be15e8a9dc4e39836545d5a1364f05deb07eb6e43505eb37589a7b0fb5f3115e3ed3fbc58efe447e2d5b0dcc716a66903c63df824b
diff --git a/net-firewall/firewalld/files/firewalld-systemd-service.patch b/net-firewall/firewalld/files/firewalld-systemd-service.patch
deleted file mode 100644
index 66f4c730b66f..000000000000
--- a/net-firewall/firewalld/files/firewalld-systemd-service.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Drops the/an obsolete 'conflicts' line with old iptables services bug #833506
-Removes EnvironmentFile and FIREWALLD_ARGS variable
-===================================================================
---- a/config/firewalld.service.in
-+++ b/config/firewalld.service.in
-@@ -4,12 +4,10 @@
- Wants=network-pre.target
- After=dbus.service
- After=polkit.service
--Conflicts=iptables.service ip6tables.service ebtables.service ipset.service nftables.service
- Documentation=man:firewalld(1)
-
- [Service]
--EnvironmentFile=-/etc/sysconfig/firewalld
--ExecStart=@sbindir@/firewalld --nofork --nopid $FIREWALLD_ARGS
-+ExecStart=@sbindir@/firewalld --nofork --nopid
- ExecReload=/bin/kill -HUP $MAINPID
- # supress to log debug and error output also to /var/log/messages
- StandardOutput=null