From 53de5ab42221cc8acf5e42215c9411858aa93d38 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 9 Oct 2024 11:15:40 +0200
Subject: [PATCH] Fix for Kernel 6.12

---
 ndpi-netfilter2/Makefile                           |  2 +-
 .../patches/302-fix-build-with-linux-6.12.patch    | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 xtables-addons/patches/302-fix-build-with-linux-6.12.patch

diff --git a/ndpi-netfilter2/Makefile b/ndpi-netfilter2/Makefile
index 249859718..6990f3bdf 100644
--- a/ndpi-netfilter2/Makefile
+++ b/ndpi-netfilter2/Makefile
@@ -83,7 +83,7 @@ define KernelPackage/ipt-ndpi
 	TITLE:= nDPI net netfilter module
 #	DEPENDS:=+kmod-nf-conntrack +kmod-nf-conntrack-netlink +kmod-ipt-compat-xtables +libpcap @(LINUX_5_4||LINUX_5_15||TARGET_x86_64)
 #	DEPENDS:=+kmod-nf-conntrack +kmod-nf-conntrack-netlink +kmod-ipt-compat-xtables +libpcap @(LINUX_5_4||LINUX_5_15) @!TARGET_ramips
-	DEPENDS:=+kmod-nf-conntrack +kmod-nf-conntrack-netlink +(LINUX_5_4||LINUX_6_1):kmod-ipt-compat-xtables +libpcap @!TARGET_ramips @!LINUX_6_6 @!LINUX_6_10 @!LINUX_6_11
+	DEPENDS:=+kmod-nf-conntrack +kmod-nf-conntrack-netlink +(LINUX_5_4||LINUX_6_1):kmod-ipt-compat-xtables +libpcap @!TARGET_ramips @!LINUX_6_6 @!LINUX_6_10 @!LINUX_6_11 @!LINUX_6_12
 #	DEPENDS:=+kmod-nf-conntrack +kmod-nf-conntrack-netlink +kmod-ipt-compat-xtables +libpcap
 	KCONFIG:=CONFIG_NF_CONNTRACK_LABELS=y \
 	    CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y
diff --git a/xtables-addons/patches/302-fix-build-with-linux-6.12.patch b/xtables-addons/patches/302-fix-build-with-linux-6.12.patch
new file mode 100644
index 000000000..020003dcc
--- /dev/null
+++ b/xtables-addons/patches/302-fix-build-with-linux-6.12.patch
@@ -0,0 +1,14 @@
+--- a/extensions/xt_ipp2p.c	2024-10-08 14:14:40.759989875 +0200
++++ b/extensions/xt_ipp2p.c	2024-10-08 14:16:04.042851316 +0200
+@@ -6,7 +6,11 @@
+ #include <linux/netfilter_ipv4/ip_tables.h>
+ #include <net/tcp.h>
+ #include <net/udp.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)
+ #include <asm/unaligned.h>
++#else
++#include <linux/unaligned.h>
++#endif
+ #include "xt_ipp2p.h"
+ #include "compat_xtables.h"
+