libndpi-master: removed package

libndpi: bump to 678dd61866944eae011fa96f1c6d39d0c201858e
nDPId-master: bump to 83409e5b79ab224372dd8486249c668b2998a0a4
nDPId: bump to 83409e5b79ab224372dd8486249c668b2998a0a4
potd: removed package
tools: bump to 6a7eabbfee8c8df1a21f3da6e0fd5643c40ee607

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

4 files changed, 37 insertions, 57 deletions

diff --git a/net/nDPId-master/Makefile b/net/nDPId-master/Makefile
index f26f327..5566306 100644
--- a/net/nDPId-master/Makefile
+++ b/net/nDPId-master/Makefile
@@ -1,12 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nDPId-master
-PKG_VERSION:=1.4
+PKG_VERSION:=1.5
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/lnslbrty/nDPId.git
-PKG_SOURCE_VERSION:=9e07a57566cc45bf92a845d8cee968d72e0f314e
+PKG_SOURCE_VERSION:=83409e5b79ab224372dd8486249c668b2998a0a4
+PKG_HASH:=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
@@ -65,14 +66,14 @@ endif
 define Build/Prepare
 	$(PKG_UNPACK)
 	$(Build/Patch)
-	$(SED) 's/^#define NDPI_API_VERSION.*/#define NDPI_API_VERSION 1/' \
-		$(PKG_BUILD_DIR)/libnDPI/src/include/ndpi_api.h.in
 	env \
+		CC="$(TARGET_CC)" \
+		AR="$(TARGET_AR)" \
+		RANLIB="$(TARGET_RANLIB)" \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="$(TARGET_CPPFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
-		CROSS_COMPILE_TRIPLET="$(GNU_TARGET_NAME)" \
-		MAKE_PROGRAM="env -uCFLAGS -uCPPFLAGS $(MAKE)" \
+		MAKE_PROGRAM="$(MAKE)" \
 		$(PKG_BUILD_DIR)/scripts/get-and-build-libndpi.sh
 endef
 
diff --git a/net/nDPId/Makefile b/net/nDPId/Makefile
index 5952ea3..e9b328b 100644
--- a/net/nDPId/Makefile
+++ b/net/nDPId/Makefile
@@ -1,23 +1,27 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nDPId
-PKG_VERSION:=1.4
+PKG_VERSION:=1.5
 PKG_RELEASE:=$(AUTORELEASE)
 
-PKG_SOURCE:=$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/lnslbrty/nDPId/archive/refs/tags
-PKG_HASH:=b2a95d7ea1798e48bccabf879f7327c7cc27db83301dafc483e01bff7dc2b4f4
+#PKG_SOURCE:=$(PKG_VERSION).tar.gz
+#PKG_SOURCE_URL:=https://github.com/lnslbrty/nDPId/archive/refs/tags
+#PKG_HASH:=a512d5fbdcdaef01a0c3ee7f6b8870ac9c6c870e11c1a30b782550e2cd247de7
+
+# 1.5 Release does not work with current libndpi builds.
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/lnslbrty/nDPId.git
+PKG_SOURCE_VERSION:=83409e5b79ab224372dd8486249c668b2998a0a4
+PKG_HASH:=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Toni
 PKG_LICENSE:=GPL-3
 PKG_LICENSE_FILES:=COPYING
-PKG_BUILD_DEPENDS:=libndpi-master
 
 CMAKE_INSTALL:=1
 
-NDPI_STATIC_LIB="$(STAGING_DIR)/usr/lib/libndpi-master.a"
-NDPI_INC="$(STAGING_DIR)/usr/include/ndpi-master"
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
@@ -25,7 +29,7 @@ define Package/nDPId
  TITLE:=nDPId is a tiny nDPI based daemons / toolkit
  SECTION:=net
  CATEGORY:=Network
- DEPENDS:=+libpcap +LIBNDPI_GCRYPT:libgcrypt
+ DEPENDS:=+libpcap +LIBNDPI_GCRYPT:libgcrypt +libndpi
  URL:=http://github.com/lnslbrty/nDPId
 endef
 
@@ -46,11 +50,8 @@ endef
 
 CMAKE_OPTIONS += -DBUILD_EXAMPLES=ON
 CMAKE_OPTIONS += -DBUILD_NDPI=OFF
-CMAKE_OPTIONS += -DNDPI_NO_PKGCONFIG=ON
 CMAKE_OPTIONS += -DENABLE_SANITIZER=OFF
 CMAKE_OPTIONS += -DENABLE_MEMORY_PROFILING=OFF
-CMAKE_OPTIONS += -DLIBNDPI_INC="$(NDPI_INC)"
-CMAKE_OPTIONS += -DLIBNDPI_LIB="$(NDPI_STATIC_LIB)"
 
 ifneq ($(CONFIG_LIBNDPI_GCRYPT),)
 CMAKE_OPTIONS += -DNDPI_WIDTH_GCRYPT=ON
diff --git a/net/nDPId/patches/001-enable-in-source-build.patch b/net/nDPId/patches/001-enable-in-source-build.patch
new file mode 100644
index 0000000..86432dc
--- /dev/null
+++ b/net/nDPId/patches/001-enable-in-source-build.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9045237..83f72b3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,12 +1,5 @@
+ cmake_minimum_required(VERSION 3.12.4)
+ project(nDPId C)
+-if("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
+-    message(FATAL_ERROR "In-source builds are not allowed.\n"
+-                        "Please remove ${PROJECT_SOURCE_DIR}/CMakeCache.txt\n"
+-                        "and\n"
+-                        "${PROJECT_SOURCE_DIR}/CMakeFiles\n"
+-                        "Create a build directory somewhere and run CMake again.")
+-endif()
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+ find_package(PkgConfig REQUIRED)
+ 
diff --git a/net/potd/Makefile b/net/potd/Makefile
deleted file mode 100644
index 49604fa..0000000
--- a/net/potd/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=potd
-PKG_VERSION:=1.0
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/lnslbrty/potd.git
-PKG_SOURCE_VERSION:=f8497db5d14eb139820173dccba58989c4f9ca5c
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_MIRROR_HASH:=ca26c057cb3de0ddd25a5b91c3daeffcfb692e603d22c4c70c3681db0e5f7f33
-PKG_MAINTAINER:=Toni Uhlig <matzeton@googlemail.com>
-
-PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/potd
-	SECTION:=net
-	CATEGORY:=Network
-	DEPENDS:=+libseccomp +libssh @KERNEL_NAMESPACES @KERNEL_UTS_NS @KERNEL_IPC_NS \
-	         @KERNEL_PID_NS @KERNEL_NET_NS @KERNEL_CGROUPS @KERNEL_CGROUP_PIDS
-	TITLE:=low to medium interactive SSH/TCP honeypot
-endef
-
-define Package/potd/description
-	A high scalable low to medium interactive SSH/TCP honeypot using Linux
-	Namespaces, capabilities, seccomp, cgroups designed for OpenWrt and IoT devices.
-endef
-
-define Package/potd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/potd $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,potd))