gentoo auto-resync : 19:01:2024 - 14:07:55

4 files changed, 70 insertions, 3 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index ace00bd7f7d0..5055042c4f4f 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index bcf8328d36da..1dd5a5364f05 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,9 +1,10 @@
 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-kernel-6.4.patch 1934 BLAKE2B 05f6a7565e8c65757ee915a8d9437feede5041057dd4d7789e8cc40b2b1c471d7781f747ba650d10311c773e17d8bf5b125b056800364c78c0ce931b7b352572 SHA512 fd2040c6abf8f01c6ad0534396e44b4fc827e7a09ca757c778d6b0308da1b7036713f83cfa2a451a716e0fc7e1d67b1d8a5a95ee5551db5c28a5d785c753cab0
 AUX ipt_netflow-2.6-ref_module_fix.patch 1908 BLAKE2B 2f59dbf1e5986549a67319c478ba831eb4c835d52aa16cdc216d4cb893f99560ea3a15936489cdf809b9e886aab888095fb66dca9acb467a44da6bbb5acec6ae SHA512 5e76e4f2982fe3f4ca961f93bdb4b20865d5e2fbd600001798457eafb561057a6beb3da75fffa91265429ed145220b9f25a1facb4447405ba9990c90289f4ae4
 AUX ipt_netflow-9999-gentoo.patch 1840 BLAKE2B f5f7481e812f40596a089c168eba13bbba1c3b94b8efa292dd9835e2e4221f9d8b05c5482d998139f02a564a18bd6cc70f3a7b24cd10ca1ad41b00a4ce761b67 SHA512 fc11824637ee471f5ede8a4cecf667596bd3ad6b458da119c7028701c236bf634381b275fce0d4abd0fe8a13bf5392d32dc8fdc23fcb7e1ab50bcc61d71a82d5
 DIST ipt_netflow-2.6.tar.gz 95752 BLAKE2B 088c7030addd34d9d889cfa705aa060d0793e33be957deb3b703daea4229afc24f7268285ce336e425a024dc9d8139633a5206ff9d769c95cf71c156acbd4f25 SHA512 0ccea556e25dc6bc2d8c7648ed1b4ab366097baf5b06f167ccd19d2adb0a195ad652635181573785f9e9fa208d163f22b6527310eb939455d7ee3bc141cbeed5
-EBUILD ipt_netflow-2.6-r1.ebuild 2419 BLAKE2B 2760633b8f3ef0a060fb3d02f9acd3b19a345b3ee5e24206cb3014feb8169733a6b1b1d5f459345787a2c0736807a7a78db3b47bba60ba476a2b8c8628c27cb1 SHA512 7a27a79add050b2b83b81128a1521b98c8e92dbb6cc897214faf867b143fc895c12b0daa2627837e434cb9e8697a7a10e4c52bd85b80da2ddbebcf6226bfdc05
+EBUILD ipt_netflow-2.6-r1.ebuild 2469 BLAKE2B 0661063a852a7be4416c05d2e5fda8fa37c47b5687cc0a9691bda6fb213a2c22871816f63df12cb4338ebb055b5fb067c2ccc2bb24d024fb59edf2f4cfa1b880 SHA512 6918b3b1148af085c798b0c037acc74c4ca56aecc60d888811a8e74efbfdd2556329121424639c5d9f44e6f253356f2470cb551579b2fa0ba92bb04122437ef7
 EBUILD ipt_netflow-9999.ebuild 2303 BLAKE2B c6f6f15eae8f8e7837b2e0d14658c4c7cccec3441f55fe96edc25440cc78526b4a7cb737de06be9842ac904047ba96af40d447d91f6b29f461b278c5e0d469ff SHA512 e5da85534c11907e415896afa39658c9f4fdc2d6c7699244d4a10f736b4cc51de3c85167c486ddcc2af1cf48854277dfc215a1e1f16112cc82a96fed2d86a480
 MISC metadata.xml 618 BLAKE2B e2a825f374a432c7d1abe90ab4ac3af148428db80fb28117dd2865bc7b80cc05af5dff3343b95ce0a60ab92fd4ccbc1061d61442f3f03249d8bff2e85b471408 SHA512 0aae1d806aee7b372d9faa2788c51726e44fd0b1784a8118a3a36fdbbbc2cdc85abd9a5f71be78abc13483b0a5d6f6a067f72f9f8c89b1dd97f63f6921f92263
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.6-kernel-6.4.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.6-kernel-6.4.patch
new file mode 100644
index 000000000000..cfbca8823d79
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.6-kernel-6.4.patch
@@ -0,0 +1,66 @@
+From 0eb2092e930c78fc726d5d05abbcc81aa6c41b89 Mon Sep 17 00:00:00 2001
+From: ABC <abc@openwall.com>
+Date: Mon, 26 Jun 2023 16:29:58 -0300
+Subject: [PATCH] Build compatibility with v6.4 (register_sysctl_paths)
+
+'register_sysctl_paths' is missed from v6.4 due to 0199849acd07
+("sysctl: remove register_sysctl_paths()").
+
+Signed-off-by: ABC <abc@openwall.com>
+
+Slightly modified to fit on 2.6 release
+---
+ gen_compat_def |  2 ++
+ ipt_NETFLOW.c  | 10 ++++++++--
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/gen_compat_def b/gen_compat_def
+index 396fdb9..a9cb95e 100755
+--- a/gen_compat_def
++++ b/gen_compat_def
+@@ -87,6 +87,8 @@
+ kbuild_test_symbol nf_bridge_info_get linux/netfilter_bridge.h
+ # Stumbled on 5.9
+ kbuild_test_struct vlan_dev_priv linux/if_vlan.h
++# 6.4: 0199849acd07 ("sysctl: remove register_sysctl_paths()")
++kbuild_test_symbol register_sysctl_paths linux/sysctl.h
+ 
+ echo "// End of compat_def.h"
+ 
+diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
+index b3c2c99..eee8074 100644
+--- a/ipt_NETFLOW.c
++++ b/ipt_NETFLOW.c
+@@ -1929,16 +1929,18 @@ static ctl_table netflow_net_table[] = {
+ 	{ }
+ };
+ #else /* >= 2.6.25 */
++# ifdef HAVE_REGISTER_SYSCTL_PATHS
+ static struct ctl_path netflow_sysctl_path[] = {
+ 	{
+ 		.procname = "net",
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
++#  if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
+ 		.ctl_name = CTL_NET
+-#endif
++#  endif
+ 	},
+ 	{ .procname = "netflow" },
+ 	{ }
+ };
++# endif
+ #endif /* 2.6.25 */
+ #endif /* CONFIG_SYSCTL */
+ 
+@@ -5666,7 +5668,11 @@ static int __init ipt_netflow_init(void)
+ #endif
+ 						      );
+ #else /* 2.6.25 */
++# ifdef HAVE_REGISTER_SYSCTL_PATHS
+ 	netflow_sysctl_header = register_sysctl_paths(netflow_sysctl_path, netflow_sysctl_table);
++# else
++	netflow_sysctl_header = register_sysctl("net/netflow", netflow_sysctl_table);
++# endif
+ #endif
+ 	if (!netflow_sysctl_header) {
+ 		printk(KERN_ERR "netflow: can't register to sysctl\n");
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild
index 5cbcfb78c715..08997f3178c2 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.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
@@ -33,7 +33,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.6-gentoo.patch"
 	"${FILESDIR}/${P}-ref_module_fix.patch" # bug #781014
 	"${FILESDIR}/${P}-fix-linux-headers-5.14.patch" # bug #813993
-
+	"${FILESDIR}/${P}-kernel-6.4.patch" # bug #921589
 )
 
 pkg_setup() {