Codebase list iptables-netflow / 553762d
Support building with kernel 6.4. (Closes: #1038203) Based on patches by Lukasz Kalamlacki. Axel Beckert 9 months ago
3 changed file(s) with 47 addition(s) and 0 deletion(s). Raw diff Collapse all Expand all
+7
-0
debian/changelog less more
0 iptables-netflow (2.6-6) UNRELEASED; urgency=medium
1
2 * Add patch to support building with kernel 6.4 based on patches by
3 Lukasz Kalamlacki. (Closes: #1038203)
4
5 -- Axel Beckert <abe@debian.org> Wed, 05 Jul 2023 20:11:29 +0200
6
07 iptables-netflow (2.6-5) unstable; urgency=medium
18
29 [ Axel Beckert ]
+1
-0
debian/patches/series less more
77 cross.patch
88 Use-explicit-fallthrough-macro.patch
99 use-get_random_u32_below-instead-of-deprecated-prand.patch
10 support-kernel-6.4.patch
+39
-0
debian/patches/support-kernel-6.4.patch less more
0 Description: Cope with register_sysctl_paths removal in Linux kernel 6.4
1 Bug: https://github.com/aabc/ipt-netflow/issues/220
2 Bug-Debian: https://bugs.debian.org/1038203
3 Author: Lukasz Kalamlacki <kalamlacki@gmail.com>
4 Author: Axel Beckert <abe@debian.org>
5 Origin: https://github.com/kalamlacki/ipt-netflow/commit/2a1d250a701405b81fdf3548b4b9c12bf266a306 and https://github.com/kalamlacki/ipt-netflow/commit/373b58781a0fc99fcb354ea3b5e4f3a006a71ab6
6
7 --- a/ipt_NETFLOW.c
8 +++ b/ipt_NETFLOW.c
9 @@ -1929,6 +1929,7 @@
10 { }
11 };
12 #else /* >= 2.6.25 */
13 +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0)
14 static struct ctl_path netflow_sysctl_path[] = {
15 {
16 .procname = "net",
17 @@ -1939,6 +1940,7 @@
18 { .procname = "netflow" },
19 { }
20 };
21 +#endif /* 6.4.0 */
22 #endif /* 2.6.25 */
23 #endif /* CONFIG_SYSCTL */
24
25 @@ -5685,8 +5687,12 @@
26 #endif
27 );
28 #else /* 2.6.25 */
29 +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0)
30 netflow_sysctl_header = register_sysctl_paths(netflow_sysctl_path, netflow_sysctl_table);
31 -#endif
32 +#else
33 + netflow_sysctl_header = register_sysctl("net/netflow", netflow_sysctl_table);
34 +#endif /* 6.4.0 */
35 +#endif /* 2.6.25 */
36 if (!netflow_sysctl_header) {
37 printk(KERN_ERR "netflow: can't register to sysctl\n");
38 goto err_free_proc_stat3;