From 008cdcc468eefa739471a29d9dab93eb3832f87d Mon Sep 17 00:00:00 2001 From: Ycarus Date: Sat, 20 Oct 2018 09:08:49 +0200 Subject: [PATCH] Update ndpi-netfilter2 --- ndpi-netfilter2/Makefile | 12 ++++++------ ndpi-netfilter2/patches/config.patch | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 ndpi-netfilter2/patches/config.patch diff --git a/ndpi-netfilter2/Makefile b/ndpi-netfilter2/Makefile index d7c87eb2d..786438575 100644 --- a/ndpi-netfilter2/Makefile +++ b/ndpi-netfilter2/Makefile @@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ndpi-netfilter2 -PKG_VERSION:=97099ff +PKG_VERSION:=a360566 PKG_RELEASE:=1 -PKG_REV:=97099ff +PKG_REV:=a360566 PKG_SOURCE_PROTO:=git PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -30,15 +30,15 @@ define Package/iptables-mod-ndpi CATEGORY:=Network TITLE:=ndpi successor of OpenDPI URL:=http://www.ntop.org/products/ndpi/ - DEPENDS:=+iptables +iptables-mod-conntrack-extra +kmod-ipt-ndpi - MAINTAINER:=Thomas Heil + DEPENDS:=+iptables +iptables-mod-conntrack-extra +kmod-ipt-ndpi +libpcap + MAINTAINER:=Ycarus (Yannick Chabanois) endef define Package/iptables-mod-ndpi/description nDPI is a ntop-maintained superset of the popular OpenDPI library endef -CONFIGURE_CMD=./autogen.sh +CONFIGURE_CMD = ./autogen.sh CONFIGURE_ARGS += --with-pic MAKE_PATH := ndpi-netfilter @@ -64,7 +64,7 @@ endef define KernelPackage/ipt-ndpi SUBMENU:=Netfilter Extensions TITLE:= nDPI net netfilter module - DEPENDS:=+kmod-nf-conntrack +kmod-nf-conntrack-netlink +kmod-ipt-compat-xtables + 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 diff --git a/ndpi-netfilter2/patches/config.patch b/ndpi-netfilter2/patches/config.patch new file mode 100644 index 000000000..2890cf5b7 --- /dev/null +++ b/ndpi-netfilter2/patches/config.patch @@ -0,0 +1,15 @@ +--- a/configure.seed 2018-10-01 15:23:58.000000000 +0200 ++++ b/configure.seed 2018-08-22 08:29:35.000000000 +0200 +@@ -52,11 +51,6 @@ + AC_CHECK_LIB([numa], [numa_available], [LIBNUMA="-lnuma"]) + fi + +-if test -z `which clang`; then +-CC=gcc +-else +-CC=clang +-fi +- ++ + HS_LIB= + HS_INC=