gentoo auto-resync : 21:03:2024 - 07:00:13

8 files changed, 55 insertions, 18 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 97668168606a..2c5ab0b47413 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index a61c63db6bc2..dab651aac902 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,12 +1,13 @@
+AUX firewalld-systemd-service.patch 769 BLAKE2B fbd8392b6f542413ae2896f8830faa0d0ccab11af3e41d427e3497b862ee7245b45a04c217aa84ea976b21661f2ce5311c7f1602d90c72bf9365fd815596bd9b SHA512 de85e40625581d55a476f9502d0172cfd45e01cd78e4b9afebc14a603e0a73deace625899a333f6fe37e55b1b0a606f515daf75b5460ebad63318042bba8541e
 AUX firewalld.init 250 BLAKE2B 1c0f690e24313037b801902aa772a9d1cb6889a05f142bc3d84602002ef053cd059b5193983f9fe6d89065a070a566a6a9ba8212a092435953ebed80ea7c7b40 SHA512 457cda01449f38563e98e1db937fe1c50745eab91797f52687e3ab9f5d94dd42d129740ae6669e99666a3f096d631dd3a44e66010b638b31b9c6ba798362403e
 AUX firewalld.service 581 BLAKE2B b4eb7549305da68bc53f913d5d0a3ff2595e8e482ed2a474ede645f33b8192e142cd1aa964c5c1dcf8a7c336c68d494ee13421ec7566312a4f89330c236cab9c SHA512 b81fb8414619b3661985cbac001a47c76d76b13eebe421919a838fa0396e6470a3109e0d20d88f423ff43b6e48c0537467125a85bf8939ef0ab6ded4d4829b03
 DIST firewalld-2.0.1.tar.bz2 1257251 BLAKE2B a78ff5c1d733897024c33fe74ae8723c97253498ba55957420c66ccdfe4dcf64265336c5ee0cf120c4450d9c4da492e64c4fe01a3ea974d2992f6cf5879ef88d SHA512 31b18b74af4d731f6259915fd86d6551968eea563deba211b6d304d961747662085a02c7c185c0d7d8916693f53a5dca581b0877bce59c634e99a9f20de2f3e1
 DIST firewalld-2.0.2.tar.bz2 1276527 BLAKE2B 194f8b738a37b329f11a47fa9cf01f9cadc16d9f9dc7c8ace13b56f81bbb7d999b4a15cc156f89b14ecf794d4d6ef92f307600e298552779aed936d5b196c433 SHA512 fdcf4937e337bce4bca07d904efe2b775c8a69d4c7c9ca55c42752cfcf37f637f1cf1125bc1ca2c35a8980c995d90ea4e3afb5712f1666734e90e78e26888196
 DIST firewalld-2.1.0.tar.bz2 1310431 BLAKE2B e25941f16f5a2b0803c78d45f7b4beafdd1587106daefd009ac34a906c4604fa1c8d84a179e50d005433eadae982dcd0718e753c0627725918f2b6f5b8674146 SHA512 0f0e56a5397ea43801f0abfd3c50854340159804c95b920c3d4a22e2c211861b0d147fce879e9ddd58f6e89a805ccd5f828e8ffa2782a077c091c56dac97ee5b
 DIST firewalld-2.1.1.tar.bz2 1315222 BLAKE2B 064abfae1f2f1c5a63bbbbbec3357aa6e63936818fa2020ca882d1b834736b3735a32b0ab318e6de78b6f785cb4da0ee4e299956c922d9dbf6e7bd442e9bb2d6 SHA512 383e5ea3d451a28241e5a76f8d0efeeb8319663bdc5f680b68c5156ddb5145fac766a9ee9521c4af27b1df82861ca6f68ee81c0588b1dd6c4f6d4e4f5ca8fee1
-EBUILD firewalld-2.0.1.ebuild 5302 BLAKE2B fdf5cc70bfa92850dc4cd9c50e58d4788dd9a3eb8a4b16640692bc2ecb4d3def741b694fb29bf60eb825c895b2bdc210e26475bf2cca4bbfe26f949d4b091c40 SHA512 70f80a9ee29a2470433734e21aa92f3713fe4eacc978f4d43d86810f09ec0494c21611d2a0dbeb113fa59026796f0709f1c0ca269d0c937ae4466a71cf1d282b
-EBUILD firewalld-2.0.2.ebuild 5300 BLAKE2B ebbbf837a1ae24aed8b6096061167c14253a8f66a56b68356959a09d733659f128d29c76b475b08531fb2dd04dc8d7dfa13b7ad006f90794efd4974892664391 SHA512 b71fe161461fc6ff2985659d8fc576d510fc644a873e0a91951cc38fbee6849b8e37907ebd9cb1eb3a899bdceb922941528608f3e5dc2d760c77e947515ab1fc
-EBUILD firewalld-2.1.0.ebuild 5306 BLAKE2B e72504c18310fb2f3f6e934436d552311f273a942e9fc8a1f232286cd5bd9ccea6af3ced41af0f3df62b8e7c938725fe3e45623ed59ba9f0672e3fc5cb297886 SHA512 4b2991a10a6e206ce7df1380d3a5619df662050a4f1620992ad660b5fe576997e13857a596227fbc7bdd9e4e5b5b342212f0ef0e669501b4d75d01cf29ab9042
-EBUILD firewalld-2.1.1-r1.ebuild 5469 BLAKE2B efee69322f4703fa0d1383dab865a769a4be0ab9b5d2f40df42f10acdda69d082a9196d58a2482c4326f852bef56f61a33bbaba9105597aa3d8b74d3337c7f11 SHA512 865c6b1c8d3aa7d33962353d5db77216a47b08f4fd4b06f282bebf2e79f1c18cfb8f1a37c7c70d5531e86b7dc037e0f8180721e1b2ab193c10195f1dbbeaf477
-EBUILD firewalld-2.1.1.ebuild 5306 BLAKE2B e72504c18310fb2f3f6e934436d552311f273a942e9fc8a1f232286cd5bd9ccea6af3ced41af0f3df62b8e7c938725fe3e45623ed59ba9f0672e3fc5cb297886 SHA512 4b2991a10a6e206ce7df1380d3a5619df662050a4f1620992ad660b5fe576997e13857a596227fbc7bdd9e4e5b5b342212f0ef0e669501b4d75d01cf29ab9042
+EBUILD firewalld-2.0.1.ebuild 5369 BLAKE2B bd15d3842123f1c0f02e37c7b7020d200bc1ae821d72535565e2803fd65beacd6ef21b506cd1cee06a04c486393e09c9d6c22058bfb183180e4f7b00c55cdec4 SHA512 1598f73837472a33cbe4f9e817fd4219687c85bd1f386ea5cee71eb60ed6252fdaabab6a3284b99004eadf396d76ad9c44bedefbd5dd40c1d570bb880bf370e1
+EBUILD firewalld-2.0.2.ebuild 5367 BLAKE2B 54e95bd45a0a094eb408d9b66c5077a4eb61b50770c76593243a944a868965daa52b5b35e074803e7efa535c29506f5e0de37b92898d855e96137968ec842c88 SHA512 ea3200a53741e4e6ca767f78f1dc37bee4507881e5e5c61ec3254889856f57e780277757e51b66fdfeb721494a5765e91818bbc434c18a50365fbee266df1ae5
+EBUILD firewalld-2.1.0.ebuild 5373 BLAKE2B 3acbd5eaeeb34401e062119eb18265f0fec97018fd3d155576a5f7ea58c504967efc3820b65162de3d1d4f4cc9ce5253e0ff3d8d8d923de3b2779e8e1775ecbd SHA512 e99c51ea3e98834e97a87ac997dc08d7b1b1435064ef6925551cbe86860482eb821f248cb0522ed24aa66bf0bd2389cdb4c439d5bc401bf4b4145f5d581dc228
+EBUILD firewalld-2.1.1-r2.ebuild 5289 BLAKE2B 8019479c4f6449935d091110caeadc6bd98eba27b0c64da49fa26d7c6e1a3235bcda1ff542ccf3ba10013f8269bd9c0e1ff3f4a5c688514cf0ed21ab7182089d SHA512 0088ed43a6c109cd17e3f5fe9a52ee1f3d89f000cc1778bfa127f79a2dfd3a629c8cd7597449dae7d07aafe241f1d49075150823b2af0a6d5e14d35548ca5b96
+EBUILD firewalld-2.1.1.ebuild 5373 BLAKE2B 3acbd5eaeeb34401e062119eb18265f0fec97018fd3d155576a5f7ea58c504967efc3820b65162de3d1d4f4cc9ce5253e0ff3d8d8d923de3b2779e8e1775ecbd SHA512 e99c51ea3e98834e97a87ac997dc08d7b1b1435064ef6925551cbe86860482eb821f248cb0522ed24aa66bf0bd2389cdb4c439d5bc401bf4b4145f5d581dc228
 MISC metadata.xml 671 BLAKE2B 69c4bda7cc74a243aa1738bed90d16a3bc2c2085f6c0718becc7797a68da63035ef4d4f5e59c0583987d54032c163df6052d012fb7ca49026ca7259088793d33 SHA512 dd2d482251a4e33cb12ba324e1a21b4758f82de83c0cf83d5fa6259444c272360b47c5666e596103eba4703183fc9864a6bbb07a254aba67146b89d9870e9bbe
diff --git a/net-firewall/firewalld/files/firewalld-systemd-service.patch b/net-firewall/firewalld/files/firewalld-systemd-service.patch
new file mode 100644
index 000000000000..66f4c730b66f
--- /dev/null
+++ b/net-firewall/firewalld/files/firewalld-systemd-service.patch
@@ -0,0 +1,19 @@
+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
diff --git a/net-firewall/firewalld/firewalld-2.0.1.ebuild b/net-firewall/firewalld/firewalld-2.0.1.ebuild
index 59e47ff9b089..47bd3faa6dc2 100644
--- a/net-firewall/firewalld/firewalld-2.0.1.ebuild
+++ b/net-firewall/firewalld/firewalld-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -124,7 +124,6 @@ pkg_setup() {
 	~NFT_LOG
 	~NFT_MASQ
 	~NFT_NAT
-	~NFT_OBJREF
 	~NFT_QUEUE
 	~NFT_QUOTA
 	~NFT_REDIR
@@ -153,6 +152,11 @@ pkg_setup() {
 		CONFIG_CHECK+=" ~NFT_COUNTER"
 	fi
 
+	# bug #926685
+	if kernel_is -le 6 1 ; then
+		CONFIG_CHECK+=" ~NFT_OBJREF"
+	fi
+
 	linux-info_pkg_setup
 }
 
diff --git a/net-firewall/firewalld/firewalld-2.0.2.ebuild b/net-firewall/firewalld/firewalld-2.0.2.ebuild
index 020c5b0d43ae..ce1a6e8dd6b7 100644
--- a/net-firewall/firewalld/firewalld-2.0.2.ebuild
+++ b/net-firewall/firewalld/firewalld-2.0.2.ebuild
@@ -124,7 +124,6 @@ pkg_setup() {
 	~NFT_LOG
 	~NFT_MASQ
 	~NFT_NAT
-	~NFT_OBJREF
 	~NFT_QUEUE
 	~NFT_QUOTA
 	~NFT_REDIR
@@ -153,6 +152,11 @@ pkg_setup() {
 		CONFIG_CHECK+=" ~NFT_COUNTER"
 	fi
 
+	# bug #926685
+	if kernel_is -le 6 1 ; then
+		CONFIG_CHECK+=" ~NFT_OBJREF"
+	fi
+
 	linux-info_pkg_setup
 }
 
diff --git a/net-firewall/firewalld/firewalld-2.1.0.ebuild b/net-firewall/firewalld/firewalld-2.1.0.ebuild
index be78261c1989..34c0630c75a7 100644
--- a/net-firewall/firewalld/firewalld-2.1.0.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.0.ebuild
@@ -124,7 +124,6 @@ pkg_setup() {
 	~NFT_LOG
 	~NFT_MASQ
 	~NFT_NAT
-	~NFT_OBJREF
 	~NFT_QUEUE
 	~NFT_QUOTA
 	~NFT_REDIR
@@ -153,6 +152,11 @@ pkg_setup() {
 		CONFIG_CHECK+=" ~NFT_COUNTER"
 	fi
 
+	# bug #926685
+	if kernel_is -le 6 1 ; then
+		CONFIG_CHECK+=" ~NFT_OBJREF"
+	fi
+
 	linux-info_pkg_setup
 }
 
diff --git a/net-firewall/firewalld/firewalld-2.1.1-r1.ebuild b/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild
index 3470957cccc8..fbe62a47db37 100644
--- a/net-firewall/firewalld/firewalld-2.1.1-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild
@@ -55,6 +55,10 @@ QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
 
 PLOCALES="ar as ast bg bn_IN ca cs da de el en_GB en_US es et eu fa fi fr gl gu hi hr hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ro ru si sk sl sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-systemd-service.patch
+)
+
 pkg_setup() {
 	# See bug #830132 for the huge list
 	# We can probably narrow it down a bit but it's rather fragile
@@ -124,7 +128,6 @@ pkg_setup() {
 	~NFT_LOG
 	~NFT_MASQ
 	~NFT_NAT
-	~NFT_OBJREF
 	~NFT_QUEUE
 	~NFT_QUOTA
 	~NFT_REDIR
@@ -153,6 +156,11 @@ pkg_setup() {
 		CONFIG_CHECK+=" ~NFT_COUNTER"
 	fi
 
+	# bug #926685
+	if kernel_is -le 6 1 ; then
+		CONFIG_CHECK+=" ~NFT_OBJREF"
+	fi
+
 	linux-info_pkg_setup
 }
 
@@ -161,13 +169,6 @@ src_prepare() {
 
 	plocale_find_changes "po" "" ".po" || die
 	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-
-	# Our version drops the/an obsolete 'conflicts' line with old iptables services
-	# bug #833506
-	sed -i \
-	-e "/Conflicts=iptables.service ip6tables.service ebtables.service ipset.service nftables.service/d" \
-	-e "/EnvironmentFile=-\/etc\/sysconfig\/firewalld/d" \
-	config/firewalld.service.in || die
 }
 
 src_configure() {
diff --git a/net-firewall/firewalld/firewalld-2.1.1.ebuild b/net-firewall/firewalld/firewalld-2.1.1.ebuild
index be78261c1989..34c0630c75a7 100644
--- a/net-firewall/firewalld/firewalld-2.1.1.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.1.ebuild
@@ -124,7 +124,6 @@ pkg_setup() {
 	~NFT_LOG
 	~NFT_MASQ
 	~NFT_NAT
-	~NFT_OBJREF
 	~NFT_QUEUE
 	~NFT_QUOTA
 	~NFT_REDIR
@@ -153,6 +152,11 @@ pkg_setup() {
 		CONFIG_CHECK+=" ~NFT_COUNTER"
 	fi
 
+	# bug #926685
+	if kernel_is -le 6 1 ; then
+		CONFIG_CHECK+=" ~NFT_OBJREF"
+	fi
+
 	linux-info_pkg_setup
 }