gentoo resync : 06.08.2019

8 files changed, 152 insertions, 8 deletions

diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index abd651f28691..a71221525b18 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -4,10 +4,16 @@ AUX ntopng-2.4-mysqltool.patch 430 BLAKE2B 052163786435b54d527e01a9e13fc385795f6
 AUX ntopng-3.0-gentoo.patch 1596 BLAKE2B 36349887ae8f418a0db67d8a96d33785fe5ec4875a987fa9b837857b1cbbdcaa802d2c5b2524b6edeb8cda5aaeec69102f4facd177d43bc321ed50de62135728 SHA512 fcab6670255d7c756694091d6b53a7880a74e8840fa8f77ec81b072dbe7c7a5ec5b4550892dc78c45304ee437a309fe8c79293f6205c570685b8f13178c1c306
 AUX ntopng-3.0-mysqltool.patch 430 BLAKE2B 94410cdac37f6d35b4c6b0f90c3391f79d36242932af2ab520a8db3057b37b3d059fd708e0af930bf8321babadade61621f79f77ac55581ebe46555e6cd9e6c6 SHA512 82b06a14f471bd037743a7563a80d6460e63ff262252d0318e40ba25bf8da849bc0394a5fa4d54befd5df6bd4b645b86711708198f8971d54eb15e8f32c83cd5
 AUX ntopng-3.0-pointer-cmp.patch 340 BLAKE2B 2b361ac6fc25857125b192fab11cb1c060bef6fb220386ffaf5b3df68ee5f52e173fc63e3a70175d746df52ae258bb2fd01ab6b3888ccfd320700083540ab0e7 SHA512 30e0137046c5612d627c3efb7a17b303a04144e63dc14e3ffd393cd87444b623af6430a6520181e5cf3fef5e89e51594c9700306bba1ffea2a9e6795e7c5e861
+AUX ntopng-3.8-missing-min.patch 567 BLAKE2B 06cff6608d9d8d2fb2312aef0075d53f2e1c19f6294bc47f2b26b6aa27d078edfc78b16142ea13c3e6a679ba541dcb2185b82af4969e621454fa97566a68e6e5 SHA512 567cea5b632b9a2d405cfb8058ef1ec204506084286ba4d7e86b64939a0ab7b3bd1204473a194ab7cf16195e76abcd4b77a05c20b1516cdbc59f431feb5cec16
+AUX ntopng-3.8-mysqltool.patch 437 BLAKE2B 13df7c163168b59917843a2c7dee13f41c6d3b95e16a0967c849771dbb552c72f1d5e8d16dd76ed6b51c149a1143707d432761abd907bec3d7b6257a099debca SHA512 f13a6d529e2e2d659763c2ec013ebdb61f3b741d242f375345e60e66d7cf4adeefdff6876d3a15497fc9b2f1966268665e550719f7bd86ca1b44252f459c9029
+AUX ntopng-3.8-ndpi-call.patch 507 BLAKE2B b08c95e8a35c7372b1fc56bf59a50a8ba22091e86051ea2843f6833b41faaa0022d79e462f9755c3234bd3641facbec7a6a2689eb5ee66ee3b4b3df6abcaf29c SHA512 88c3fc0b3f82fda730e614c85a3366392a557140122d98d21e9dc24b2e43123d557636206e18f09117dccb9c1da8a1ccce49293d2261f00f78e3b1523f70ba0e
+AUX ntopng-3.8-ndpi-includes.patch 528 BLAKE2B c8a874f83aae75b0691ea9c9eeaaaeaac021de9f2e1d7a1bc1024acf927c36449d13df022ea6df5c2f09af68628aee5adef9039db5f7a3d6aa36da6c9d7924fa SHA512 593923665752322207bde864850bdfca7d1f75ea1270f1abd514b648f0fe6a539f4925837bebf433a3ffc82ae60edaafeaeaca2e19a58e87459e6caea245e59b
 AUX ntopng.conf.d 117 BLAKE2B 67e2962fcb0303ab465b3d8def04192992e3e7306c5e76084a58cca5bdf1a797b08193f2a3512f876ff9c5300b0f3504055e7166afcbb4cbc527658c74b0616b SHA512 bb66d11245ce099f9e09f97d830da60df910682242db0c5c7d17bcd800e84cf3bce6288fb75fc3a8f3e214a580dc0d076f7f69aa924d9ad3e4c8bff093252061
 AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d855746509c0e6861df7ed9c356abe6bc066df65524c340d05c072e7c4de0864c250164b8a1509b34d508c0 SHA512 1fbcc46fe10dcef82a1310d74c4351c72752cdd2a9b9908705c8c645698430e456f1ba14b77fd7c1f374a237a508c2d33324de61f5f1f8255ed75a384e874d84
 DIST ntopng-2.4.tar.gz 134074662 BLAKE2B dbf654e5cd1f9eddb5ae325bdf0ac2e7ce22c08f55363b10723bde2cb5fd86cf3b0c7fef0f55dc7fcce0341f5fbb9a7132f26e29649bcf66020b640975c0e6da SHA512 515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a
 DIST ntopng-3.0.tar.gz 23017655 BLAKE2B f791690118a5ecfb1be5ad791229f2438354a0c2271350aa1a2f0fee05886c54d181a669e6e1b27657c5bfe4b68db24b06d91adfb89e803a154a7a4bbff146b7 SHA512 d5e310d5dba7fe696d38d9d8251ffa4077182200e41c3f0b6034e68cf6623220ec47ba9d9fd5d2392a7b65a6de770e330821169c7ec06b4952f68c3f5f738eb1
-EBUILD ntopng-2.4.ebuild 1724 BLAKE2B bfa8ed23ce2b4a5e7b0de83cda74a0211f89868e718cfe027f4c282db9e939b5efd6b48dd8d68cef4714dd238e8126e2a5716cdc939f04511599abaa5b7e2a0d SHA512 4c0298162c77666ee7ec2b3fa139468f5fc61e25baef6f7a55f5057dee1238e951e6d6b6ab7b824e31791172912bd106ae28ccafcf42fd89622676400a8132b1
-EBUILD ntopng-3.0-r3.ebuild 1631 BLAKE2B b77cffb6554e04821db246fe2bfb1ba0468a63a5b456b6bde71c5c36886173b78d00c0fe46359ce90fbe66ce96a12bfcb2d607eef778f6c230abf5769e44f228 SHA512 892942a332dfce2bca02e8ace13fea7da75089c0ca0b8e68b5e2b7294d51a3f8f375cf7acffd0a34e26a177cb6e232153b7b50350b2e457f6beba3f2a6239c60
+DIST ntopng-3.8.tar.gz 33910329 BLAKE2B a5aaed2244516b92e4b8c7364817ea66eb2f446fe814a96622cbbf5d851d79e8049b75da009d0f80f07c1fae90f8dc294794b76ed14450d8e0e6685a1b1ce8f2 SHA512 2236f9931fc606e4d0a6da379c480a48bacd441cf199a310ea690a03d74d08f369825ea02e3c13828a10f716a5531d4e6774876f253ab348a52bcf8bd8d5107f
+EBUILD ntopng-2.4-r1.ebuild 1713 BLAKE2B 412ffa5d8596bf4f2d5701864cc12a542c13442c99c3652d8df3790f0aec24b2d8f3d151c7b560d492c2f74ba6dc1b1b24358cb7e9b22ee26d89ca14032108b5 SHA512 a5a42e0f4de1feefd5cfc8c407b375ce9b5587568de90f5fbc2e4c3f53c08df6f645e5abd95eddd6edb136f519bf3b56b8107298e0fb6e126d0f9bc286946a15
+EBUILD ntopng-3.0-r4.ebuild 1622 BLAKE2B 1db14760398455995b4584065665032b2304d0e5699001e9ee7727bb0cf31272422e8de56b9aa5ec1778d27419f60ad38008b248114fbd49781229de38ac546e SHA512 e2591cd2c833021f08e45c5ae24843deef9ca7d745e68462618592a2205df3e341c76361bc9046d8d0797d515b099f2139e889bc4caa5a1f42996ed6154dffa2
+EBUILD ntopng-3.8.ebuild 1727 BLAKE2B c95da883fdd8b8e9828345248d8dea86f7a326e799e1ec413e06f32eeb620efc45a20ab93a7c005307c5877ef5285a368db4dc1fa9b15c7c480e5775c15ea3f6 SHA512 3a04bfdf57bec06b39a470692a319f38d9204a0e88e63b4a02b16c2da5caf16a0639a8ced42a4f1de42e3651ea657a5b22eb4674180049c3cafcae89eb56fb39
 MISC metadata.xml 299 BLAKE2B 466c255eb9dd221bc91a9308a7ad2d4032c96072f96220d56f78f8c2e9f79392a83603e7bd3a78e4bfa32bd61b04351261ccc86dc82ca9d834c2afc73724ed19 SHA512 5c8e5b8f97b306a059913e2adc9e02137502ec35da1a753a2b9af4d4c67c0af0f0266c14acdd488c89bb96da3cc0464512de05ce389055d35bc6a0feab7ac996
diff --git a/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch b/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch
new file mode 100644
index 000000000000..303826a918df
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch
@@ -0,0 +1,19 @@
+--- a/third-party/zeromq-4.1.3/src/tcp_connecter.cpp
++++ b/third-party/zeromq-4.1.3/src/tcp_connecter.cpp
+@@ -31,6 +31,7 @@
+ 
+ #include <new>
+ #include <string>
++#include <algorithm>
+ 
+ #include "tcp_connecter.hpp"
+ #include "stream_engine.hpp"
+@@ -207,7 +208,7 @@
+         options.reconnect_ivl_max > options.reconnect_ivl)
+         //  Calculate the next interval
+         current_reconnect_ivl =
+-            min (current_reconnect_ivl * 2, options.reconnect_ivl_max);
++	  std::min(current_reconnect_ivl * 2, options.reconnect_ivl_max);
+     return interval;
+ }
+ 
diff --git a/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch
new file mode 100644
index 000000000000..62c328a3505e
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch
@@ -0,0 +1,17 @@
+--- 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-call.patch b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch
new file mode 100644
index 000000000000..1308a5c2c03f
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch
@@ -0,0 +1,12 @@
+--- a/src/NetworkInterface.cpp
++++ b/src/NetworkInterface.cpp
+@@ -1604,7 +1604,8 @@
+ 	  ndpi_protocol icmp_proto = flow->get_detected_protocol();
+ 
+ 	  if(icmp_proto.category == NDPI_PROTOCOL_CATEGORY_UNSPECIFIED) {
+-	    ndpi_fill_ip_protocol_category(ndpi_struct, (struct ndpi_iphdr *)ip, &icmp_proto);
++	    ndpi_fill_ip_protocol_category(ndpi_struct, ((struct ndpi_iphdr *)ip)->saddr,
++					   ((struct ndpi_iphdr*)ip)->daddr, &icmp_proto);
+ 	    flow->setDetectedProtocol(icmp_proto, false);
+ 	  }
+ 	}
diff --git a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch
new file mode 100644
index 000000000000..068f1e9fa9b9
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch
@@ -0,0 +1,14 @@
+--- a/configure.seed	2018-10-08 21:33:09.403001834 -0600
++++ b/configure.seed	2018-10-08 21:35:47.404002203 -0600
+@@ -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/ntopng-2.4.ebuild b/net-analyzer/ntopng/ntopng-2.4-r1.ebuild
index d024ad1f63db..3e53ff545180 100644
--- a/net-analyzer/ntopng/ntopng-2.4.ebuild
+++ b/net-analyzer/ntopng/ntopng-2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,7 +24,7 @@ DEPEND="dev-db/sqlite:3
 	net-analyzer/rrdtool
 	net-libs/libpcap
 	net-misc/curl
-	virtual/libmysqlclient
+	dev-db/mysql-connector-c
 	!net-libs/nDPI"
 RDEPEND="${DEPEND}
 	dev-db/redis"
@@ -74,7 +74,7 @@ src_install() {
 	newconfd "${FILESDIR}/ntopng.conf.d" ntopng
 
 	dodir "/var/lib/ntopng"
-	fowners ntopng "${EPREFIX}/var/lib/ntopng"
+	fowners ntopng "/var/lib/ntopng"
 }
 
 pkg_setup() {
diff --git a/net-analyzer/ntopng/ntopng-3.0-r3.ebuild b/net-analyzer/ntopng/ntopng-3.0-r4.ebuild
index 18736380ba1b..2a126bff0473 100644
--- a/net-analyzer/ntopng/ntopng-3.0-r3.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ DEPEND="dev-db/sqlite:3
 	=net-libs/nDPI-2.0
 	net-misc/curl
 	sys-libs/binutils-libs:=
-	virtual/libmysqlclient"
+	dev-db/mysql-connector-c:="
 RDEPEND="${DEPEND}
 	dev-db/redis"
 PATCHES=(
@@ -63,7 +63,7 @@ src_install() {
 	newconfd "${FILESDIR}/ntopng.conf.d" ntopng
 
 	dodir "/var/lib/ntopng"
-	fowners ntopng "${EPREFIX}/var/lib/ntopng"
+	fowners ntopng "/var/lib/ntopng"
 }
 
 pkg_setup() {
diff --git a/net-analyzer/ntopng/ntopng-3.8.ebuild b/net-analyzer/ntopng/ntopng-3.8.ebuild
new file mode 100644
index 000000000000..adb578b7ff8b
--- /dev/null
+++ b/net-analyzer/ntopng/ntopng-3.8.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools user toolchain-funcs
+
+DESCRIPTION="Network traffic analyzer with web interface"
+HOMEPAGE="https://www.ntop.org/"
+SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-db/sqlite:3
+	dev-python/pyzmq
+	dev-lang/luajit:2
+	dev-libs/json-c:=
+	dev-libs/geoip
+	dev-libs/glib:2
+	dev-libs/hiredis
+	dev-libs/libsodium:=
+	dev-libs/libxml2
+	dev-libs/libmaxminddb
+	net-analyzer/rrdtool
+	net-libs/libpcap
+	>=net-libs/nDPI-2.4
+	net-misc/curl
+	sys-libs/binutils-libs
+	dev-db/mysql-connector-c:="
+RDEPEND="${DEPEND}
+	dev-db/redis"
+PATCHES=(
+	"${FILESDIR}"/${P}-mysqltool.patch
+	"${FILESDIR}"/${P}-ndpi-includes.patch
+	"${FILESDIR}"/${P}-missing-min.patch
+	"${FILESDIR}"/${P}-ndpi-call.patch
+)
+
+src_prepare() {
+	default
+	sed -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" -e "s/@SHORT_VERSION@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" > configure.ac
+	eapply_user
+	eautoreconf
+}
+
+src_install() {
+	SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
+	dodir ${SHARE_NTOPNG_DIR}
+	insinto ${SHARE_NTOPNG_DIR}
+	doins -r httpdocs
+	doins -r scripts
+
+	dodir ${SHARE_NTOPNG_DIR}/third-party
+	insinto ${SHARE_NTOPNG_DIR}/third-party
+	doins -r third-party/i18n.lua-master
+	doins -r third-party/lua-resty-template-master
+
+	exeinto /usr/bin
+	doexe ${PN}
+	doman ${PN}.8
+
+	newinitd "${FILESDIR}/ntopng.init.d" ntopng
+	newconfd "${FILESDIR}/ntopng.conf.d" ntopng
+
+	dodir "/var/lib/ntopng"
+	fowners ntopng "/var/lib/ntopng"
+}
+
+pkg_setup() {
+	enewuser ntopng
+}
+
+pkg_postinst() {
+	elog "ntopng default credentials are user='admin' password='admin'"
+}