gentoo resync : 28.04.2021

7 files changed, 170 insertions, 25 deletions

diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 4d08aa71b1e8..93ea9f42dc78 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,7 +1,10 @@
 AUX pmacct-1.7.4--Werror.patch 327 BLAKE2B 1b77ca15ef64a48ca6b477be9f37fa7b88d79e7fedb47895648b6637e9af9e38c959b8838d28d1370dd11b4c722d2b18adabcdd72c8e074dbc10467b770ea6de SHA512 06e1cce962022e51c960881c6f169c91605c5ed597960085f38b5c9fffa4056813014c08070ba7f016cb0f6c449038df9666e5f0d7ab7879563d2dfdc53d2b0a
+AUX pmacct-1.7.6-fix-mysql-crash.patch 1018 BLAKE2B dc8f53581007e068b96af57595bb2cd4b63638118087f088e7f7a2c4c74f528616cbfecd47062e23ff1a653e0bb80732f3703c07ec47e2060084cdea03405aa4 SHA512 706098dc5f9e1f265369039e27489e67c930eba3f711d81d70d85d5d33f75b2b9d5f81879bfe69159934f8c662fa4558916bd34338d765a45ff164d4512911fe
+AUX pmacct-1.7.6-nogit.patch 617 BLAKE2B 2e8d0874bf97ceeb0be43ecea9be9bb29094a4a663a688503520166e0807478b14256b89e8828bfb877fa1e3f70eb4e0cab52e2d40307506cfd833815b77f2f8 SHA512 383d95027b79f1eddd16d8e9490c3d324ea84b65a74fe0bcc15cbf231063f84ce0d5d2114b4cc35a50d6c46c9be1a53f52a4c16f555a3ebe144fa7a22993ee45
 AUX pmacctd-conf.d 153 BLAKE2B 10329deaac64fb5e03bf673c806ad691fb00579d16c77b05aa73662b5e187a31c25da38afb3be853434900ad65103bef3b9d1d9c3b24e0f241a98e4c9b6696b8 SHA512 1637316833db6e2a7c2d531deb4d68d647948bc03da8aecf0c6a34dd2f0c58d58d8473270e6096cf232e98c07946bac265161d4a8577def6cb72a4e8c9778c31
 AUX pmacctd-init.d 834 BLAKE2B 15b66c0495690bd42069abed21962db93edc798650cd23944206eddebe1f4baa3086537620c58fa0e63f83336bf2956318eb5ac7521235555ce3f67b2d54eca8 SHA512 eb87cafae945c13a5eff12c1140e0943bed59d46ca91d46a9fe71e1269549064d04980b04ce78f6a87eeacb7253d1d59f32461ee68734e7cac6510d187fb7f3c
-DIST pmacct-1.7.5.tar.gz 3219384 BLAKE2B 9a9feb8a11222e54a018b37eaa387cfa43efcb6aa3da175ea6c367bc7b42d816cbe106431c8b8f69b17c8d0286514a80250bf28b15fcaad12a2ac5fb7af6ff27 SHA512 d52e3d749cf0e8a412a82051531c63f37aa6cf4e7cc435ebd185195040819d65dc2cf4d4b1aa64bae620a9f8d3d1b1a505992044fe45d57b91ba056cfa67609c
-EBUILD pmacct-1.7.5.ebuild 2112 BLAKE2B 9cd161a5985445c2b4f80ea83f8d253f8768d05fc14ff43743d118fa36c3e63dabbdf210bdef15c6ad14d3f2affec424af861aaf8d20c0de160cdaed76330661 SHA512 7be7c18a3d7dd9949fbb82d3725e81302b5846176d5ad3b6e006e4d1cd3cc1b69eff51de7ddecee91285859d56f300e444bb8953a97ce0133efe2d88273ef751
-EBUILD pmacct-999999.ebuild 2073 BLAKE2B b9e1405cfb4694ef08bc16b477169345155ecc83fe18eebfc51c34eb4cb365d021aa306ab3ac75a6f998e38515988cc6da4b8b9c4128c45c640d86a0fd0b85ce SHA512 aad2e1e6cffc1fc28997fdf2dc7bed7ba4c40eb109417325244179e7e55a236e4ee33e6c8991697b0868a754ef3892cc0e3c715591dddcdcc241ea2bc10f9b32
-MISC metadata.xml 1293 BLAKE2B 102bb4be653f429b9b20ebe66e121ee1fa1f95e2133b81ee9b6741e9a3aaf7e2c2ce4862845c35ef2a1a9f83ad5112a914a0db4153e67ad61435ed6ce3a74125 SHA512 e68e3c42adfe2dc8287f5e06caa1e14fabcba7601605512024524e00c82a09100bd5af75a863fa7027508f792d0e446e66f27c19d1abd2ae0e14e8cecf201732
+DIST pmacct-1.7.6.tar.gz 2126837 BLAKE2B df04822e88f9409d335457031fb26ce4ae8b5da13cf2f55f8d6c78eb50dade62ef763d389ac81a509d9351e12844446ac73171e9966a5aeeecc0e5fb10219c73 SHA512 b370d20f8b8d49b9114db3ab74c66cd16962dee5e7c3642fab0b2787c4ea924a249ff4d8d770c0ccc8ca81366b9a5e557dcfb7cdddf878b99b719d0accdb949a
+EBUILD pmacct-1.7.6-r1.ebuild 2194 BLAKE2B 2598855ea314c214037533c41d15fb5dff436108bc755b05081420642c5474e2808c325f2dfd4d5520f3e4204f7a4b802dee2b807b401f79c415bdb07c244480 SHA512 b8a4168a1dca39fbb7fa3d743a54dcc535531656b583eb30bbe078a98a4d96163bf5a381e0bccd072d1726adcdd3dfe442910b54081a1aee8f4cda2aa388d091
+EBUILD pmacct-1.7.6.ebuild 2152 BLAKE2B cbf85e7d3c361e47956a7a0bdbbb1817f8269daf01518c2987beea2188877614c72a3f90071d1bf4e1bc8db00e46771c0431136ca6b9a9a1c2aa6cff6ee2d443 SHA512 d5542361095a1eccb7ba29f085d8b643eed7707e82dfa5c332bcb1ef2342555e88d46c3e78c53ad71442af668211936c923f8f6b84683c44560494c2e6e15102
+EBUILD pmacct-999999.ebuild 2107 BLAKE2B d27f89b663cf9e76e5d63b624b11becaf4e04a30a5c2abcd4328fb59b653caae32d2dc547ac4a2a47a06d2cd1c9c0dfbb0283801a7df820ded13f44d56b8c944 SHA512 3f9170823a7e3fd0e56bee0da6e92b51dc8ea0b270c240ea4f6b0a1aeb0a5bc0360d042518620fefb48769a0096e66d1e23e038e935950ac18e54ce7e735ff55
+MISC metadata.xml 1240 BLAKE2B 2982b5c52a0f8acaef15db66f67ba99eaff775a82f14448d92b9e6db55fc8cee2962e2ebb32a15bf21a3f25e0520204d928c258f345d69e1ac93e3100a68c425 SHA512 758b52fae778753c56660698b1261b7df140875343d3a9d2c65e9aa1974143a75d199eed8abe3e2d095162ff1a73a601a53b008786f3755dee6c15b62985e8ce
diff --git a/net-analyzer/pmacct/files/pmacct-1.7.6-fix-mysql-crash.patch b/net-analyzer/pmacct/files/pmacct-1.7.6-fix-mysql-crash.patch
new file mode 100644
index 000000000000..b76ce8761326
--- /dev/null
+++ b/net-analyzer/pmacct/files/pmacct-1.7.6-fix-mysql-crash.patch
@@ -0,0 +1,26 @@
+From 1922062277d87da024938cc3057df9a4c3725e76 Mon Sep 17 00:00:00 2001
+From: Paolo Lucente <pl+github@pmacct.net>
+Date: Sun, 28 Feb 2021 02:51:10 +0000
+Subject: [PATCH] * fix, MySQL plugin: check for 'unix:' string only if
+ sql_host is supplied
+
+---
+ src/mysql_plugin.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/mysql_plugin.c b/src/mysql_plugin.c
+index 7f5179abd..dce117732 100644
+--- a/src/mysql_plugin.c
++++ b/src/mysql_plugin.c
+@@ -695,7 +695,10 @@ void MY_DB_Connect(struct DBdesc *db, char *host)
+     mysql_options(db->desc, MYSQL_OPT_RECONNECT, &reconnect);
+     if (config.sql_conn_ca_file) mysql_ssl_set(db->desc, NULL, NULL, config.sql_conn_ca_file, NULL, NULL);
+     
+-    usp = strstr(host, "unix:");
++    if (host) {
++      usp = strstr(host, "unix:");
++    }
++
+     if (usp && usp == host) {
+       usp += 5; /* go right past the 'unix:' string */
+       mysql_ret = mysql_real_connect(db->desc, NULL, config.sql_user, config.sql_passwd, config.sql_db, FALSE, usp, 0);
diff --git a/net-analyzer/pmacct/files/pmacct-1.7.6-nogit.patch b/net-analyzer/pmacct/files/pmacct-1.7.6-nogit.patch
new file mode 100644
index 000000000000..7381408d4489
--- /dev/null
+++ b/net-analyzer/pmacct/files/pmacct-1.7.6-nogit.patch
@@ -0,0 +1,16 @@
+diff --git a/configure.ac b/configure.ac
+index 34269bd9..c6dbe8ba 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1140,10 +1140,7 @@ dnl Git submodule Dependencies buid system
+ dnl --------------------------------------
+ 
+ dnl First check whether to build git submodule deps
+-WITH_EXTERNAL_DEPS_DEFAULT=yes
+-if [ test ! -f "$srcdir/src/external_libs/libcdada/include/cdada.h" ] && [ test -z `git rev-parse HEAD 2> /dev/null` ]; then
+-	WITH_EXTERNAL_DEPS_DEFAULT=no
+-fi
++WITH_EXTERNAL_DEPS_DEFAULT=no
+ 
+ AC_MSG_CHECKING([whether external dependencies (git submodules) should be compiled])
+ AC_ARG_WITH(external-deps,
diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml
index ee7d2e55c726..0e5767a74ad6 100644
--- a/net-analyzer/pmacct/metadata.xml
+++ b/net-analyzer/pmacct/metadata.xml
@@ -14,7 +14,6 @@
 		<flag name="l2">Enable Layer-2 features and support</flag>
 		<flag name="ndpi">Enable support for nDPI through <pkg>net-libs/nDPI</pkg></flag>
 		<flag name="nflog">Enable support for NFLOG through uacctd</flag>
-		<flag name="plabel">Enable IP prefix labels</flag>
 		<flag name="rabbitmq">Enable support for RabbitMQ through <pkg>net-libs/rabbitmq-c</pkg></flag>
 		<flag name="st-bins">Link Streaming Telemetry daemon binaries</flag>
 		<flag name="traffic-bins">Link IPv4/IPv6 traffic accounting binaries</flag>
diff --git a/net-analyzer/pmacct/pmacct-1.7.6-r1.ebuild b/net-analyzer/pmacct/pmacct-1.7.6-r1.ebuild
new file mode 100644
index 000000000000..2f066465acba
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-1.7.6-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="http://www.pmacct.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="
+	+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog
+	postgres rabbitmq sqlite +st-bins +traffic-bins zmq
+"
+REQUIRED_USE="
+	?? ( geoip geoipv2 )
+	kafka? ( jansson )
+	rabbitmq? ( jansson )
+"
+
+RDEPEND="dev-libs/libcdada
+	net-libs/libpcap
+	geoip? ( dev-libs/geoip )
+	geoipv2? ( dev-libs/libmaxminddb )
+	jansson? ( dev-libs/jansson )
+	kafka? ( dev-libs/librdkafka )
+	mysql? (
+		dev-db/mysql-connector-c:0=
+		sys-process/numactl
+	)
+	ndpi? ( >=net-libs/nDPI-3.2:= )
+	nflog? ( net-libs/libnetfilter_log )
+	postgres? ( dev-db/postgresql:* )
+	rabbitmq? ( net-libs/rabbitmq-c )
+	sqlite? ( =dev-db/sqlite-3* )
+	zmq? ( >=net-libs/zeromq-4.2.0:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.4--Werror.patch"
+	"${FILESDIR}/${PN}-1.7.6-nogit.patch"
+	"${FILESDIR}/${P}-fix-mysql-crash.patch"
+)
+
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC AR RANLIB
+	append-cflags -fcommon
+
+	econf \
+		$(use_enable bgp-bins) \
+		$(use_enable bmp-bins) \
+		$(use_enable geoip) \
+		$(use_enable geoipv2) \
+		$(use_enable jansson) \
+		$(use_enable kafka) \
+		$(use_enable l2) \
+		$(use_enable mysql) \
+		$(use_enable ndpi) \
+		$(use_enable nflog) \
+		$(use_enable postgres pgsql) \
+		$(use_enable rabbitmq) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable st-bins) \
+		$(use_enable traffic-bins) \
+		$(use_enable zmq) \
+		--without-external-deps \
+		--disable-debug \
+		--disable-mongodb
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql telemetry; do
+		docinto ${dirname}
+		dodoc -r ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/pmacct/pmacct-1.7.5.ebuild b/net-analyzer/pmacct/pmacct-1.7.6.ebuild
index b6cef6d81f80..3cebdfe03e0a 100644
--- a/net-analyzer/pmacct/pmacct-1.7.5.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.7.6.ebuild
@@ -7,13 +7,13 @@ inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="A network tool to gather IP traffic information"
 HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://www.pmacct.net/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="
-	+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog plabel
+	+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog
 	postgres rabbitmq sqlite +st-bins +traffic-bins zmq
 "
 REQUIRED_USE="
@@ -22,26 +22,28 @@ REQUIRED_USE="
 	rabbitmq? ( jansson )
 "
 
-RDEPEND="
+RDEPEND="dev-libs/libcdada
 	net-libs/libpcap
 	geoip? ( dev-libs/geoip )
 	geoipv2? ( dev-libs/libmaxminddb )
 	jansson? ( dev-libs/jansson )
 	kafka? ( dev-libs/librdkafka )
-	mysql? ( dev-db/mysql-connector-c:0= )
+	mysql? (
+		dev-db/mysql-connector-c:0=
+		sys-process/numactl
+	)
 	ndpi? ( >=net-libs/nDPI-3.2:= )
 	nflog? ( net-libs/libnetfilter_log )
 	postgres? ( dev-db/postgresql:* )
 	rabbitmq? ( net-libs/rabbitmq-c )
 	sqlite? ( =dev-db/sqlite-3* )
-	zmq? ( >=net-libs/zeromq-4.2.0:= )
-"
+	zmq? ( >=net-libs/zeromq-4.2.0:= )"
 DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
+BDEPEND="virtual/pkgconfig"
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.4--Werror.patch
+	"${FILESDIR}/${PN}-1.7.4--Werror.patch"
+	"${FILESDIR}/${PN}-1.7.6-nogit.patch"
 )
 
 DOCS=(
@@ -69,13 +71,13 @@ src_configure() {
 		$(use_enable mysql) \
 		$(use_enable ndpi) \
 		$(use_enable nflog) \
-		$(use_enable plabel) \
 		$(use_enable postgres pgsql) \
 		$(use_enable rabbitmq) \
 		$(use_enable sqlite sqlite3) \
 		$(use_enable st-bins) \
 		$(use_enable traffic-bins) \
 		$(use_enable zmq) \
+		--without-external-deps \
 		--disable-debug \
 		--disable-mongodb
 }
diff --git a/net-analyzer/pmacct/pmacct-999999.ebuild b/net-analyzer/pmacct/pmacct-999999.ebuild
index 88a7b0b03c6c..4e643ff1e80e 100644
--- a/net-analyzer/pmacct/pmacct-999999.ebuild
+++ b/net-analyzer/pmacct/pmacct-999999.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="
-	+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog plabel
+	+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog
 	postgres rabbitmq sqlite +st-bins +traffic-bins zmq
 "
 REQUIRED_USE="
@@ -22,24 +22,24 @@ REQUIRED_USE="
 	rabbitmq? ( jansson )
 "
 
-RDEPEND="
+RDEPEND="dev-libs/libcdada
 	net-libs/libpcap
 	geoip? ( dev-libs/geoip )
 	geoipv2? ( dev-libs/libmaxminddb )
 	jansson? ( dev-libs/jansson )
 	kafka? ( dev-libs/librdkafka )
-	mysql? ( dev-db/mysql-connector-c:0= )
+	mysql? (
+		dev-db/mysql-connector-c:0=
+		sys-process/numactl
+	)
 	ndpi? ( >=net-libs/nDPI-3.2:= )
 	nflog? ( net-libs/libnetfilter_log )
 	postgres? ( dev-db/postgresql:* )
 	rabbitmq? ( net-libs/rabbitmq-c )
 	sqlite? ( =dev-db/sqlite-3* )
-	zmq? ( >=net-libs/zeromq-4.2.0:= )
-"
+	zmq? ( >=net-libs/zeromq-4.2.0:= )"
 DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=(
 	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
@@ -67,13 +67,13 @@ src_configure() {
 		$(use_enable mysql) \
 		$(use_enable ndpi) \
 		$(use_enable nflog) \
-		$(use_enable plabel) \
 		$(use_enable postgres pgsql) \
 		$(use_enable rabbitmq) \
 		$(use_enable sqlite sqlite3) \
 		$(use_enable st-bins) \
 		$(use_enable traffic-bins) \
 		$(use_enable zmq) \
+		--without-external-deps \
 		--disable-debug \
 		--disable-mongodb
 }