commit: eeeca3dd5fb8a7c0dcb3a8202cb206a65865e1d6 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Aug 18 00:31:02 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Aug 18 00:31:02 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeeca3dd
net-analyzer/pmacct: drop 1.7.6-r2, 1.7.6-r3 Signed-off-by: Sam James <sam <AT> gentoo.org> net-analyzer/pmacct/Manifest | 1 - .../files/pmacct-1.7.6-fix-mysql-crash.patch | 26 ------ net-analyzer/pmacct/pmacct-1.7.6-r2.ebuild | 98 --------------------- net-analyzer/pmacct/pmacct-1.7.6-r3.ebuild | 99 ---------------------- 4 files changed, 224 deletions(-) diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest index 8ca96495e5e3..17b03eeb9f42 100644 --- a/net-analyzer/pmacct/Manifest +++ b/net-analyzer/pmacct/Manifest @@ -1,2 +1 @@ -DIST pmacct-1.7.6.tar.gz 2126837 BLAKE2B df04822e88f9409d335457031fb26ce4ae8b5da13cf2f55f8d6c78eb50dade62ef763d389ac81a509d9351e12844446ac73171e9966a5aeeecc0e5fb10219c73 SHA512 b370d20f8b8d49b9114db3ab74c66cd16962dee5e7c3642fab0b2787c4ea924a249ff4d8d770c0ccc8ca81366b9a5e557dcfb7cdddf878b99b719d0accdb949a DIST pmacct-1.7.7.tar.gz 2149629 BLAKE2B 00357cbf1f52452c4a9ee9807e2c18f823019521cc9cb99553fe262826d7343e286694d666c7bab59e62767598ff373b3abafbecfdd43a823ba8784777740643 SHA512 7bc4c48041f023b5cd7ba927722478b0008d751bdb679f44beb2b281f4b16cb0bafb211d0fb947516ca80f86082f1bce578973ec298f4947ffd9d063a44bd00b 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 deleted file mode 100644 index b76ce8761326..000000000000 --- a/net-analyzer/pmacct/files/pmacct-1.7.6-fix-mysql-crash.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1922062277d87da024938cc3057df9a4c3725e76 Mon Sep 17 00:00:00 2001 -From: Paolo Lucente <[email protected]> -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/pmacct-1.7.6-r2.ebuild b/net-analyzer/pmacct/pmacct-1.7.6-r2.ebuild deleted file mode 100644 index 41834f7749e8..000000000000 --- a/net-analyzer/pmacct/pmacct-1.7.6-r2.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# 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" -) - -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.6-r3.ebuild b/net-analyzer/pmacct/pmacct-1.7.6-r3.ebuild deleted file mode 100644 index 07c9fac4b6b1..000000000000 --- a/net-analyzer/pmacct/pmacct-1.7.6-r3.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# 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 -}
