From 12dba784f65b50cdbfec6618967b9bdaa37e0e78 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Fri, 10 Sep 2021 09:59:04 +0800 Subject: ntopng: upgrade 4.2 -> 5.0 Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- ...01-Makefile.in-don-t-use-the-internal-lua.patch | 16 +++---- ...001-configure.seed-fix-host-contamination.patch | 16 +++---- ...01-configure.seed-not-check-clang-on-host.patch | 25 +++++------ .../recipes-support/ntopng/ntopng_4.2.bb | 49 ---------------------- .../recipes-support/ntopng/ntopng_5.0.bb | 49 ++++++++++++++++++++++ 5 files changed, 76 insertions(+), 79 deletions(-) delete mode 100644 meta-networking/recipes-support/ntopng/ntopng_4.2.bb create mode 100644 meta-networking/recipes-support/ntopng/ntopng_5.0.bb (limited to 'meta-networking') 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 46724558c4..0f1ca8d324 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 @@ -1,4 +1,4 @@ -From 65c15247d268566b79e4595b8e734b7e40679d75 Mon Sep 17 00:00:00 2001 +From 52953ab99c727a19e88243dda2702d6814f7974d Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Wed, 4 Nov 2020 08:55:10 +0000 Subject: [PATCH] Makefile.in: don't use the internal lua @@ -15,18 +15,18 @@ Signed-off-by: Mingli Yu 1 file changed, 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 143535746..fc06a5341 100755 +index e67623bec..99cb9f06e 100755 --- a/Makefile.in +++ b/Makefile.in -@@ -40,7 +40,6 @@ endif - +@@ -31,7 +31,6 @@ MONGOOSE_INC=-I$(MONGOOSE_HOME) + LUA_PLATFORM=generi LUA_HOME=${PWD}/third-party/lua-5.3.5 LUA_INC=-I$(LUA_HOME)/src -LUA_LIB=$(LUA_HOME)/src/liblua.a - ###### - LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8 -@@ -118,7 +117,6 @@ RPM_PKG = $(TARGET)-$(NTOPNG_VERSION)-@REVISION@.$(PLATFORM).rpm + ifeq ($(OS),Linux) + LUA_PLATFORM=linux +@@ -123,7 +122,6 @@ RPM_PKG = $(TARGET)-$(NTOPNG_VERSION)-@REVISION@.$(PLATFORM).rpm RPM_DATA_PKG = $(TARGET)-data-$(NTOPNG_VERSION)-@REVISION@.noarch.rpm ###### @@ -35,5 +35,5 @@ index 143535746..fc06a5341 100755 ifneq ($(HAS_ZEROMQ), 0) LIB_TARGETS += $(ZEROMQ_LIB) -- -2.26.2 +2.17.1 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.seed-fix-host-contamination.patch index a5ac59fb32..02cd94a06c 100644 --- a/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-host-contamination.patch +++ b/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-host-contamination.patch @@ -1,4 +1,4 @@ -From 81e3512718f80965c26ccb1f9d694c91b121fea0 Mon Sep 17 00:00:00 2001 +From d9458227ddb4bbb8c63c607202a6854886d66090 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Wed, 4 Nov 2020 06:28:28 +0000 Subject: [PATCH] configure.seed: fix host contamination @@ -11,14 +11,14 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Mingli Yu --- - configure.seed | 47 +++++------------------------------------------ - 1 file changed, 5 insertions(+), 42 deletions(-) + configure.seed | 43 +++---------------------------------------- + 1 file changed, 3 insertions(+), 40 deletions(-) diff --git a/configure.seed b/configure.seed -index 03f9a31b0..58aebb5b8 100644 +index a148c530a..55bd49678 100644 --- a/configure.seed +++ b/configure.seed -@@ -79,31 +79,6 @@ fi +@@ -144,31 +144,6 @@ fi # REVISION=`git log --pretty=oneline | wc -l` @@ -50,7 +50,7 @@ index 03f9a31b0..58aebb5b8 100644 SHORT_MACHINE=`uname -m | cut -b1-3` GIT_RELEASE="@GIT_RELEASE@" -@@ -214,23 +189,11 @@ dnl> fi +@@ -293,23 +268,11 @@ fi pkg-config --exists libssl if test "$?" -ne 1; then AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) @@ -62,7 +62,7 @@ index 03f9a31b0..58aebb5b8 100644 - 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" +- 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]) @@ -78,5 +78,5 @@ index 03f9a31b0..58aebb5b8 100644 AC_CHECK_LIB([gcrypt], [gcry_cipher_checktag], [LDFLAGS="${LDFLAGS} -lgcrypt"]) -- -2.26.2 +2.17.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.seed-not-check-clang-on-host.patch index 95d1f99481..80761abd53 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.seed-not-check-clang-on-host.patch @@ -1,4 +1,4 @@ -From eead0c589b71d4256bf9f16492164786b0ee07e4 Mon Sep 17 00:00:00 2001 +From 5867be19e53a3cc09730b83282c83bdd26147cc3 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Mon, 9 Nov 2020 04:05:25 +0000 Subject: [PATCH] configure.seed: not check clang on host @@ -9,14 +9,14 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Mingli Yu --- - configure.seed | 19 ------------------- - 1 file changed, 19 deletions(-) + configure.seed | 16 ---------------- + 1 file changed, 16 deletions(-) diff --git a/configure.seed b/configure.seed -index d0335b599..cb97adca2 100644 +index 55bd49678..94bc0bc48 100644 --- a/configure.seed +++ b/configure.seed -@@ -509,25 +509,6 @@ if test $SYSTEM = "Darwin"; then +@@ -90,22 +90,6 @@ if test $SYSTEM = "FreeBSD" || test $SYSTEM = "Darwin"; then CFLAGS="-fno-color-diagnostics $CFLAGS" fi fi @@ -27,21 +27,18 @@ index d0335b599..cb97adca2 100644 - CXX=clang++ - AC_MSG_RESULT(Using clang++ compiler) - fi -- +- - if [ test -f /etc/redhat-release ]; then -- if [ test -f /usr/bin/lsb_release ]; then -- dnl> CentOS 7 -- CENTOS_N2N_DEP=", n2n" -- fi +- 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 +- 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.26.2 +2.17.1 diff --git a/meta-networking/recipes-support/ntopng/ntopng_4.2.bb b/meta-networking/recipes-support/ntopng/ntopng_4.2.bb deleted file mode 100644 index cc23207888..0000000000 --- a/meta-networking/recipes-support/ntopng/ntopng_4.2.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "Web-based Traffic and Security Network Traffic Monitoring" -DESCRIPTION = "ntopng is a web-based network traffic monitoring application \ -released under GPLv3. It is the new incarnation of the original \ -ntop written in 1998, and now revamped in terms of performance, \ -usability, and features." - -SECTION = "console/network" - -DEPENDS = "curl libmaxminddb libpcap lua mariadb ndpi json-c rrdtool zeromq" -RDEPENDS:${PN} = "bash redis" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRCREV = "5e649a2d1130b4a3ab0c5bb673d615172cc0bdbb" -SRC_URI = "git://github.com/ntop/ntopng.git;protocol=git;branch=4.2-stable \ - file://0001-configure.seed-fix-configure-error.patch \ - file://0001-configure.seed-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://ntopng.service \ -" - -S = "${WORKDIR}/git" - -# don't use the lua under thirdparty as it supports cross compiling badly -export LUA_LIB = "${STAGING_LIBDIR}/liblua.a" - -LDFLAGS:append:mipsarch = " -latomic" -LDFLAGS:append:powerpc = " -latomic" -LDFLAGS:append:riscv32 = " -latomic" -inherit autotools-brokensep gettext systemd - -do_install:append() { - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/ntopng.service ${D}${systemd_unitdir}/system -} - -FILES:${PN} += "\ - ${systemd_unitdir}/system/ntopng.service" - -FILES:${PN}-doc += "\ - /usr/man/man8/ntopng.8" - -do_configure:prepend() { - ${S}/autogen.sh -} - -SYSTEMD_SERVICE:${PN} = "ntopng.service" diff --git a/meta-networking/recipes-support/ntopng/ntopng_5.0.bb b/meta-networking/recipes-support/ntopng/ntopng_5.0.bb new file mode 100644 index 0000000000..89107430ea --- /dev/null +++ b/meta-networking/recipes-support/ntopng/ntopng_5.0.bb @@ -0,0 +1,49 @@ +SUMMARY = "Web-based Traffic and Security Network Traffic Monitoring" +DESCRIPTION = "ntopng is a web-based network traffic monitoring application \ +released under GPLv3. It is the new incarnation of the original \ +ntop written in 1998, and now revamped in terms of performance, \ +usability, and features." + +SECTION = "console/network" + +DEPENDS = "curl libmaxminddb libpcap lua mariadb ndpi json-c rrdtool zeromq" +RDEPENDS:${PN} = "bash redis" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRCREV = "85867090d92df4365c0af8d47f54ab3106117e59" +SRC_URI = "git://github.com/ntop/ntopng.git;protocol=git;branch=5.0-stable \ + file://0001-configure.seed-fix-configure-error.patch \ + file://0001-configure.seed-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://ntopng.service \ +" + +S = "${WORKDIR}/git" + +# don't use the lua under thirdparty as it supports cross compiling badly +export LUA_LIB = "${STAGING_LIBDIR}/liblua.a" + +LDFLAGS:append:mipsarch = " -latomic" +LDFLAGS:append:powerpc = " -latomic" +LDFLAGS:append:riscv32 = " -latomic" +inherit autotools-brokensep gettext systemd + +do_install:append() { + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/ntopng.service ${D}${systemd_unitdir}/system +} + +FILES:${PN} += "\ + ${systemd_unitdir}/system/ntopng.service" + +FILES:${PN}-doc += "\ + /usr/man/man8/ntopng.8" + +do_configure:prepend() { + ${S}/autogen.sh +} + +SYSTEMD_SERVICE:${PN} = "ntopng.service" -- cgit 1.2.3-korg