gentoo resync : 22.12.2021

6 files changed, 35 insertions, 3 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index c09918af10b1..9f958e904fd1 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index df57907916cd..414548d96638 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -5,5 +5,5 @@ AUX ipset.systemd 476 BLAKE2B 6d536142066ab60fdec24bcb138976709f186c575a7958ad9e
 DIST ipset-7.11.tar.bz2 674100 BLAKE2B 97f2e3372e963654ece511960e8c22d0dd9e29376d087a3767d89544dfbd85f9f9e75e0cc6c4eb9e1d813d1a472a410033a76feef3319b1d87fd51b0c3fd97cd SHA512 20890de32c17c04d9d3ae42fff64acfe21a252974bee5843ae39bdda707fcef55fde11cffccab9f987bf7e18f5445443c46c50eb854fb6f93f172f7bad07f922
 DIST ipset-7.15.tar.bz2 680383 BLAKE2B 10acff9741370ad80a2845605be1be4f691e987b271f4dcf1fab3abfe158c63c7d39e6b3453ba7cd361dee3df92f85419cfb70806a71b6806555f6571c70b1ed SHA512 0fc936d971c30a0925c585d506c8840e782fdaeec09bc8fd249e874fe838fa55a4dbb697f6e1423a6769abf07a1ce2195abc37cb641e8e4ad70f1b4c7130916a
 EBUILD ipset-7.11-r1.ebuild 3450 BLAKE2B 214cade04c6b499a7e0043df1eec4cd475b9247b21fa1bc218503082a5265d54d93f6a388281ac7360c48de65581dd3517e49aea7022557535ff42590695795f SHA512 a8ec2d9ca9b17ba666641c6e9539714bb836e043363a5a8e0a913314b476aca59eb4fb9efd6febcc8c13bbe35962ea14bdddc510a2055d980a347e43271c6439
-EBUILD ipset-7.15.ebuild 3454 BLAKE2B a14d731bb83f6b6b8a4353e67bfab3c71221727b2b435af4a29c872a148c80ba03f3e1aac3eda3ccf5ef5f66c7e308f23fd2c0df825eb3936cceaf47f8a80d71 SHA512 dc8192083e5a59f2b12d46b1d66675db151a62d41a7255aa6414ecc1cfa50eeb0b7e6eecf42301e775263f6781d8177e829145882c1f901f95a7548d7b69fa1d
+EBUILD ipset-7.15.ebuild 3450 BLAKE2B 214cade04c6b499a7e0043df1eec4cd475b9247b21fa1bc218503082a5265d54d93f6a388281ac7360c48de65581dd3517e49aea7022557535ff42590695795f SHA512 a8ec2d9ca9b17ba666641c6e9539714bb836e043363a5a8e0a913314b476aca59eb4fb9efd6febcc8c13bbe35962ea14bdddc510a2055d980a347e43271c6439
 MISC metadata.xml 369 BLAKE2B f41c3bdbd41f5cd6ae9451f00d80d3ca0e17343f45c37f88ab6e34dda8fce78e4d9b4d670385b3f8d9025f6065f1911d1815b610bbbbbfeb364942b8512ccc7b SHA512 f359ed08f769da53de8c31350f48b7fd0504c863fb29664ce40eac4e56f2cca842d9dc8de350fd4790a3a143ed4db6ed3df3419cc9daad4403078039ced52d3e
diff --git a/net-firewall/ipset/ipset-7.15.ebuild b/net-firewall/ipset/ipset-7.15.ebuild
index b37a716c1821..cbee799db563 100644
--- a/net-firewall/ipset/ipset-7.15.ebuild
+++ b/net-firewall/ipset/ipset-7.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index cdf707a2c392..abdfc329a86d 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,8 +1,9 @@
 AUX ipt_netflow-2.0-configure.patch 276 BLAKE2B a7c4d51d9c0f5d6d60200cebc74dc022cbc117fb2916792661166d04e456e6f23e8f285c0ab6b713ccfd764ccac0a3a8b41ad2d159c9270ea0480d5f2b1b2482 SHA512 cb7b1a690a69eb68ce57d1b216324de3114c01a6bc2ca7e29fece702be62a0f903e6946426c49a8fcd08295466524eb464127655a8742507f999a318319cd3d0
+AUX ipt_netflow-2.6-fix-linux-headers-5.14.patch 1058 BLAKE2B 8370b02a09d9f08b083ecb6f51e9f0788616fba7f02ccf10d55f64898a6f37a87a2c0b48464ba99b11d6e8fe13381873319dbf0dc2e8c2c1bc09ba06c65b2d2d SHA512 6c4010a4c38822a7ffdd3a5c78aeedda8e86ec4c4060be87e5b65c892948aa3ae54311769667db2cd67494c3df459f1fbe19d0b134b34e6952cb045d976173ba
 AUX ipt_netflow-2.6-gentoo.patch 1998 BLAKE2B b4da947e83bc7c80f91a489858a9a7fdf461f29c331822c1c417bc233af18d7b89517aa443d7ac0bd0212ace6fa8707528254930ca78fceef24e8e1c90109bac SHA512 71a39f75860e1112d900ab8f86c36cbd6bf7908f0caca9d7e3cf257accdd6d08c51d3584129cdf4b145123e67510bf3792fc8c330036e26af441f115241623d9
 AUX ipt_netflow-2.6-ref_module_fix.patch 1908 BLAKE2B 2f59dbf1e5986549a67319c478ba831eb4c835d52aa16cdc216d4cb893f99560ea3a15936489cdf809b9e886aab888095fb66dca9acb467a44da6bbb5acec6ae SHA512 5e76e4f2982fe3f4ca961f93bdb4b20865d5e2fbd600001798457eafb561057a6beb3da75fffa91265429ed145220b9f25a1facb4447405ba9990c90289f4ae4
 AUX ipt_netflow-9999-gentoo.patch 1956 BLAKE2B 4595118518958c379a33e0fd7b6e3769fe764a633876cb46b76517ccec9fe6430fd4441b5509019699003b07966e1b09b257d302d3a1f29c4b437f90bce1c211 SHA512 bf8a723d0cf5a57b49231d444d6e0926b2aa667a5ac8aebdedd92b8271be30e5cbfd330e03ed63969d37a5fb694038378468ae1d4b2483b087785734214d00bd
 DIST ipt_netflow-2.6.tar.gz 95752 BLAKE2B 088c7030addd34d9d889cfa705aa060d0793e33be957deb3b703daea4229afc24f7268285ce336e425a024dc9d8139633a5206ff9d769c95cf71c156acbd4f25 SHA512 0ccea556e25dc6bc2d8c7648ed1b4ab366097baf5b06f167ccd19d2adb0a195ad652635181573785f9e9fa208d163f22b6527310eb939455d7ee3bc141cbeed5
-EBUILD ipt_netflow-2.6.ebuild 2477 BLAKE2B a1d0c5a23e524abba0e5decab56f4735d8da61e5b14f3a64f6d183573ea602135cd4b7f2d01aaa79ccf26076a3104cb1edb5f6f6d48646299d8bea2b434061d4 SHA512 4b227d79da53e5afe7645d2e3568dad1bb00f90809cff724b06154db3d1a25568d98b48bca70d9ea6e348ff3be83e5d9b850131d571aabfc9e5f34794c825ca8
+EBUILD ipt_netflow-2.6.ebuild 2541 BLAKE2B a5b711fbef038c8ac420a206f47018455a9df456b9cef86e080a0772ac814324f5a54098c58ace166ac46066c51a789afa90e9ae3e858440bf3e095fb1921e3d SHA512 2cce7b19c03ae0e452b6d0bb108380e645c630bbba6efd70a232f62eec2d651d07ca6d38bd41ff5cf186f162f13295b76505141e2a42edd93fd8a68112a4e794
 EBUILD ipt_netflow-9999.ebuild 2433 BLAKE2B 5b6f3fa7387d690d361f6cc26b83507944f0cefc560db6894efebf9e399b1a97eab5884fb62cddccadb984272e0fd630b19af224f1b26dc335a732eb3ce3dfa8 SHA512 2b2ce7e03db3d3168876c8c83ebf271f75aa3d85e05436234fd4c36738da096243fd7f5f3ba648efdf65d62ec986c956c8014cd69afa73e40e67be717bf3b295
 MISC metadata.xml 562 BLAKE2B 8a89449e2645318547b32a578e3705c962c4ae0f57be7a6818c30bffa950af6c886528418c3cb909e0a75f080b2e6d2f4410bea79f360cc3bf48afcc0ea0479e SHA512 9852a65e8db5b7c12f6476c0cf6d45aebb1de2ce238864e87a5b94b57226af7668c4cc9c552313bae79d90b4c42eaae82073d6dd4cda18375e8f8745f63d10a5
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.6-fix-linux-headers-5.14.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.6-fix-linux-headers-5.14.patch
new file mode 100644
index 000000000000..0f52b68d5235
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.6-fix-linux-headers-5.14.patch
@@ -0,0 +1,29 @@
+https://github.com/aabc/ipt-netflow/commit/66e4304101010108892376866334ec9317b427d8.patch
+https://bugs.gentoo.org/813993
+
+From: ABC <abc@openwall.com>
+Date: Wed, 14 Jul 2021 15:39:42 +0300
+Subject: [PATCH] Namespace sk_error_report
+
+sk_error_report is introduced in v5.14-rc1: e3ae2365efc14 ("net: sock:
+introduce sk_error_report").
+--- a/ipt_NETFLOW.c
++++ b/ipt_NETFLOW.c
+@@ -1943,7 +1943,7 @@ static struct ctl_path netflow_sysctl_path[] = {
+ #endif /* CONFIG_SYSCTL */
+ 
+ /* socket code */
+-static void sk_error_report(struct sock *sk)
++static void netflow_sk_error_report(struct sock *sk)
+ {
+ 	struct ipt_netflow_sock *usock;
+ 
+@@ -1974,7 +1974,7 @@ static struct socket *usock_open_sock(struct ipt_netflow_sock *usock)
+ 	}
+ 	sock->sk->sk_allocation = GFP_ATOMIC;
+ 	sock->sk->sk_prot->unhash(sock->sk); /* hidden from input */
+-	sock->sk->sk_error_report = &sk_error_report; /* clear ECONNREFUSED */
++	sock->sk->sk_error_report = &netflow_sk_error_report; /* clear ECONNREFUSED */
+ 	sock->sk->sk_user_data = usock;
+ 	sock->sk->sk_reuse = SK_CAN_REUSE;
+ 
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
index 35009fb8ac17..4665d475be3d 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
@@ -32,6 +32,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
 	"${FILESDIR}/${PN}-2.6-gentoo.patch"
 	"${FILESDIR}/${P}-ref_module_fix.patch" # bug #781014
+	"${FILESDIR}/${P}-fix-linux-headers-5.14.patch" # bug #813993
+
 )
 
 pkg_setup() {