[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/, net-analyzer/ntopng/files/
commit: 5ced7e912eed74c16aec44873a8ac8478be2caf5 Author: John Helmert III gentoo org> AuthorDate: Tue Apr 13 12:49:24 2021 + Commit: John Helmert III gentoo org> CommitDate: Tue Apr 13 12:49:24 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ced7e91 net-analyzer/ntopng: cleanup <4.2 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: John Helmert III gentoo.org> net-analyzer/ntopng/Manifest | 2 - .../ntopng/files/ntopng-3.8-mysqltool.patch| 17 --- .../ntopng/files/ntopng-3.8-ndpi-includes.patch| 14 --- .../ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch | 95 .../ntopng/files/ntopng-3.8.1-parallel-make.patch | 15 --- .../ntopng/files/ntopng-4.0-PKG_CONFIG.patch | 124 - net-analyzer/ntopng/ntopng-3.8.1-r4.ebuild | 99 net-analyzer/ntopng/ntopng-4.0.ebuild | 99 8 files changed, 465 deletions(-) diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest index 854955fed75..29da3cb09be 100644 --- a/net-analyzer/ntopng/Manifest +++ b/net-analyzer/ntopng/Manifest @@ -1,3 +1 @@ -DIST ntopng-3.8.1.tar.gz 33914341 BLAKE2B 3b0df382e938af78d10e71282e863ccb7ba1da3dc7e2bf90b45f1e6e4670052a8c61a16cb8547f119f0dc753a2e31273b41f40aa26919480cbaecf43b6d59742 SHA512 4cb613881e36b435f97dcc25dfaa505d9c552f63ad8334d5c9d47ec06376d47124c65e6d782546d36f6d27b34b037cc73df7129f459f290ac51e270bb7453970 -DIST ntopng-4.0.tar.gz 43239175 BLAKE2B 689883685d46d339d61c338607e2164e36903313cdc0e0e2b649acd7468505f72fce75118a2c3ef55e54d942fc5cc3c312efbd46f8e2603bbcfaf206908bce82 SHA512 a278cc5f304e3040b31c691286650a54d61b5587033724c4513dd7372168477d5b0b471a1d2a5c5682034464b022b88e971567a38d836216431ea77bf1ed90c9 DIST ntopng-4.2.tar.gz 57554819 BLAKE2B a9eaf7ea670dbd9c830696a4b017330e25a82307852a0a85d95ddbb4e32a3123d43eda1b686c359da1fef77e601cd3791dcdf257141e2e1d3ed7974b92edaac8 SHA512 e89ec3f35644ae8bc570d9802ecfadbf0067145e23a589df2032e8781e9c954f4166d3abb650ddafc65e4fbad656730ee1abf9c5273d3e09f8173d423436b8ff diff --git a/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch deleted file mode 100644 index 62c328a3505..000 --- a/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch +++ /dev/null @@ -1,17 +0,0 @@ a/configure.seed -+++ b/configure.seed -@@ -355,13 +355,7 @@ - if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then -MYSQLTOOL="mariadb_config" - else -- PATH=$PATH:/usr/local/mysql/bin -- AC_CHECK_TOOL(MYSQL, mysql_config) -- if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then -- MYSQLTOOL="mysql_config" -- else -- MYSQLTOOL="" -- fi -+ MYSQLTOOL="mysql_config" - fi - - if test -n "$MYSQLTOOL"; then diff --git a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch deleted file mode 100644 index cdd5e827147..000 --- a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch +++ /dev/null @@ -1,14 +0,0 @@ a/configure.seed -+++ b/configure.seed -@@ -129,9 +129,9 @@ - fi - - PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [ -- NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"`/libndpi -+ 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_LIB_DEP= -], [ - AC_MSG_CHECKING(for nDPI source) diff --git a/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch b/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch deleted file mode 100644 index 12117d791bc..000 --- a/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch +++ /dev/null @@ -1,95 +0,0 @@ a/configure.seed -+++ b/configure.seed -@@ -6,6 +6,8 @@ - - AC_PROG_CXX - -+PKG_PROG_PKG_CONFIG -+ - dnl> Add /usr/local/ /opt/local - CFLAGS="-I${PWD} -I${PWD}/include" - CPPFLAGS="${CPPFLAGS} -I${PWD} -I${PWD}/include" -@@ -179,10 +179,10 @@ - fi - dnl finish: nDPI handling - --if test -z `pkg-config --exists libssl`; then -+if ${PKG_CONFIG} --exists libssl; then - AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) -- SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl" -- SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto" -+ SSL_INC="`${PKG_CONFIG} --cflags libssl` -I/usr/include/openssl" -+ SSL_LIB="`${PKG_CONFIG} --libs libssl` -lssl -lcrypto" - fi - - AC_MSG_CHECKING(for ntopng professional edition) a/Makefile.in -+++ b/Makefile.in -@@ -44,10 +44,10 @@ - - ## - LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8 --HAS_LIBRRDTOOL=$(shell pkg-config --atleast-version=1.4.8 librrd; echo $$?) -+HAS_LIBRRDTOOL=$(shell $(PKG_CONFIG) --atleast-version=1.4.8 librrd; echo $$?) - ifeq ($(HAS_LIBRRDTOOL), 0) -- LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd) --
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/, net-analyzer/ntopng/files/
commit: 919a2b7edd0ef2ed9763ccbb7022336fdba5b8a0 Author: Jeroen Roovers gentoo org> AuthorDate: Sun Dec 29 14:46:59 2019 + Commit: Jeroen Roovers gentoo org> CommitDate: Sun Dec 29 15:20:22 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=919a2b7e net-analyzer/ntopng: Use PKG_CONFIG, drop test phase Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Jeroen Roovers gentoo.org> .../ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch | 95 ++ ...{ntopng-3.8.1.ebuild => ntopng-3.8.1-r1.ebuild} | 12 ++- 2 files changed, 106 insertions(+), 1 deletion(-) diff --git a/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch b/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch new file mode 100644 index 000..91811d66bbd --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch @@ -0,0 +1,95 @@ +--- a/configure.seed b/configure.seed +@@ -6,6 +6,8 @@ + + AC_PROG_CXX + ++PKG_PROG_PKG_CONFIG ++ + dnl> Add /usr/local/ /opt/local + CFLAGS="-I${PWD} -I${PWD}/include" + CPPFLAGS="${CPPFLAGS} -I${PWD} -I${PWD}/include" +@@ -179,10 +179,10 @@ + fi + dnl finish: nDPI handling + +-if test -z `pkg-config --exists libssl`; then ++if ${PKG_CONFIG} --exists libssl; then + AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) +- SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl" +- SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto" ++ SSL_INC="`${PKG_CONFIG} --cflags libssl` -I/usr/include/openssl" ++ SSL_LIB="`${PKG_CONFIG} --libs libssl` -lssl -lcrypto" + fi + + AC_MSG_CHECKING(for ntopng professional edition) +--- a/Makefile.in b/Makefile.in +@@ -44,10 +44,10 @@ + + ## + LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8 +-HAS_LIBRRDTOOL=$(shell pkg-config --atleast-version=1.4.8 librrd; echo $$?) ++HAS_LIBRRDTOOL=$(shell $(PKG_CONFIG) --atleast-version=1.4.8 librrd; echo $$?) + ifeq ($(HAS_LIBRRDTOOL), 0) +- LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd) +- LIBRRDTOOL_LIB = $(shell pkg-config --libs librrd) # -lrrd_th ++ LIBRRDTOOL_INC = $(shell $(PKG_CONFIG) --cflags librrd) ++ LIBRRDTOOL_LIB = $(shell $(PKG_CONFIG) --libs librrd) # -lrrd_th + else + LIBRRDTOOL_INC=-I$(LIBRRDTOOL_HOME)/src/ + ifeq ($(OS), $(filter $(OS), OpenBSD FreeBSD)) +@@ -70,10 +70,10 @@ + + ## + +-HAS_JSON=$(shell pkg-config --exists json-c; echo $$?) ++HAS_JSON=$(shell $(PKG_CONFIG) --exists json-c; echo $$?) + ifeq ($(HAS_JSON), 0) +- JSON_INC = $(shell pkg-config --cflags json-c) +- JSON_LIB = $(shell pkg-config --libs json-c) ++ JSON_INC = $(shell $(PKG_CONFIG) --cflags json-c) ++ JSON_LIB = $(shell $(PKG_CONFIG) --libs json-c) + else + JSON_HOME=${PWD}/third-party/json-c + JSON_INC=-I$(JSON_HOME) +@@ -83,21 +83,21 @@ + ## + + ifeq (@NEDGE@, 0) +- HAS_SODIUM=$(shell pkg-config --exists libsodium; echo $$?) ++ HAS_SODIUM=$(shell $(PKG_CONFIG) --exists libsodium; echo $$?) + ifeq ($(HAS_SODIUM), 0) +- SODIUM_INC = $(shell pkg-config --cflags libsodium) +- SODIUM_LIB = $(shell pkg-config --libs libsodium) ++ SODIUM_INC = $(shell $(PKG_CONFIG) --cflags libsodium) ++ SODIUM_LIB = $(shell $(PKG_CONFIG) --libs libsodium) + else + SODIUM_INC= + SODIUM_LIB= + endif + +- HAS_ZEROMQ=$(shell pkg-config --exists libzmq; echo $$?) ++ HAS_ZEROMQ=$(shell $(PKG_CONFIG) --exists libzmq; echo $$?) + ifeq ($(HAS_ZEROMQ), 0) +- ZEROMQ_INC = $(shell pkg-config --cflags libzmq) ++ ZEROMQ_INC = $(shell $(PKG_CONFIG) --cflags libzmq) + ZMQ_STATIC=/usr/local/lib/libzmq.a + ifeq ($(wildcard $(ZMQ_STATIC)),) +- ZEROMQ_LIB = $(shell pkg-config --libs libzmq) ++ ZEROMQ_LIB = $(shell $(PKG_CONFIG) --libs libzmq) + else + ZEROMQ_LIB = $(ZMQ_STATIC) + endif +@@ -107,9 +107,9 @@ + ZEROMQ_LIB=$(ZEROMQ_HOME)/.libs/libzmq.a + endif + +- HAS_ZSTD=$(shell pkg-config --exists libzstd; echo $$?) ++ HAS_ZSTD=$(shell $(PKG_CONFIG) --exists libzstd; echo $$?) + ifeq ($(HAS_ZSTD), 0) +- ZSTD_LIB = $(shell pkg-config --libs libzstd) ++ ZSTD_LIB = $(shell $(PKG_CONFIG) --libs libzstd) + endif + endif + diff --git a/net-analyzer/ntopng/ntopng-3.8.1.ebuild b/net-analyzer/ntopng/ntopng-3.8.1-r1.ebuild similarity index 92% rename from net-analyzer/ntopng/ntopng-3.8.1.ebuild rename to net-analyzer/ntopng/ntopng-3.8.1-r1.ebuild index 0e41d4cf7c9..fceffce2d77 100644 --- a/net-analyzer/ntopng/ntopng-3.8.1.ebuild +++ b/net-analyzer/ntopng/ntopng-3.8.1-r1.ebuild @@ -34,12 +34,17 @@ RDEPEND=" ${DEPEND} dev-db/redis " +BDEPEND=" + virtual/pkgconfig +" PATCHES=( + "${FILESDIR}"/${PN}-3.8-missing-min.patch "${FILESDIR}"/${PN}-3.8-mysqltool.patch "${FILESDIR}"/${PN}-3.8-ndpi-includes.patch - "${FILESDIR}"/${PN}-3.8-missing-min.patch + "${FILESDIR}"/${PN}-3.8.1-PKG_CONFIG.patch
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/, net-analyzer/ntopng/files/
commit: 357253b38a46dce4aa13a6b419eed78b486ea350 Author: Slawomir Lis gentoo org> AuthorDate: Thu Dec 7 06:44:02 2017 + Commit: Slawek Lis gentoo org> CommitDate: Thu Dec 7 06:44:02 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=357253b3 net-analyzer/ntopng: fixed bug 634104 Applying patch sent by zoltan sinustrom.info This patch is solving problem with pointer comparison Reported by: fkrogh mathalacarte.com Package-Manager: Portage-2.3.16, Repoman-2.3.6 net-analyzer/ntopng/files/pointer-cmp.patch | 12 net-analyzer/ntopng/ntopng-3.0-r1.ebuild| 1 + 2 files changed, 13 insertions(+) diff --git a/net-analyzer/ntopng/files/pointer-cmp.patch b/net-analyzer/ntopng/files/pointer-cmp.patch new file mode 100644 index 000..11fb47ca385 --- /dev/null +++ b/net-analyzer/ntopng/files/pointer-cmp.patch @@ -0,0 +1,12 @@ +diff -Naur ntopng-3.0-orig/src/AddressResolution.cpp ntopng-3.0/src/AddressResolution.cpp +--- ntopng-3.0-orig/src/AddressResolution.cpp 2017-06-01 00:18:57.0 -0700 ntopng-3.0/src/AddressResolution.cpp 2017-11-27 23:13:50.158163187 -0800 +@@ -52,7 +52,7 @@ + u_int numeric_ip_len; + + snprintf(query, sizeof(query), "%s", _numeric_ip); +- if((at = strchr(query, '@')) != '\0') at[0] = '\0'; ++ if((at = strchr(query, '@')) != NULL) at[0] = '\0'; + numeric_ip = query; + numeric_ip_len = strlen(numeric_ip)-1; + diff --git a/net-analyzer/ntopng/ntopng-3.0-r1.ebuild b/net-analyzer/ntopng/ntopng-3.0-r1.ebuild index 3fe29fa7818..3470ef4dea2 100644 --- a/net-analyzer/ntopng/ntopng-3.0-r1.ebuild +++ b/net-analyzer/ntopng/ntopng-3.0-r1.ebuild @@ -30,6 +30,7 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-mysqltool.patch + "${FILESDIR}"/${P}-pointer-cmp.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/, net-analyzer/ntopng/files/
commit: c69e9b1346e6c0e02b363de277e5b60986bf1789 Author: Jeroen Roovers gentoo org> AuthorDate: Wed Sep 6 11:36:23 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Wed Sep 6 11:36:46 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c69e9b13 net-analyzer/ntopng: Clean up patches. Package-Manager: Portage-2.3.8, Repoman-2.3.3 net-analyzer/ntopng/files/ntopng-2.4-cxx.patch | 10 +++--- .../ntopng/files/ntopng-2.4-dont-build-ndpi.patch | 4 +-- .../ntopng/files/ntopng-2.4-mysqltool.patch| 4 +-- ...configure-3.0.patch => ntopng-3.0-gentoo.patch} | 6 ++-- .../ntopng/files/ntopng-3.0-mysqltool.patch| 4 +-- .../{ntopng-3.0.ebuild => ntopng-3.0-r1.ebuild}| 40 ++ 6 files changed, 22 insertions(+), 46 deletions(-) diff --git a/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch b/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch index 330f681e754..6de1a43f9b8 100644 --- a/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch +++ b/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch @@ -1,6 +1,5 @@ -diff -ru ntopng-2.4-stable.orig/configure.ac ntopng-2.4-stable/configure.ac ntopng-2.4-stable.orig/configure.ac2016-11-20 03:59:19.928851928 -0800 -+++ ntopng-2.4-stable/configure.ac 2016-11-20 03:59:53.717850915 -0800 +--- a/configure.ac b/configure.ac @@ -341,14 +341,6 @@ GMAKE="make" fi @@ -16,9 +15,8 @@ diff -ru ntopng-2.4-stable.orig/configure.ac ntopng-2.4-stable/configure.ac GIT=`which git` if test x$GIT = x then -diff -ru ntopng-2.4-stable.orig/Makefile.in ntopng-2.4-stable/Makefile.in ntopng-2.4-stable.orig/Makefile.in 2016-06-27 12:31:18.0 -0700 -+++ ntopng-2.4-stable/Makefile.in 2016-11-20 04:00:31.037849796 -0800 +--- a/Makefile.in b/Makefile.in @@ -4,7 +4,6 @@ SHELL=/bin/sh OS := $(shell uname -s) diff --git a/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch b/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch index b189cbabe28..ec628cd3224 100644 --- a/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch +++ b/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch @@ -1,5 +1,5 @@ configure.ac.old 2016-04-25 21:29:36.452888380 +0200 -+++ configure.ac 2016-04-25 21:30:04.679554971 +0200 +--- a/configure.ac.old b/configure.ac @@ -62,13 +62,6 @@ fi diff --git a/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch index fd403a2c8bf..a80e966b85d 100644 --- a/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch +++ b/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch @@ -1,5 +1,5 @@ configure.ac.orig 2016-11-19 19:16:20.167724203 +0100 -+++ configure.ac 2016-11-19 19:16:32.684391101 +0100 +--- a/configure.ac b/configure.ac @@ -302,13 +302,7 @@ if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then MYSQLTOOL="mariadb_config" diff --git a/net-analyzer/ntopng/files/configure-3.0.patch b/net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch similarity index 87% rename from net-analyzer/ntopng/files/configure-3.0.patch rename to net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch index a2476f5b407..90d7aace545 100644 --- a/net-analyzer/ntopng/files/configure-3.0.patch +++ b/net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch @@ -1,5 +1,5 @@ configure.ac.orig 2017-06-09 06:47:34.214516588 +0200 -+++ configure.ac 2017-06-09 06:48:01.547849759 +0200 +--- a/configure.ac b/configure.ac @@ -19,7 +19,6 @@ # On CentOS 6 `git rev-list HEAD --count` does not work # @@ -42,8 +42,6 @@ if test -d "/usr/include/openssl"; then : AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl" configure.ac.orig 2017-06-09 09:58:17.021114895 +0200 -+++ configure.ac 2017-06-09 09:58:24.227781519 +0200 @@ -53,15 +53,6 @@ SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto" fi diff --git a/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch index e433f4e9559..4d2244b582b 100644 --- a/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch +++ b/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch @@ -1,5 +1,5 @@ configure.ac.orig 2017-06-09 09:52:26.387783657 +0200 -+++ configure.ac 2017-06-09 09:54:53.361116113 +0200 +--- a/configure.ac b/configure.ac @@ -335,13 +335,7 @@ if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then MYSQLTOOL="mariadb_config" diff --git a/net-analyzer/ntopng/ntopng-3.0.ebuild b/net-analyzer/ntopng/ntopng-3.0-r1.ebuild similarity index 61% rename from net-analyzer/ntopng/ntopng-3.0.ebuild rename to net-analyzer/ntopng/ntopng-3.0-r1.ebuild index 234efdce69c..3fe29fa7818 100644 --- a/net-analyzer/ntopng/ntopng-3.0.ebuild +++ b/net-analyzer/ntopng/ntopng-3.0-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed