3 files changed, 61 insertions, 45 deletions

diff --git a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch b/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch
deleted file mode 100644
index d5c7f5f1cc..0000000000
--- a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d482bcc8fca90afc95ac3cbe848a3c9d7ad81ddc Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Wed, 4 Nov 2020 23:37:44 -0800
-Subject: [PATCH] autogen.sh: not generate configure
-
-Only use autogen.sh to generate configure.ac.
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
-
-refresh patch to 4.0
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- autogen.sh | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/autogen.sh b/autogen.sh
-index 0aa7507..36e0423 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -33,10 +33,3 @@ if test -z $PKG_CONFIG; then
-     echo "pkg-config is missing: please install it (apt-get install pkg-config) and try again"
-     exit
- fi
--
--autoreconf -ivf
--
--echo "./configure $@"
--chmod +x configure
--./configure $@
--
--- 
-2.25.1
-
diff --git a/meta-networking/recipes-support/ntopng/files/0001-configure-Stop-embedding-pwd-at-configure-time.patch b/meta-networking/recipes-support/ntopng/files/0001-configure-Stop-embedding-pwd-at-configure-time.patch
new file mode 100644
index 0000000000..b8b0b04bf4
--- /dev/null
+++ b/meta-networking/recipes-support/ntopng/files/0001-configure-Stop-embedding-pwd-at-configure-time.patch
@@ -0,0 +1,55 @@
+From 25129a49bd220b4668e1df474b1b1549885aaced Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 20 Mar 2026 09:47:12 -0700
+Subject: [PATCH] configure: Stop embedding pwd at configure time
+
+NDPI_BASE_DIR seems to unused and currently encodes hardcoded
+absolute paths in for it breaking repeoducible builds
+
+Upstream-Status: Inappropriate [OE-Specific]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure.ac | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6984b38b5..1b9aae4df 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -353,7 +353,7 @@ case "$host" in
+         if test -f $PCAP_HOME/lib/libpfring.a; then :
+           PFRING_LIB=$PCAP_HOME/lib/libpfring.a
+         fi
+-        
++
+          PCAP_LIB="$PCAP_HOME/libpcap/libpcap.a $PFRING_LIB $LIBNUMA `$PCAP_HOME/lib/pfring_config --libs`"
+          AC_CHECK_LIB([rt], [clock_gettime],   [PCAP_LIB="$PCAP_LIB -lrt"])
+          AC_CHECK_LIB([nl], [nl_handle_alloc], [PCAP_LIB="$PCAP_LIB -lnl"])
+@@ -438,7 +438,7 @@ PCRE2_ENABLED=0
+ AC_ARG_WITH(pcre2, AS_HELP_STRING([--with-pcre2], [Enable nDPI build with libpcre2]))
+ if test "${with_pcre2+set}" = set; then :
+   AC_CHECK_LIB(pcre2-8, pcre2_compile_8, AC_DEFINE_UNQUOTED(HAVE_PCRE2, 1, [libpcre2(-dev) is present]))
+-  
++
+  if test "x$ac_cv_lib_pcre2_8_pcre2_compile_8" = xyes; then :
+    ADDITIONAL_LIBS="${ADDITIONAL_LIBS} -lpcre2-8"
+    PCRE2_ENABLED=1
+@@ -456,11 +456,6 @@ if test "${with_maxminddb+set}" = set; then :
+   fi
+ fi
+ 
+-dnl> Use absolute source directory for NDPI_BASE_DIR
+-NDPI_ABS_SRCDIR="`cd ${srcdir} && pwd`"
+-AC_DEFINE_UNQUOTED(NDPI_BASE_DIR, "${NDPI_ABS_SRCDIR}", [nDPI base directory])
+-AC_SUBST(NDPI_BASE_DIR, "${NDPI_ABS_SRCDIR}")
+-
+ dnl> Curl
+ dnl> AC_CHECK_LIB([curl], [curl_easy_perform])
+ dnl> if test ${ac_cv_lib_curl_curl_easy_perform} = "no"; then
+@@ -515,5 +510,4 @@ AC_SUBST(DISABLE_NPCAP)
+ AC_SUBST(EXE_SUFFIX)
+ AC_SUBST(NDPI_CFLAGS)
+ AC_SUBST(NDPI_LDFLAGS)
+-AC_SUBST(NDPI_BASE_DIR)
+ AC_OUTPUT
diff --git a/meta-networking/recipes-support/ntopng/ndpi_4.2.bb b/meta-networking/recipes-support/ntopng/ndpi_5.0.bb
index 66d24e4cd8..e2040eda18 100644
--- a/meta-networking/recipes-support/ntopng/ndpi_4.2.bb
+++ b/meta-networking/recipes-support/ntopng/ndpi_5.0.bb
@@ -8,23 +8,19 @@ RDEPENDS:${PN} += " libpcap"
 LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24"
 
-SRCREV = "8b5c6af71b562549f8416b31803daae223e09f46"
-SRC_URI = "git://github.com/ntop/nDPI.git;branch=4.2-stable;protocol=https \
-           file://0001-autogen.sh-not-generate-configure.patch \
-           "
+SRCREV = "375f99ef9fb4999d778b57bbeece171b3fa9fba6"
+SRC_URI = "git://github.com/ntop/nDPI.git;branch=5.0-stable;protocol=https;tag=${PV} \
+           file://0001-configure-Stop-embedding-pwd-at-configure-time.patch \
+          "
 
-
-inherit autotools-brokensep pkgconfig
+inherit autotools pkgconfig
 
 CPPFLAGS += "${SELECTED_OPTIMIZATION}"
 
 do_configure:prepend() {
-    ${S}/autogen.sh
+    (cd ${S} && ${S}/autogen.sh)
 }
 
 EXTRA_OEMAKE = " \
     libdir=${libdir} \
 "
-
-# remove this CVE_STATUS, when the recipe is updated to 4.12 or newer
-CVE_STATUS[CVE-2025-25066] = "cpe-incorrect: Version 4.2 is not vulnerable yet"