Updates / Fixesmain

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

5 files changed, 29 insertions, 15 deletions

diff --git a/libs/libndpi/Makefile b/libs/libndpi/Makefile
index 5aa1920..7664674 100644
--- a/libs/libndpi/Makefile
+++ b/libs/libndpi/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libndpi
-PKG_VERSION:=4.4
+PKG_VERSION:=4.8
 PKG_RELEASE:=$(PKT_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/ntop/nDPI.git
-PKG_SOURCE_VERSION:=678dd61866944eae011fa96f1c6d39d0c201858e
-PKG_MIRROR_HASH:=777d4860a0320da8258a4f9878f1afde443e531600040ca55a51389e1f1b4ec6
+PKG_SOURCE_VERSION:=56aade032e49402f102361cdf76bc43b00a73f31
+PKG_MIRROR_HASH:=c1167bee63341571a3f9935a119a772d82cdd33808e32db1323ab672b23b7eed
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
diff --git a/net/nDPId-master/Makefile b/net/nDPId-master/Makefile
index 8ae8398..0605a31 100644
--- a/net/nDPId-master/Makefile
+++ b/net/nDPId-master/Makefile
@@ -5,8 +5,8 @@ PKG_VERSION:=1.5
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/lnslbrty/nDPId.git
-PKG_SOURCE_VERSION:=94aa02b298321005b6334262242c30eeb94549ae
+PKG_SOURCE_URL:=https://github.com/utoni/nDPId.git
+PKG_SOURCE_VERSION:=84b12cd02c1f11d134f00b0a066414a677a53719
 PKG_HASH:=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -25,7 +25,7 @@ define Package/nDPId-master
  SECTION:=net
  CATEGORY:=Network
  DEPENDS:=@!SMALL_FLASH @!LOW_MEMORY_FOOTPRINT +libpcap +zlib +LIBNDPI_GCRYPT:libgcrypt
- URL:=http://github.com/lnslbrty/nDPId
+ URL:=http://github.com/utoni/nDPId
 endef
 
 define Package/nDPId-master/description
diff --git a/net/nDPId-master/patches/001-enable-in-source-build.patch b/net/nDPId-master/patches/001-enable-in-source-build.patch
index 86432dc..d710fe5 100644
--- a/net/nDPId-master/patches/001-enable-in-source-build.patch
+++ b/net/nDPId-master/patches/001-enable-in-source-build.patch
@@ -1,10 +1,21 @@
+From f1fca0f22009a94f8021f43363de560a666801ae Mon Sep 17 00:00:00 2001
+From: Toni Uhlig <matzeton@googlemail.com>
+Date: Sun, 5 Nov 2023 22:02:19 +0100
+Subject: [PATCH] Allow in-source builds required for OpenWrt toolchain.
+
+Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
+---
+ CMakeLists.txt | 7 -------
+ 1 file changed, 7 deletions(-)
+
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9045237..83f72b3 100644
+index 21020d5e..9664652e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1,12 +1,5 @@
- cmake_minimum_required(VERSION 3.12.4)
- project(nDPId C)
+@@ -10,13 +10,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ endif(CMAKE_COMPILER_IS_GNUCXX)
+ set(CMAKE_C_STANDARD 11)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -D_DEFAULT_SOURCE=1 -D_GNU_SOURCE=1")
 -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"
@@ -15,3 +26,6 @@ index 9045237..83f72b3 100644
  set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
  find_package(PkgConfig REQUIRED)
  
+-- 
+2.39.2
+
diff --git a/net/nDPId/Makefile b/net/nDPId/Makefile
index 770df0f..a410915 100644
--- a/net/nDPId/Makefile
+++ b/net/nDPId/Makefile
@@ -5,13 +5,13 @@ 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_SOURCE_URL:=https://github.com/utoni/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_SOURCE_URL:=https://github.com/utoni/nDPId.git
+PKG_SOURCE_VERSION:=c9514136b7c4246a57b85474d1a8e376a9009d4a
 PKG_HASH:=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -30,7 +30,7 @@ define Package/nDPId
  SECTION:=net
  CATEGORY:=Network
  DEPENDS:=@!SMALL_FLASH @!LOW_MEMORY_FOOTPRINT +libpcap +LIBNDPI_GCRYPT:libgcrypt +libndpi
- URL:=http://github.com/lnslbrty/nDPId
+ URL:=http://github.com/utoni/nDPId
 endef
 
 define Package/nDPId/description
diff --git a/net/suricata-update/Makefile b/net/suricata-update/Makefile
index b7c3615..b64ecb1 100644
--- a/net/suricata-update/Makefile
+++ b/net/suricata-update/Makefile
@@ -23,7 +23,7 @@ define Package/suricata-update
     SUBMENU:=Firewall
     SECTION:=net
     CATEGORY:=Network
-    DEPENDS:=+suricata6 +python3-pip +python3-yaml
+    DEPENDS:=+python3-pip +python3-yaml
     TITLE:=OISF Suricata IDS Update Utility
     URL:=https://www.openinfosecfoundation.org/
 endef