From 9337bd30daea345bbce39797764be574d015520f Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sat, 18 Feb 2023 17:37:34 +0100
Subject: [PATCH] Update ndpi-netfilter2

---
 ndpi-netfilter2/Makefile              |  2 +-
 ndpi-netfilter2/patches/fcommon.patch | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 ndpi-netfilter2/patches/fcommon.patch

diff --git a/ndpi-netfilter2/Makefile b/ndpi-netfilter2/Makefile
index 13f73dc14..8983cff1b 100644
--- a/ndpi-netfilter2/Makefile
+++ b/ndpi-netfilter2/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ndpi-netfilter2
 PKG_RELEASE:=4
-PKG_REV:=cf017cc2fecee644d0b2ff633a17377f776d1505
+PKG_REV:=ac0ad66b3644a43cbaa821a6135d3e610f8b2c1a
 PKG_VERSION:=4-$(PKG_REV)
 
 PKG_SOURCE_PROTO:=git
diff --git a/ndpi-netfilter2/patches/fcommon.patch b/ndpi-netfilter2/patches/fcommon.patch
deleted file mode 100644
index faa8c57cf..000000000
--- a/ndpi-netfilter2/patches/fcommon.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/ndpi-netfilter/ipt/Makefile.anc	2022-09-05 09:34:30.579787766 +0200
-+++ b/ndpi-netfilter/ipt/Makefile	2022-09-05 09:34:42.555588398 +0200
-@@ -2,14 +2,14 @@
- NDPI_PRO := ${NDPI_SRC}/lib/protocols
- XTBL := $(shell pkg-config --variable=xtlibdir xtables)
- 
--CFLAGS = -fPIC -I../.. -I${NDPI_SRC}/include -I${NDPI_SRC}/lib -I../src -I../libre -DOPENDPI_NETFILTER_MODULE -O2 -Wall
-+CFLAGS = -fPIC -I../.. -I${NDPI_SRC}/include -I${NDPI_SRC}/lib -I../src -I../libre -DOPENDPI_NETFILTER_MODULE -O2 -Wall -fcommon
- 
- all:  libxt_ndpi.so
- install:  libxt_ndpi.so
- 	if [ -n "$(DESTDIR)$(XTBL)" -a -d "$(DESTDIR)$(XTBL)" ]; then install -v libxt_ndpi.so $(DESTDIR)$(XTBL); ln -fs libxt_ndpi.so $(DESTDIR)$(XTBL)/libxt_NDPI.so ; else echo "No pkg-config --variable=xtlibdir xtables"; fi
- 
- lib%.so: lib%.o
--	$(CC) -shared -o $@ $^;
-+	$(CC) -shared -nostartfiles -o $@ $^;
- lib%.o: lib%.c ../src/xt_ndpi.h ${NDPI_SRC}/include/ndpi_config.h ../libre/regexp.h ../libre/regexp.c
- 	$(CC) ${CFLAGS} -D_INIT=lib$*_init -c -o $@ $<;
- clean: