diff --git a/meta-networking/recipes-support/ntopng/files/0001-Follow-rrd-post-1.8-change.patch b/meta-networking/recipes-support/ntopng/files/0001-Follow-rrd-post-1.8-change.patch deleted file mode 100644 index eefd4e1ab2..0000000000 --- a/meta-networking/recipes-support/ntopng/files/0001-Follow-rrd-post-1.8-change.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a3bd9efe78f9c381f19b99c8ceb7f52b4c2a52b8 Mon Sep 17 00:00:00 2001 -From: Dmitry Baryshkov -Date: Wed, 5 Jun 2024 09:40:17 +0300 -Subject: [PATCH] Follow rrd post-1.8 change - -Git version of rrdtool has changed rrd_tune argument from char pointer -to const char pointer. GCC 14 is more strict regarding the pointer -constantness checks and errors out in such a case. Update rrd_tune -invokation. - -Signed-off-by: Dmitry Baryshkov -Upstream-Status: Pending [CLA is not signed on our side] ---- - src/LuaEngineNtop.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/LuaEngineNtop.cpp b/src/LuaEngineNtop.cpp -index bd2de79e3021..dd00f1608f78 100644 ---- a/src/LuaEngineNtop.cpp -+++ b/src/LuaEngineNtop.cpp -@@ -5427,7 +5427,7 @@ static int ntop_rrd_tune(lua_State* vm) { - filename = argv[1]; - - reset_rrd_state(); -- status = rrd_tune(argc, (char**)argv); -+ status = rrd_tune(argc, (const char**)argv); - - if(status != 0) { - char *err = rrd_get_error(); --- -2.39.2 - diff --git a/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch b/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch index bb5bcfbd63..402d679a90 100644 --- a/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch +++ b/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch @@ -14,26 +14,32 @@ Signed-off-by: Mingli Yu Makefile.in | 2 -- 1 file changed, 2 deletions(-) -diff --git a/Makefile.in b/Makefile.in -index d737e74..a611b16 100755 --- a/Makefile.in +++ b/Makefile.in -@@ -36,7 +36,6 @@ MONGOOSE_INC=-I$(MONGOOSE_HOME) +@@ -31,8 +31,6 @@ MONGOOSE_INC=-I$(MONGOOSE_HOME) + LUA_PLATFORM=generic - LUA_HOME=${PWD}/third-party/lua-5.4.3 - LUA_INC=-I$(LUA_HOME)/src + LUA_HOME=${PWD}/third-party/lua-5.4.6 +-LUA_INC=-I$(LUA_HOME)/src -LUA_LIB=$(LUA_HOME)/src/liblua.a - ifeq ($(OS),Linux) - LUA_PLATFORM=linux -@@ -102,7 +101,6 @@ RPM_PKG = $(TARGET)-$(NTOPNG_VERSION)-@REVISION@.$(PLATFORM).rpm - RPM_DATA_PKG = $(TARGET)-data-$(NTOPNG_VERSION)-@REVISION@.noarch.rpm + HAVE_CLICKHOUSE=@HAVE_CLICKHOUSE@ + CLICKHOUSE_HOME= +@@ -52,7 +50,7 @@ else ifeq ($(OS),Darwin) + LUA_PLATFORM=macosx + else ifeq ($(OS), $(filter $(OS), FreeBSD)) + LUA_PLATFORM=freebsd +- LUA_LIB=/usr/local/lib/liblua-5.3.a ++ LUA_LIB=liblua.a + endif + ###### +@@ -138,7 +136,7 @@ HEADERS = $(wildcard include/*.h) $(wild + INC = $(wildcard src/*.inc) + OBJECTS_NO_MAIN := $(filter-out src/main.o,$(OBJECTS)) --LIB_TARGETS = $(LUA_LIB) +-TEST_FILES = $(wildcard tests/src/*.cpp) ++TEST_FILES = $(wildcard tests/src/*.cpp) + TEST_HEADERS = $(wildcard tests/include/*.h) - ifneq ($(HAS_ZEROMQ), 0) - LIB_TARGETS += $(ZEROMQ_LIB) --- -2.25.1 - + %.o: %.c $(HEADERS) $(INC) Makefile diff --git a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-generate-configure.ac-only.patch b/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-generate-configure.ac-only.patch deleted file mode 100644 index 8d62147b9e..0000000000 --- a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-generate-configure.ac-only.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 22f0bec462763f1b0b92daa33133e274d3b45f4f Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Thu, 5 Nov 2020 00:05:21 -0800 -Subject: [PATCH] autogen.sh: generate configure.ac only - -The autogen.sh should only generate configure.ac and the -logic used to generate configure script should follow the -autotools.bbclass in oe. Otherwise there may comes below -do_configure error: - | checking whether we are cross compiling... configure: error: in `/path/tmp/work/core2-64-poky-linux/ndpi/3.4-r0/git': - | configure: error: cannot run C compiled programs. - | If you meant to cross compile, use `--host'. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Mingli Yu ---- - autogen.sh | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/autogen.sh b/autogen.sh -index 73f8d0ebe..15ff0aa84 100755 ---- a/autogen.sh -+++ b/autogen.sh -@@ -73,8 +73,3 @@ cat configure.seed | sed \ - > configure.ac - - rm -f config.h config.h.in *~ #* -- --echo "Wait please..." --autoreconf -if --echo "" --echo "Now run ./configure" --- -2.17.1 - diff --git a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch index c645110f22..b0cdcd8401 100644 --- a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch +++ b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch @@ -17,23 +17,42 @@ Signed-off-by: Khem Raj configure.ac.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -diff --git a/configure.ac.in b/configure.ac.in -index 7f4c0f893..c3299fda2 100644 --- a/configure.ac.in +++ b/configure.ac.in -@@ -193,10 +193,8 @@ if test -d /usr/local/include/ndpi ; then : +@@ -235,8 +235,9 @@ AC_ARG_WITH(ndpi-includes, + NDPI_CUST_INC="-I$withval -I$withval/../lib/third_party/include" + ]) + +-NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` +-NDPI_LIB= ++NDPI_INC="$NDPI_CFLAGS" ++NDPI_LIB="$NDPI_LIBS" ++ + NDPI_LIB_DEP= + + AS_VAR_IF(with_dynamic_ndpi, no, [ +@@ -267,11 +268,6 @@ AC_MSG_CHECKING(for nDPI source) + fi + ]) + +-AS_VAR_IF(with_dynamic_ndpi, yes, [ +- NDPI_LIB="-lndpi" +- NDPI_LIB_DEP=$NDPI_LIB +-]) +- + if test ! -z "$NDPI_CUST_INC" ; then : + NDPI_INC=$NDPI_CUST_INC + fi +@@ -280,12 +276,6 @@ if test ! -z "$NDPI_CUST_LIB" ; then : + NDPI_LIB=$NDPI_CUST_LIB fi - PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [ -- NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` -- # Use static libndpi library as building against the dynamic library fails -- NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic" -- #NDPI_LIB="$NDPI_LIBS" -+ NDPI_INC="$NDPI_CFLAGS" -+ NDPI_LIB="$NDPI_LIBS" - NDPI_LIB_DEP= - ], [ - AC_MSG_CHECKING(for nDPI source) --- -2.35.1 - +-if test -z "$NDPI_LIB" ; then : +- echo "Could not find nDPI" +- echo "Please do cd ..; git clone https://github.com/ntop/nDPI.git; cd nDPI; ./autogen.sh; ${MAKE}; cd ../ntopng" +- echo "and try again" +- exit 1 +-fi + dnl finish: nDPI handling + + AC_ARG_WITH(json-c-static, diff --git a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-configure-error.patch b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-configure-error.patch deleted file mode 100644 index d4908e3227..0000000000 --- a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-configure-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 29797dd037009d38e4976249ed21b2076240751e Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Wed, 4 Nov 2020 04:36:46 +0000 -Subject: [PATCH] configure.ac.in: fix configure error - -fix the below error: -configure: error: cannot run test program while cross compiling - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Mingli Yu ---- - configure.ac.in | 13 +------------ - 1 file changed, 1 insertion(+), 12 deletions(-) - -diff --git a/configure.ac.in b/configure.ac.in -index a321f9bbf..03f9a31b0 100644 ---- a/configure.ac.in -+++ b/configure.ac.in -@@ -642,18 +642,7 @@ if test x$radcli = xtrue; then - fi - fi - --AC_CACHE_CHECK([if pthread rwlocks are supported], [my_cv_rw_locks_supported], [ -- AC_TRY_RUN([ -- #include -- -- int main() { -- pthread_rwlock_t t; -- return 0; -- } --] --, [my_cv_rw_locks_supported=yes], [my_cv_rw_locks_supported=no]) --] --) -+AC_CACHE_CHECK([if pthread rwlocks are supported], [my_cv_rw_locks_supported]) - - if test "$my_cv_rw_locks_supported" = yes; then - AC_DEFINE_UNQUOTED(HAVE_RW_LOCK, 1, [pthread rwlocks supported]) --- -2.26.2 - diff --git a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch index 5e1440b3d6..e3c0534da8 100644 --- a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch +++ b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch @@ -14,17 +14,95 @@ Signed-off-by: Mingli Yu configure.ac.in | 43 +++---------------------------------------- 1 file changed, 3 insertions(+), 40 deletions(-) -diff --git a/configure.ac.in b/configure.ac.in -index 1d6380c..beffc6c 100644 --- a/configure.ac.in +++ b/configure.ac.in -@@ -167,31 +167,6 @@ fi - # - REVISION=`git log --pretty=oneline | wc -l` +@@ -83,30 +83,6 @@ if test "$with_dynamic_ndpi" = "yes"; th + AC_DEFINE([HAVE_DYNAMIC_NDPI], [1], [Define if using dynamic linking with nDPI]) + fi + +-dnl> CLANG_STDLIB="-stdlib=libc++" +- +-dnl> On Ubuntu do sudo apt-get install -y clang-14 clang-tools-14 +-if test "x$USE_CLANG" = xyes; then +- if test $SYSTEM = "Darwin"; then +- CC=clang +- CXX="clang++ -fno-color-diagnostics -fPIE -stdlib=libc++" +- else +- if test -x "/usr/bin/clang-10"; then +- CLANG_VERSION=10 +- elif test -x "/usr/bin/clang-13"; then +- CLANG_VERSION=13 +- elif test -x "/usr/bin/clang-14"; then +- CLANG_VERSION=14 +- else +- echo "Could not find clang. Please install clang-14 clang-tools-14" +- exit 1 +- fi +- +- CC=clang-$CLANG_VERSION +- CXX="clang++-$CLANG_VERSION -fno-color-diagnostics -fPIE $CLANG_STDLIB" +- fi +-fi +- + CFLAGS="${CFLAGS} -I${HERE} -I${HERE}/include" + CXXFLAGS="${CXXFLAGS} -I${HERE} -I${HERE}/include" + +@@ -122,7 +98,7 @@ fi + + if test -f /proc/device-tree/model; then + IS_RASPBERRY=`cat /proc/device-tree/model | grep -a -e "Orange Pi" -e Raspberry | wc -l` +- ++ + if test "$IS_RASPBERRY" = "1"; then + CFLAGS="${CFLAGS} -DHAVE_EMBEDDED_SUPPORT" + CXXFLAGS="${CXXFLAGS} -DHAVE_EMBEDDED_SUPPORT" +@@ -158,39 +134,6 @@ MAKE=make + BIN_PATH=/usr/bin + LIBPCAP=-lpcap + +-if test $SYSTEM = "FreeBSD" || test $SYSTEM = "Darwin"; then +- CFLAGS="${CFLAGS} -I/usr/local/include" +- LDFLAGS="${LDFLAGS} -L/usr/local/lib" +- +- dnl> https://github.com/google/sanitizers/wiki/AddressSanitizerFlags +- CC=clang +- CXX="clang++ -fpie -fno-color-diagnostics $CLANG_STDLIB" +- if test $SYSTEM = "FreeBSD"; then +- MAKE=gmake +- BIN_PATH=/usr/local/bin +- else +- dnl> Adds /opt if MacPorts is installed +- if [ test -f /opt/local/bin/port ]; then +- CFLAGS="${CFLAGS} -I/opt/local/include" +- LDFLAGS="${LDFLAGS} -L/opt/local/lib" +- fi +- fi +- dnl> CXX=clang++ -fsanitize=address -fsanitize-address-use-after-scope +- OSXV=`sw_vers -productVersion` +- if test $SYSTEM = "Darwin"; then +- OS="macOS $OSXV" +- else +- OS=`uname -or | cut -d '-' -f 1` +- fi +- if test $MACHINE = "x86_64"; then +- LDFLAGS="${LDFLAGS} -L/usr/local/opt/ntopng" +- RES=`g++ -Wall -fno-color-diagnostics Prefs.cpp 2>&1 | grep "unrecognized command line option "|wc -l` +- if test $RES -eq 0; then +- CFLAGS="-fno-color-diagnostics $CFLAGS" +- fi +- fi +-fi +- + dnl> Remove spaces + OS="${OS#"${OS%%[![:space:]]*}"}" + +@@ -237,31 +180,6 @@ if test "${with_nedge+set}" = set; then + LIBS="${LIBS} -lnetfilter_queue -lnfnetlink -lnetfilter_conntrack" + fi -if test -d "/usr/local/include"; then - CFLAGS="${CFLAGS} -I/usr/local/include" -- CPPFLAGS="${CPPFLAGS} -I/usr/local/include" +- CXXFLAGS="${CXXFLAGS} -I/usr/local/include" -fi - -if test -d "/usr/local/lib"; then @@ -33,7 +111,7 @@ index 1d6380c..beffc6c 100644 - -if test -d /opt/local/include; then : - CFLAGS="${CFLAGS} -I/opt/local/include" -- CPPFLAGS="${CPPFLAGS} -I/opt/local/include" +- CXXFLAGS="${CXXFLAGS} -I/opt/local/include" -fi - -if test -d /opt/local/lib; then : @@ -42,15 +120,26 @@ index 1d6380c..beffc6c 100644 - -if [ test -f /usr/bin/lsb_release ]; then - CODENAME=`/usr/bin/lsb_release -c|cut -f 2` -- if [[ $CODENAME == "wheezy" ]]; then : -- CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1" +- if test $CODENAME = "wheezy" ; then +- CXXFLAGS="${CXXFLAGS} -DOLD_NETFILTER_INTERFACE=1" - fi -fi - - SHORT_MACHINE=`uname -m | cut -b1-3` + if test -d "pro"; then + NTOPCLOUD_LIB= + NTOPCLOUD_HOME="../ntopcloud" +@@ -317,10 +235,6 @@ AC_ARG_WITH(ndpi-includes, + NDPI_CUST_INC="-I$withval -I$withval/../lib/third_party/include" + ]) - GIT_RELEASE="@GIT_RELEASE@" -@@ -300,23 +275,11 @@ fi +-if test -d /usr/local/include/ndpi ; then : +- echo "WARNING: /usr/local/include/ndpi is present and might lead to compile errors" +-fi +- + NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` + NDPI_LIB= + NDPI_LIB_DEP= +@@ -387,7 +301,7 @@ fi pkg-config --exists libssl if test "$?" -ne 1; then AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) @@ -58,25 +147,70 @@ index 1d6380c..beffc6c 100644 + SSL_INC="`pkg-config --cflags libssl`" SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto" else -- dnl Workaround for MacOS Brew -- if test -d "/usr/local/opt/openssl/lib"; then -- AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) -- SSL_INC="-I/usr/local/opt/openssl/include" -- SSL_LIB="-L/usr/local/opt/openssl/lib -lssl -lcrypto" -- dnl Workaround for FreeBSD + dnl Workaround for MacOS Brew +@@ -408,10 +322,6 @@ else + SSL_INC="-I/usr/local/opt/openssl/include" + SSL_LIB="-L/usr/local/opt/openssl/lib -lssl -lcrypto" + dnl Workaround for FreeBSD - elif test -f "/usr/lib/libssl.so"; then - AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) - SSL_INC="-I/usr/include" - SSL_LIB="-L/usr/lib -lssl -lcrypto" -- else -- echo "Please install openssl-dev(el) package prerequisite" -- exit -1 + else + echo "Please install openssl-dev(el) package prerequisite" + exit -1 +@@ -433,13 +343,6 @@ fi + AC_MSG_CHECKING(for ntopng professional edition) + + REDIS_SERVICE="redis.service" +-if [ test -f /usr/bin/lsb_release ]; then +- UBUNTU_RELEASE=`lsb_release -r|cut -f 2` +- UBUNTU_SUB_RELEASE=`echo $UBUNTU_RELEASE|cut -f 1 -d '.'` +- if test "$UBUNTU_SUB_RELEASE" = "8" || test "$UBUNTU_SUB_RELEASE" = "10"; then +- REDIS_SERVICE="redis-server.service" - fi -+ echo "Please install openssl-dev(el) package prerequisite" -+ exit -1 +-fi + + SERVICE_ALIAS= + SERVICE_REQUIRES= +@@ -497,7 +400,7 @@ fi + echo "Using clickhouse-cpp stored at ${CLICKHOUSE_HOME}" + + dnl> fi dnl> test $SYSTEM = "Linux" +- ++ + AC_DEFINE_UNQUOTED(NTOPNG_PRO_GIT_RELEASE, "r${PRO_GIT_RELEASE}", [ntopng professional release]) + AC_DEFINE_UNQUOTED(NTOPNG_PRO_GIT_DATE, "${PRO_GIT_DATE}", [ntopng professional date]) + DUMMY=`cd ./pro; ${MAKE} build` +@@ -531,21 +434,7 @@ if test -f ".git/index"; then fi - AC_CHECK_LIB([gcrypt], [gcry_cipher_checktag], [LIBS="${LIBS} -lgcrypt"]) --- -2.25.1 - + if test $SYSTEM = "Linux"; then +- if [ test -f /usr/bin/lsb_release ]; then +- OSNAME=`/usr/bin/lsb_release -d|cut -d ':' -f 2| sed -e 's/^[[[:space:]]]*//'` +- OS="$OSNAME" +- else +- if test -f /etc/debian_version; then +- DEBIAN_VERSION=`cat /etc/debian_version` +- OSNAME="Debian $DEBIAN_VERSION" +- else +- if test -f /etc/redhat-release; then +- OS=`cat /etc/redhat-release | cut -d '(' -f 1 | awk '{$1=$1};1'` +- else +- OS=`./config.guess` +- fi +- fi +- fi ++ OS=`./config.guess` + else + dnl> wget -O config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' + if test $SYSTEM = "FreeBSD"; then +@@ -575,7 +464,7 @@ AS_VAR_IF(with_hiredis, yes, [ + else + pkg-config --exists hiredis + if test "$?" -ne 1; then +- HIREDIS_INC="`pkg-config --cflags hiredis` -I/usr/include/hiredis" ++ HIREDIS_INC="`pkg-config --cflags hiredis`" + if test $SYSTEM = "FreeBSD" && $FREEBSD_VERSION != "15"; then + dnl> Note: on freebsd 15 .a is not installed + HIREDIS_LIB="/usr/local/lib/libhiredis.a" diff --git a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-not-check-clang-on-host.patch b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-not-check-clang-on-host.patch deleted file mode 100644 index ffb106723c..0000000000 --- a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-not-check-clang-on-host.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 5867be19e53a3cc09730b83282c83bdd26147cc3 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Mon, 9 Nov 2020 04:05:25 +0000 -Subject: [PATCH] configure.ac.in: not check clang on host - -Don't check clang on host to avoid host contamination. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Mingli Yu ---- - configure.ac.in | 16 ---------------- - 1 file changed, 16 deletions(-) - -diff --git a/configure.ac.in b/configure.ac.in -index 55bd49678..94bc0bc48 100644 ---- a/configure.ac.in -+++ b/configure.ac.in -@@ -90,22 +90,6 @@ if test $SYSTEM = "FreeBSD" || test $SYSTEM = "Darwin"; then - CFLAGS="-fno-color-diagnostics $CFLAGS" - fi - fi --else -- if test $SYSTEM = "Linux"; then -- if [ test -f /usr/bin/clang++ ]; then -- CC=clang -- CXX=clang++ -- AC_MSG_RESULT(Using clang++ compiler) -- fi -- -- if [ test -f /etc/redhat-release ]; then -- OS=`cat /etc/redhat-release` -- else -- if [ test -f /usr/bin/lsb_release ]; then -- OS=`/usr/bin/lsb_release -d|cut -d ':' -f 2` -- fi -- fi -- fi - fi - - dnl> Remove spaces --- -2.17.1 - diff --git a/meta-networking/recipes-support/ntopng/files/0001-luaengine-Use-lua-5.5-API-signature-for-lua_newstate.patch b/meta-networking/recipes-support/ntopng/files/0001-luaengine-Use-lua-5.5-API-signature-for-lua_newstate.patch new file mode 100644 index 0000000000..8046d755c2 --- /dev/null +++ b/meta-networking/recipes-support/ntopng/files/0001-luaengine-Use-lua-5.5-API-signature-for-lua_newstate.patch @@ -0,0 +1,31 @@ +From 6c4806436c3214e32487d05ce099ac86b0b2519c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 22 Mar 2026 10:08:01 -0700 +Subject: [PATCH] luaengine: Use lua 5.5 API signature for lua_newstate + +in Lua 5.5 lua_newstate gained a third argument, + +lua_State *lua_newstate(lua_Alloc f, void *ud, unsigned int seed); + +The 5.5 manual says that third argument, seed, +is "a seed for the hashing of strings," and the 5.5 incompatibilities +section explicitly calls out that lua_newstate now has +a third parameter. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/LuaEngine.cpp | 64 +++++++++++++++++++++++------------------------ + 1 file changed, 32 insertions(+), 32 deletions(-) + +--- a/src/LuaEngine.cpp ++++ b/src/LuaEngine.cpp +@@ -154,7 +154,7 @@ LuaEngine::LuaEngine() { + is_system_vm = false; + mem_used = 0; + +- L = lua_newstate(l_alloc, this); ++ L = lua_newstate(l_alloc, this, luaL_makeseed(NULL)); + + if (!L) { + ntop->getTrace()->traceEvent(TRACE_ERROR, "Unable to create a new Lua state."); diff --git a/meta-networking/recipes-support/ntopng/ndpi_5.0.bb b/meta-networking/recipes-support/ntopng/ndpi_5.0.bb index e2040eda18..6eadf8ba62 100644 --- a/meta-networking/recipes-support/ntopng/ndpi_5.0.bb +++ b/meta-networking/recipes-support/ntopng/ndpi_5.0.bb @@ -21,6 +21,10 @@ do_configure:prepend() { (cd ${S} && ${S}/autogen.sh) } +do_install:append() { + install -Dm 0644 ${B}/src/include/ndpi_define.h ${D}${includedir}/ndpi/ndpi_define.h +} + EXTRA_OEMAKE = " \ libdir=${libdir} \ " diff --git a/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb b/meta-networking/recipes-support/ntopng/ntopng_6.6.bb similarity index 76% rename from meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb rename to meta-networking/recipes-support/ntopng/ntopng_6.6.bb index 014706893a..3c039781d8 100644 --- a/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb +++ b/meta-networking/recipes-support/ntopng/ntopng_6.6.bb @@ -11,27 +11,28 @@ RDEPENDS:${PN} = "bash redis" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRCREV = "d3ce78948e8d81dc1e2c5298ce556f9f2247aac1" -SRC_URI = "git://github.com/ntop/ntopng.git;protocol=https;branch=5.2-stable \ - file://0001-configure.ac.in-fix-configure-error.patch \ +SRCREV = "d3a1229954dd783af06c9fd2dcd9ce926826a228" +SRC_URI = "gitsm://github.com/ntop/ntopng;protocol=https;branch=6.6-stable \ file://0001-configure.ac.in-fix-host-contamination.patch \ file://0001-Makefile.in-don-t-use-the-internal-lua.patch \ - file://0001-autogen.sh-generate-configure.ac-only.patch \ - file://0001-configure.ac.in-not-check-clang-on-host.patch \ file://0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch \ - file://0001-Follow-rrd-post-1.8-change.patch \ + file://0001-luaengine-Use-lua-5.5-API-signature-for-lua_newstate.patch \ file://ntopng.service \ " - # don't use the lua under thirdparty as it supports cross compiling badly -export LUA_LIB = "${STAGING_LIBDIR}/liblua.a" - +export LUA_LIB = "-llua" +export LUA_INC = "-I${STAGING_INCDIR}" +export NDPI_CUST_INC = "-I${STAGING_INCDIR}/ndpi" +export NDPI_CUST_LIB = "-lndpi" LDFLAGS:append:mipsarch = " -latomic" LDFLAGS:append:powerpc = " -latomic" LDFLAGS:append:riscv32 = " -latomic" + inherit autotools-brokensep gettext pkgconfig systemd +EXTRA_OECONF += "--with-dynamic-ndpi" + do_install:append() { install -d ${D}${systemd_unitdir}/system/ install -m 0644 ${UNPACKDIR}/ntopng.service ${D}${systemd_unitdir}/system