ndpi-netfilter: bump to nDPI v0.4.9 at 101242023

koshev-msk · Dec 8, 2023 · eb30c9f · eb30c9f
1 parent 958ef52
commit eb30c9f
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 9 deletions.
diff --git a/packages/net/ndpi-netfilter/Makefile b/packages/net/ndpi-netfilter/Makefile
@@ -11,8 +11,8 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ndpi-netfilter
-PKG_REV:=2c3fd8d4af7e4420a6a08105ea9a490a8e39a474
-PKG_VERSION:=04282023-flow_info-4
+PKG_REV:=9a6412b70daf21034e1ae93980585a2edd79a70d
+PKG_VERSION:=10242023-flow_info-4
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
@@ -76,15 +76,13 @@ define KernelPackage/ipt-ndpi
   SUBMENU:=Netfilter Extensions
   TITLE:= nDPI net netfilter module
   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
   FILES:= $(PKG_BUILD_DIR)/ndpi-netfilter/src/xt_ndpi.ko
-  AUTOLOAD:=$(call AutoProbe,xt_ndpi)
   KCONFIG:=\
 	CONFIG_LIVEPATCH=y \
 	CONFIG_NF_CONNTRACK=y \
 	CONFIG_NF_CONNTRACK_LABELS=y \
 	CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y
+  AUTOLOAD:=$(call AutoProbe,xt_ndpi)
 endef
 
 $(eval $(call BuildPackage,iptables-mod-ndpi))

diff --git a/packages/net/ndpi-netfilter/patches/0002-skbuff-check_fix.patch b/packages/net/ndpi-netfilter/patches/0002-skbuff-check_fix.patch
@@ -1,10 +1,19 @@
---- a/ndpi-netfilter/src/Makefile	2022-08-03 19:15:39.849630013 +0200
-+++ b/ndpi-netfilter/src/Makefile	2022-08-03 19:15:57.481336123 +0200
-@@ -13,7 +13,7 @@
+--- a/ndpi-netfilter/src/Makefile
++++ b/ndpi-netfilter/src/Makefile
+@@ -3,7 +3,7 @@ NDPI_PRO := ${NDPI_SRC}/lib/protocols
+
+ ccflags-y += -I${src}/${NDPI_SRC}/include -I${src}/${NDPI_SRC}/lib -I${src}/../libre -I${src}/${NDPI_SRC}/lib/third_party/include 
+ ccflags-y += -DHAVE_CONFIG_H -DNDPI_LIB_COMPILATION -DOPENDPI_NETFILTER_MODULE -DNDPI_DETECTION_SUPPORT_IPV6 -g 
+-ccflags-y += -Wno-declaration-after-statement
++ccflags-y += -Wno-declaration-after-statement -Werror=frame-larger-than=4096
+ ifeq ($(KERNEL_RELEASE),5.15)
+ ifeq ($(ARCH),arm64) 
+ 	ccflags-y += -mno-outline-atomics
+@@ -17,7 +17,7 @@ ifndef $(KERNEL_DIR)
  KERNEL_DIR := /lib/modules/$(shell uname -r)/build
  endif
 
--ifeq ($(shell test -f $(KERNEL_DIR)/source/include/linux/skbuff.h && grep -qc userid $(KERNEL_DIR)/source/include/linux/skbuff.h),1)
+-ifeq ($(shell test -f $(KERNEL_DIR)/source/include/linux/skbuff.h && grep -c userid $(KERNEL_DIR)/source/include/linux/skbuff.h),1)
 +ifeq ($(shell test -f $(KERNEL_DIR)/include/linux/skbuff.h && shell grep -qc userid $(KERNEL_DIR)/include/linux/skbuff.h),1)
  ccflags-y += -DUSE_HACK_USERID=1
  endif

diff --git a/packages/net/ndpi-netfilter/patches/0003-fix-build-murmurhash.patch b/packages/net/ndpi-netfilter/patches/0003-fix-build-murmurhash.patch
@@ -0,0 +1,21 @@
+--- a/src/lib/third_party/src/hll/MurmurHash3.c
++++ b/src/lib/third_party/src/hll/MurmurHash3.c
+@@ -44,15 +44,18 @@ u_int32_t MurmurHash(const void *key, u_
+     case 3:
+       k1 ^= (u_int32_t)tail[2] << 16;
+       /* fall-through */
++      break;
+     case 2:
+       k1 ^= (u_int32_t)tail[1] << 8;
+       /* fall-through */
++      break;
+     case 1:
+       k1 ^= tail[0];
+       k1 *= c1;
+       k1 = ROTL32(k1, 15);
+       k1 *= c2;
+       h1 ^= k1;
++      break;
+     };
+
+   h1 ^= len;