diff -Nru iptables-netflow-2.6/debian/changelog iptables-netflow-2.6/debian/changelog --- iptables-netflow-2.6/debian/changelog 2023-06-08 14:27:55.000000000 +0000 +++ iptables-netflow-2.6/debian/changelog 2023-10-31 13:58:07.000000000 +0000 @@ -1,3 +1,10 @@ +iptables-netflow (2.6-2ubuntu3) jammy; urgency=medium + + * Support linux 6.5 (LP: #2042094): + - debian/patches/support-kernel-6.4.patch + + -- Andrea Righi Tue, 31 Oct 2023 13:58:07 +0000 + iptables-netflow (2.6-2ubuntu2) jammy; urgency=medium * Support Linux 6.2 (LP: #2023306): diff -Nru iptables-netflow-2.6/debian/patches/series iptables-netflow-2.6/debian/patches/series --- iptables-netflow-2.6/debian/patches/series 2023-06-08 14:27:03.000000000 +0000 +++ iptables-netflow-2.6/debian/patches/series 2023-10-31 13:58:07.000000000 +0000 @@ -6,3 +6,4 @@ 0010-support-kernel-5.15.patch Use-explicit-fallthrough-macro.patch use-get_random_u32_below-instead-of-deprecated-prand.patch +support-kernel-6.4.patch diff -Nru iptables-netflow-2.6/debian/patches/support-kernel-6.4.patch iptables-netflow-2.6/debian/patches/support-kernel-6.4.patch --- iptables-netflow-2.6/debian/patches/support-kernel-6.4.patch 1970-01-01 00:00:00.000000000 +0000 +++ iptables-netflow-2.6/debian/patches/support-kernel-6.4.patch 2023-10-31 13:58:07.000000000 +0000 @@ -0,0 +1,41 @@ +Description: Cope with register_sysctl_paths removal in Linux kernel 6.4 +Bug: https://github.com/aabc/ipt-netflow/issues/220 +Bug-Debian: https://bugs.debian.org/1038203 +Author: Lukasz Kalamlacki +Author: Axel Beckert +Origin: https://github.com/kalamlacki/ipt-netflow/commit/2a1d250a701405b81fdf3548b4b9c12bf266a306 and https://github.com/kalamlacki/ipt-netflow/commit/373b58781a0fc99fcb354ea3b5e4f3a006a71ab6 + +Index: iptables-netflow-2.6/ipt_NETFLOW.c +=================================================================== +--- iptables-netflow-2.6.orig/ipt_NETFLOW.c ++++ iptables-netflow-2.6/ipt_NETFLOW.c +@@ -1929,6 +1929,7 @@ static ctl_table netflow_net_table[] = { + { } + }; + #else /* >= 2.6.25 */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0) + static struct ctl_path netflow_sysctl_path[] = { + { + .procname = "net", +@@ -1939,6 +1940,7 @@ static struct ctl_path netflow_sysctl_pa + { .procname = "netflow" }, + { } + }; ++#endif /* 6.4.0 */ + #endif /* 2.6.25 */ + #endif /* CONFIG_SYSCTL */ + +@@ -5695,8 +5697,12 @@ static int __init ipt_netflow_init(void) + #endif + ); + #else /* 2.6.25 */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0) + netflow_sysctl_header = register_sysctl_paths(netflow_sysctl_path, netflow_sysctl_table); +-#endif ++#else ++ netflow_sysctl_header = register_sysctl("net/netflow", netflow_sysctl_table); ++#endif /* 6.4.0 */ ++#endif /* 2.6.25 */ + if (!netflow_sysctl_header) { + printk(KERN_ERR "netflow: can't register to sysctl\n"); + goto err_free_proc_stat3;