commit: d8672b21c202bbf417bc80daff260327057fa16f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 15:26:08 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 18:08:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8672b21
net-analyzer/pmacct: Drop 1.7.4 and 1.7.4_p1
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-analyzer/pmacct/Manifest | 2 -
.../pmacct/files/pmacct-1.7.3-nDPI-3.0.patch | 28 ------
.../pmacct/files/pmacct-1.7.4-nDPI-3.2.patch | 47 ----------
net-analyzer/pmacct/metadata.xml | 1 -
net-analyzer/pmacct/pmacct-1.7.4.ebuild | 101 --------------------
net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild | 103 ---------------------
6 files changed, 282 deletions(-)
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 7bf0be7cbf2..2fc46c924bd 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,3 +1 @@
-DIST pmacct-1.7.4.tar.gz 1581213 BLAKE2B
3835abc91947af083932e01b828c2324f90595c973fdde9d9f4034dc7d03e12fad6bbe6e91e1462ec36963ccb41a5a740159f531d7e1929f4cd8d994b89a58a1
SHA512
780b6cc25562fb7b5a1f55b48ce9719b36c1ee0d9ee2b6db8d7f238cd5d9f204938313b13e3ff3f62c7b9b179279f18314eba38ad787ffc346a4b217da239ca1
-DIST pmacct-1.7.4_p1.tar.gz 3200089 BLAKE2B
638983a92df0a46441ddddaefa78dc0f61fee94264870979f46674e851e3bf111ae71550f7e6b677d425fa4c688d4ed7735d82aae85a2e77155c1bfa050d8e76
SHA512
03553128975ced54ce08a1a543c794377c2b7a3c800de600a7b5e8aa483b1c3123dee536a361a47053233d60070cacaf269f1a16ad17b563fa9fc0ec7af6a467
DIST pmacct-1.7.5.tar.gz 3219384 BLAKE2B
9a9feb8a11222e54a018b37eaa387cfa43efcb6aa3da175ea6c367bc7b42d816cbe106431c8b8f69b17c8d0286514a80250bf28b15fcaad12a2ac5fb7af6ff27
SHA512
d52e3d749cf0e8a412a82051531c63f37aa6cf4e7cc435ebd185195040819d65dc2cf4d4b1aa64bae620a9f8d3d1b1a505992044fe45d57b91ba056cfa67609c
diff --git a/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch
b/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch
deleted file mode 100644
index 9e6c618fe44..00000000000
--- a/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -955,6 +955,7 @@
- CFLAGS="$_save_CFLAGS"
- ])
- PKG_CHECK_MODULES([NDPI26], [libndpi >= 2.6], [AC_DEFINE(WITH_NDPI26,
1)], [AC_DEFINE(WITH_NDPI, 1)])
-+ PKG_CHECK_MODULES([NDPI30], [libndpi >= 3.0], [AC_DEFINE(WITH_NDPI30,
1)], [AC_DEFINE(WITH_NDPI, 1)])
- ;;
- no)
- AC_MSG_RESULT(no)
---- a/src/ndpi/ndpi.c
-+++ b/src/ndpi/ndpi.c
-@@ -374,10 +374,14 @@
- if (flow->detection_completed || flow->tcp_finished) {
- if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN)
- #ifdef WITH_NDPI26
-+#ifdef WITH_NDPI30
-+ flow->detected_protocol =
ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, 1,
workflow->prefs.protocol_guess);
-+#else
- flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct,
flow->ndpi_flow, workflow->prefs.protocol_guess);
-+#endif /* WITH_NDPI30 */
- #else
- flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct,
flow->ndpi_flow);
--#endif
-+#endif /* WITH_NDPI26 */
-
- if (workflow->prefs.protocol_guess) {
- if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN &&
!flow->guess_completed) {
diff --git a/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch
b/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch
deleted file mode 100644
index bcbdbc834ca..00000000000
--- a/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -900,7 +900,7 @@
- [ case "$enableval" in
- yes)
- AC_MSG_RESULT(yes)
-- PKG_CHECK_MODULES([NDPI], [libndpi >= 2.4], [
-+ PKG_CHECK_MODULES([NDPI], [libndpi >= 3.2], [
- SUPPORTS="${SUPPORTS} ndpi"
- USING_NDPI="yes"
-
---- a/src/ndpi/ndpi_util.c
-+++ b/src/ndpi/ndpi_util.c
-@@ -29,7 +29,8 @@
-
- NDPI_PROTOCOL_BITMASK all;
-
-- struct ndpi_detection_module_struct *module = ndpi_init_detection_module();
-+ ndpi_init_prefs pm_ndpi_init_prefs = ndpi_no_prefs;
-+ struct ndpi_detection_module_struct *module =
ndpi_init_detection_module(pm_ndpi_init_prefs);
- struct pm_ndpi_workflow *workflow = ndpi_calloc(1, sizeof(struct
pm_ndpi_workflow));
-
- log_notification_init(&log_notifications.ndpi_cache_full);
-@@ -77,6 +78,8 @@
- NDPI_BITMASK_SET_ALL(all);
- ndpi_set_protocol_detection_bitmask2(workflow->ndpi_struct, &all);
-
-+ ndpi_finalize_initalization(workflow->ndpi_struct);
-+
- return workflow;
- }
-
---- a/src/ndpi/ndpi.c
-+++ b/src/ndpi/ndpi.c
-@@ -373,11 +373,7 @@
-
- if (flow->detection_completed || flow->tcp_finished) {
- if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN)
--#ifdef WITH_NDPI26
-- flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct,
flow->ndpi_flow, workflow->prefs.protocol_guess);
--#else
-- flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct,
flow->ndpi_flow);
--#endif
-+ flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct,
flow->ndpi_flow, 1, workflow->prefs.protocol_guess);
-
- if (workflow->prefs.protocol_guess) {
- if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN &&
!flow->guess_completed) {
diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml
index a306c0fa503..79a9a515b96 100644
--- a/net-analyzer/pmacct/metadata.xml
+++ b/net-analyzer/pmacct/metadata.xml
@@ -6,7 +6,6 @@
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
<use>
-<flag name="64bit">Use 64bit counters instead of 32bit ones</flag>
<flag name="bgp-bins">Link BGP daemon binaries</flag>
<flag name="bmp-bins">Link BMP daemon binaries</flag>
<flag name="geoipv2">Enable support for GeoIP2 through
<pkg>dev-libs/libmaxminddb</pkg></flag>
diff --git a/net-analyzer/pmacct/pmacct-1.7.4.ebuild
b/net-analyzer/pmacct/pmacct-1.7.4.ebuild
deleted file mode 100644
index 99560fad9a7..00000000000
--- a/net-analyzer/pmacct/pmacct-1.7.4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 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="
- 64bit +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql
- ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq
-"
-REQUIRED_USE="
- ?? ( geoip geoipv2 )
- kafka? ( jansson )
- rabbitmq? ( jansson )
-"
-
-RDEPEND="
- net-libs/libpcap
- geoip? ( dev-libs/geoip )
- geoipv2? ( dev-libs/libmaxminddb )
- jansson? ( dev-libs/jansson )
- kafka? ( dev-libs/librdkafka )
- mongodb? (
- >=dev-libs/mongo-c-driver-0.8.1-r1
- <dev-libs/mongo-c-driver-0.98
- )
- mysql? ( dev-db/mysql-connector-c:0= )
- ndpi? ( >=net-libs/nDPI-2.4:= )
- 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}
- virtual/pkgconfig
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.patch
- "${FILESDIR}"/${PN}-1.7.4--Werror.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 64bit) \
- $(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 plabel) \
- $(use_enable mongodb) \
- $(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) \
- --disable-debug
-}
-
-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.4_p1.ebuild
b/net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild
deleted file mode 100644
index 29e47d7219d..00000000000
--- a/net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 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="https://github.com/${PN}/${PN}/archive/v${PV/_}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="
- 64bit +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql
- ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq
-"
-REQUIRED_USE="
- ?? ( geoip geoipv2 )
- kafka? ( jansson )
- rabbitmq? ( jansson )
-"
-
-RDEPEND="
- net-libs/libpcap
- geoip? ( dev-libs/geoip )
- geoipv2? ( dev-libs/libmaxminddb )
- jansson? ( dev-libs/jansson )
- kafka? ( dev-libs/librdkafka )
- mongodb? (
- >=dev-libs/mongo-c-driver-0.8.1-r1
- <dev-libs/mongo-c-driver-0.98
- )
- mysql? ( dev-db/mysql-connector-c:0= )
- 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}
- virtual/pkgconfig
-"
-PATCHES=(
-# "${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.patch
- "${FILESDIR}"/${PN}-1.7.4--Werror.patch
- "${FILESDIR}"/${PN}-1.7.4-nDPI-3.2.patch
-)
-
-DOCS=(
- CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
- docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-S=${WORKDIR}/${P/_}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- tc-export CC AR RANLIB
- append-cflags -fcommon
-
- econf \
- $(use_enable 64bit) \
- $(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 plabel) \
- $(use_enable mongodb) \
- $(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) \
- --disable-debug
-}
-
-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
-}
