diff mbox series

[meta-networking,2/2] ntopng: upgrade 5.0 -> 5.2.1

Message ID 1644333127-6545-2-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series [meta-networking,1/2] ndpi: upgrade 4.0 -> 4.2 | expand

Commit Message

Mingyu Wang (Fujitsu) Feb. 8, 2022, 3:12 p.m. UTC 
change configure.seed to configure.ac.in
refresh 0001-Makefile.in-don-t-use-the-internal-lua.patch

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...kefile.in-don-t-use-the-internal-lua.patch | 12 +++++-----
 ...configure.ac.in-fix-configure-error.patch} | 10 ++++----
 ...figure.ac.in-fix-host-contamination.patch} | 24 +++++++++----------
 ...igure.ac.in-not-check-clang-on-host.patch} | 10 ++++----
 .../ntopng/{ntopng_5.0.bb => ntopng_5.2.1.bb} | 12 +++++-----
 5 files changed, 34 insertions(+), 34 deletions(-)
 rename meta-networking/recipes-support/ntopng/files/{0001-configure.seed-fix-configure-error.patch => 0001-configure.ac.in-fix-configure-error.patch} (84%)
 rename meta-networking/recipes-support/ntopng/files/{0001-configure.seed-fix-host-contamination.patch => 0001-configure.ac.in-fix-host-contamination.patch} (81%)
 rename meta-networking/recipes-support/ntopng/files/{0001-configure.seed-not-check-clang-on-host.patch => 0001-configure.ac.in-not-check-clang-on-host.patch} (83%)
 rename meta-networking/recipes-support/ntopng/{ntopng_5.0.bb => ntopng_5.2.1.bb} (83%)
diff mbox series

Patch

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 0f1ca8d324..bb5bcfbd63 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
@@ -15,18 +15,18 @@  Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
  1 file changed, 2 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index e67623bec..99cb9f06e 100755
+index d737e74..a611b16 100755
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -31,7 +31,6 @@ MONGOOSE_INC=-I$(MONGOOSE_HOME)
- LUA_PLATFORM=generi
- LUA_HOME=${PWD}/third-party/lua-5.3.5
+@@ -36,7 +36,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_LIB=$(LUA_HOME)/src/liblua.a
  
  ifeq ($(OS),Linux)
  	LUA_PLATFORM=linux
-@@ -123,7 +122,6 @@ RPM_PKG = $(TARGET)-$(NTOPNG_VERSION)-@REVISION@.$(PLATFORM).rpm
+@@ -102,7 +101,6 @@ RPM_PKG = $(TARGET)-$(NTOPNG_VERSION)-@REVISION@.$(PLATFORM).rpm
  RPM_DATA_PKG = $(TARGET)-data-$(NTOPNG_VERSION)-@REVISION@.noarch.rpm
  ######
  
@@ -35,5 +35,5 @@  index e67623bec..99cb9f06e 100755
  ifneq ($(HAS_ZEROMQ), 0)
  LIB_TARGETS += $(ZEROMQ_LIB)
 -- 
-2.17.1
+2.25.1
 
diff --git a/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-configure-error.patch b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-configure-error.patch
similarity index 84%
rename from meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-configure-error.patch
rename to meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-configure-error.patch
index dffab24ca2..d4908e3227 100644
--- a/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-configure-error.patch
+++ b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-configure-error.patch
@@ -1,7 +1,7 @@ 
 From 29797dd037009d38e4976249ed21b2076240751e Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
 Date: Wed, 4 Nov 2020 04:36:46 +0000
-Subject: [PATCH] configure.seed: fix configure error
+Subject: [PATCH] configure.ac.in: fix configure error
 
 fix the below error:
 configure: error: cannot run test program while cross compiling
@@ -10,13 +10,13 @@  Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
 ---
- configure.seed | 13 +------------
+ configure.ac.in | 13 +------------
  1 file changed, 1 insertion(+), 12 deletions(-)
 
-diff --git a/configure.seed b/configure.seed
+diff --git a/configure.ac.in b/configure.ac.in
 index a321f9bbf..03f9a31b0 100644
---- a/configure.seed
-+++ b/configure.seed
+--- a/configure.ac.in
++++ b/configure.ac.in
 @@ -642,18 +642,7 @@ if test x$radcli = xtrue; then
    fi
  fi
diff --git a/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-host-contamination.patch b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch
similarity index 81%
rename from meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-host-contamination.patch
rename to meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch
index 02cd94a06c..5e1440b3d6 100644
--- a/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-host-contamination.patch
+++ b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch
@@ -1,7 +1,7 @@ 
 From d9458227ddb4bbb8c63c607202a6854886d66090 Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
 Date: Wed, 4 Nov 2020 06:28:28 +0000
-Subject: [PATCH] configure.seed: fix host contamination
+Subject: [PATCH] configure.ac.in: fix host contamination
 
 Fix below error:
 This autoconf log indicates errors, it looked at host include and/or
@@ -11,14 +11,14 @@  Upstream-Status: Inappropriate [OE specific]
 
 Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
 ---
- configure.seed | 43 +++----------------------------------------
+ configure.ac.in | 43 +++----------------------------------------
  1 file changed, 3 insertions(+), 40 deletions(-)
 
-diff --git a/configure.seed b/configure.seed
-index a148c530a..55bd49678 100644
---- a/configure.seed
-+++ b/configure.seed
-@@ -144,31 +144,6 @@ fi
+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`
  
@@ -28,7 +28,7 @@  index a148c530a..55bd49678 100644
 -fi
 -
 -if test -d "/usr/local/lib"; then
--  LDFLAGS="${LDFLAGS} -L/usr/local/lib"
+-  LIBS="${LIBS} -L/usr/local/lib"
 -fi
 -
 -if test -d /opt/local/include; then :
@@ -37,7 +37,7 @@  index a148c530a..55bd49678 100644
 -fi
 -
 -if test -d /opt/local/lib; then :
--  LDFLAGS="${LDFLAGS} -L/opt/local/lib"
+-  LIBS="${LIBS} -L/opt/local/lib"
 -fi
 -
 -if [ test -f /usr/bin/lsb_release ]; then
@@ -50,7 +50,7 @@  index a148c530a..55bd49678 100644
  SHORT_MACHINE=`uname -m | cut -b1-3`
  
  GIT_RELEASE="@GIT_RELEASE@"
-@@ -293,23 +268,11 @@ fi
+@@ -300,23 +275,11 @@ fi
  pkg-config --exists libssl
  if test "$?" -ne 1; then
    AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
@@ -76,7 +76,7 @@  index a148c530a..55bd49678 100644
 +  exit -1
  fi
  
- AC_CHECK_LIB([gcrypt], [gcry_cipher_checktag], [LDFLAGS="${LDFLAGS} -lgcrypt"])
+ AC_CHECK_LIB([gcrypt], [gcry_cipher_checktag], [LIBS="${LIBS} -lgcrypt"])
 -- 
-2.17.1
+2.25.1
 
diff --git a/meta-networking/recipes-support/ntopng/files/0001-configure.seed-not-check-clang-on-host.patch b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-not-check-clang-on-host.patch
similarity index 83%
rename from meta-networking/recipes-support/ntopng/files/0001-configure.seed-not-check-clang-on-host.patch
rename to meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-not-check-clang-on-host.patch
index 80761abd53..ffb106723c 100644
--- a/meta-networking/recipes-support/ntopng/files/0001-configure.seed-not-check-clang-on-host.patch
+++ b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-not-check-clang-on-host.patch
@@ -1,7 +1,7 @@ 
 From 5867be19e53a3cc09730b83282c83bdd26147cc3 Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
 Date: Mon, 9 Nov 2020 04:05:25 +0000
-Subject: [PATCH] configure.seed: not check clang on host
+Subject: [PATCH] configure.ac.in: not check clang on host
 
 Don't check clang on host to avoid host contamination.
 
@@ -9,13 +9,13 @@  Upstream-Status: Inappropriate [OE specific]
 
 Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
 ---
- configure.seed | 16 ----------------
+ configure.ac.in | 16 ----------------
  1 file changed, 16 deletions(-)
 
-diff --git a/configure.seed b/configure.seed
+diff --git a/configure.ac.in b/configure.ac.in
 index 55bd49678..94bc0bc48 100644
---- a/configure.seed
-+++ b/configure.seed
+--- 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
diff --git a/meta-networking/recipes-support/ntopng/ntopng_5.0.bb b/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb
similarity index 83%
rename from meta-networking/recipes-support/ntopng/ntopng_5.0.bb
rename to meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb
index c4b8db3889..63046e730e 100644
--- a/meta-networking/recipes-support/ntopng/ntopng_5.0.bb
+++ b/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb
@@ -11,15 +11,15 @@  RDEPENDS:${PN} = "bash redis"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-SRCREV = "85867090d92df4365c0af8d47f54ab3106117e59"
-SRC_URI = "git://github.com/ntop/ntopng.git;protocol=https;branch=5.0-stable \
-           file://0001-configure.seed-fix-configure-error.patch \
-           file://0001-configure.seed-fix-host-contamination.patch \
+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 \
+           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.seed-not-check-clang-on-host.patch \
+           file://0001-configure.ac.in-not-check-clang-on-host.patch \
            file://ntopng.service \
-"
+           "
 
 S = "${WORKDIR}/git"