gentoo resync : 15.01.2020

9 files changed, 112 insertions, 165 deletions

diff --git a/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch b/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch
deleted file mode 100644
index 6de1a43f9b8e..000000000000
--- a/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -341,14 +341,6 @@
- 	GMAKE="make"
- fi
- 
--GPP=`which clang++`
--if test x$GPP = x
--then
--	GPP="g++"
--else
--	GPP="$GPP -O0"
--fi
--
- GIT=`which git`
- if test x$GIT = x
- then
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -4,7 +4,6 @@
- SHELL=/bin/sh
- OS := $(shell uname -s)
- PWD=@PWD@
--GPP=@GPP@
- INSTALL_DIR=$(DESTDIR)$(prefix)
- MAN_DIR=$(DESTDIR)@MAN_DIR@
- 
-@@ -126,12 +125,12 @@
- 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
- 
- %.o: %.cpp $(HEADERS) Makefile
--	$(GPP) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
- 
- .PRECIOUS: $(TARGET) $(OBJECTS)
- 
- $(TARGET): $(OBJECTS) $(LIBRRDTOOL) Makefile
--	$(GPP) $(OBJECTS) -Wall $(LIBS) -o $@
-+	$(CXX) $(OBJECTS) $(CXXFLAGS) $(CPPFLAGS) -Wall $(LIBS) -o $@
- 
- $(LUAJIT_LIB):
- 	cd $(LUAJIT_HOME); @GMAKE@
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
deleted file mode 100644
index ef40c72d5896..000000000000
--- a/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -62,13 +62,6 @@
- fi
- 
- NDPI_LIB=$NDPI_HOME/src/lib/.libs/libndpi.a
--AC_MSG_CHECKING(for $NDPI_LIB)
--if test -f "$NDPI_LIB" ; then :
--  AC_MSG_RESULT(found $NDPI_LIB)
--else
--  AC_MSG_RESULT(not found $NDPI_LIB: compiling)
--  cd $NDPI_HOME; ./autogen.sh; make; cd -
--fi
- 
- AC_MSG_CHECKING(for ntopng professional edition)
- if test -d "pro"; then :
diff --git a/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch
deleted file mode 100644
index a80e966b85de..000000000000
--- a/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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"
- 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.0-gentoo.patch b/net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch
deleted file mode 100644
index 90d7aace545c..000000000000
--- a/net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,7 +19,6 @@
- # On CentOS 6 `git rev-list HEAD --count` does not work
- #
- #
--REVISION=`git log --pretty=oneline | wc -l`
- 
- if test -d "/usr/local/include"; then
- CFLAGS="${CFLAGS} -I/usr/local/include"
-@@ -48,33 +47,6 @@
- 
- SHORT_MACHINE=`uname -m | cut -b1-3`
- 
--GIT_RELEASE="@GIT_RELEASE@"
--GIT_DATE="@GIT_DATE@"
--GIT_BRANCH="@GIT_BRANCH@"
--PRO_GIT_RELEASE="@PRO_GIT_RELEASE@"
--PRO_GIT_DATE="@PRO_GIT_DATE@"
--
--AC_MSG_CHECKING(for nDPI)
--NDPI_HOME=./nDPI
--if test -d "$NDPI_HOME" ; then :
--   AC_MSG_RESULT(found in $NDPI_HOME)
--else
--   NDPI_HOME=../nDPI
--   if test -d "$NDPI_HOME"; then :
--      AC_MSG_RESULT(found in $NDPI_HOME)
--   else
--      NDPI_HOME=$HOME/nDPI
--      if test -d "$NDPI_HOME"; then :
--        AC_MSG_RESULT(found in $NDPI_HOME)
--      else
--        AC_MSG_RESULT(not found)
--        echo "Please do cd ..; git clone https://github.com/ntop/nDPI.git; cd nDPI; ./autogen.sh; make; cd ../ntopng"
--        echo " and try again"
--        exit
--      fi
--   fi
--fi
--
- 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"
-@@ -53,15 +53,6 @@
-  SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto"
- fi
- 
--NDPI_LIB=$NDPI_HOME/src/lib/.libs/libndpi.a
--AC_MSG_CHECKING(for $NDPI_LIB)
--if test -f "$NDPI_LIB" ; then :
--  AC_MSG_RESULT(found $NDPI_LIB)
--else
--  AC_MSG_RESULT(not found $NDPI_LIB: compiling)
--  cd $NDPI_HOME; ./autogen.sh; make; cd -
--fi
--
- AC_MSG_CHECKING(for ntopng professional edition)
- PRO_MAKEFILE_INC=
- PRO_INC=
diff --git a/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch
deleted file mode 100644
index 4d2244b582b9..000000000000
--- a/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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"
- 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.0-pointer-cmp.patch b/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch
deleted file mode 100644
index 171bee36e897..000000000000
--- a/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/AddressResolution.cpp
-+++ b/src/AddressResolution.cpp
-@@ -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/files/ntopng-3.8-ndpi-includes.patch b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch
index 068f1e9fa9b9..cdd5e827147c 100644
--- a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch
+++ b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch
@@ -1,5 +1,5 @@
---- a/configure.seed	2018-10-08 21:33:09.403001834 -0600
-+++ b/configure.seed	2018-10-08 21:35:47.404002203 -0600
+--- a/configure.seed
++++ b/configure.seed
 @@ -129,9 +129,9 @@
  fi
  
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 000000000000..91811d66bbd4
--- /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/files/ntopng-3.8.1-parallel-make.patch b/net-analyzer/ntopng/files/ntopng-3.8.1-parallel-make.patch
new file mode 100644
index 000000000000..9089c0a9b04d
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-3.8.1-parallel-make.patch
@@ -0,0 +1,15 @@
+--- a/configure.seed
++++ b/configure.seed
+@@ -526,11 +520,7 @@
+ 
+ AC_DEFINE_UNQUOTED(_CRT_SECURE_NO_WARNINGS, 1, [Disable warning on windows])
+ 
+-GMAKE=`which gmake`
+-if test x$GMAKE = x
+-then
+-	GMAKE="make"
+-fi
++GMAKE='$(MAKE)'
+ 
+ GIT=`which git`
+ if test x$GIT = x