[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pmacct/files/, net-analyzer/pmacct/
commit: eeeca3dd5fb8a7c0dcb3a8202cb206a65865e1d6
Author: Sam James gentoo org>
AuthorDate: Thu Aug 18 00:31:02 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Aug 18 00:31:02 2022 +
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 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
df04822e88f9409d335457031fb26ce4ae8b5da13cf2f55f8d6c78eb50dade62ef763d389ac81a509d9351e1286ac73171e9966a5aeeecc0e5fb10219c73
SHA512
b370d20f8b8d49b9114db3ab74c66cd16962dee5e7c3642fab0b2787c4ea924a249ff4d8d770c0ccc8ca81366b9a5e557dcfb7cdddf878b99b719d0accdb949a
DIST pmacct-1.7.7.tar.gz 2149629 BLAKE2B
00357cbf1f52452c4a9ee9807e2c18f823019521cc9cb99553fe262826d7343e286694d666c7bab59e62767598ff373b3abafbecfdd43a823ba878440643
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..
--- 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
-Date: Sun, 28 Feb 2021 02:51:10 +
-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..
--- 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) \
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pmacct/files/, net-analyzer/pmacct/
commit: dbe0331557ad48596cdad48f29f41cfbdacc26e9
Author: Sam James gentoo org>
AuthorDate: Sat Jul 9 05:13:51 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Jul 9 05:57:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbe03315
net-analyzer/pmacct: add systemd units
Borrowed from opensuse then adapted.
Closes: https://bugs.gentoo.org/635562
Signed-off-by: Sam James gentoo.org>
net-analyzer/pmacct/files/nfacctd.service | 18 ++
net-analyzer/pmacct/files/pmacctd.service | 19 +++
net-analyzer/pmacct/files/sfacctd.service | 18 ++
.../{pmacct-1.7.7.ebuild => pmacct-1.7.7-r1.ebuild} | 4 +++-
net-analyzer/pmacct/pmacct-.ebuild| 4 +++-
5 files changed, 61 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/pmacct/files/nfacctd.service
b/net-analyzer/pmacct/files/nfacctd.service
new file mode 100644
index ..d649f47030bf
--- /dev/null
+++ b/net-analyzer/pmacct/files/nfacctd.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=netflow accounting daemon
+After=network.target
+
+[Service]
+ProtectSystem=full
+ProtectHome=true
+ProtectHostname=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectKernelLogs=true
+ProtectControlGroups=true
+RestrictRealtime=true
+Type=forking
+ExecStart=/usr/sbin/nfacctd -f /etc/pmacctd/nfacctd.conf -i %I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/pmacct/files/pmacctd.service
b/net-analyzer/pmacct/files/pmacctd.service
new file mode 100644
index ..a2dbb8c45846
--- /dev/null
+++ b/net-analyzer/pmacct/files/pmacctd.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=promiscuous mode accounting daemon
+After=network.target
+
+[Service]
+ProtectSystem=full
+ProtectHome=true
+ProtectHostname=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectKernelLogs=true
+ProtectControlGroups=true
+RestrictRealtime=true
+Type=forking
+ExecStart=/usr/sbin/pmacctd -f /etc/pmacctd/pmacctd.conf -i %I
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/net-analyzer/pmacct/files/sfacctd.service
b/net-analyzer/pmacct/files/sfacctd.service
new file mode 100644
index ..7a334e0ffadd
--- /dev/null
+++ b/net-analyzer/pmacct/files/sfacctd.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=sflow accounting daemon
+After=network.target
+
+[Service]
+ProtectSystem=full
+ProtectHome=true
+ProtectHostname=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectKernelLogs=true
+ProtectControlGroups=true
+RestrictRealtime=true
+Type=forking
+ExecStart=/usr/sbin/sfacctd -f /etc/pmacctd/sfacctd.conf -i %I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/pmacct/pmacct-1.7.7.ebuild
b/net-analyzer/pmacct/pmacct-1.7.7-r1.ebuild
similarity index 95%
rename from net-analyzer/pmacct/pmacct-1.7.7.ebuild
rename to net-analyzer/pmacct/pmacct-1.7.7-r1.ebuild
index 687b4ef7d8f2..55db903b6abd 100644
--- a/net-analyzer/pmacct/pmacct-1.7.7.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.7.7-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit autotools toolchain-funcs
+inherit autotools toolchain-funcs systemd
DESCRIPTION="A network tool to gather IP traffic information"
HOMEPAGE="http://www.pmacct.net/";
@@ -102,6 +102,8 @@ src_install() {
newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+ systemd_dounit "${FILESDIR}"/{nfacctd,pmacctd,sfacctd}.service
+
insinto /etc/pmacctd
newins examples/pmacctd-imt.conf.example pmacctd.conf
}
diff --git a/net-analyzer/pmacct/pmacct-.ebuild
b/net-analyzer/pmacct/pmacct-.ebuild
index 687b4ef7d8f2..55db903b6abd 100644
--- a/net-analyzer/pmacct/pmacct-.ebuild
+++ b/net-analyzer/pmacct/pmacct-.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit autotools toolchain-funcs
+inherit autotools toolchain-funcs systemd
DESCRIPTION="A network tool to gather IP traffic information"
HOMEPAGE="http://www.pmacct.net/";
@@ -102,6 +102,8 @@ src_install() {
newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+ systemd_dounit "${FILESDIR}"/{nfacctd,pmacctd,sfacctd}.service
+
insinto /etc/pmacctd
newins examples/pmacctd-imt.conf.example pmacctd.conf
}
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pmacct/files/, net-analyzer/pmacct/
commit: 4abf217d4186500972a49e636d2b878e1a69110b
Author: John Helmert III gentoo org>
AuthorDate: Sun Apr 25 01:48:40 2021 +
Commit: John Helmert III gentoo org>
CommitDate: Sun Apr 25 01:50:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4abf217d
net-analyzer/pmacct: fix mysql crash
Reported-by: Göran Bruns brunsware.de>
Signed-off-by: John Helmert III gentoo.org>
.../files/pmacct-1.7.6-fix-mysql-crash.patch | 26 ++
net-analyzer/pmacct/pmacct-1.7.6-r1.ebuild | 99 ++
2 files changed, 125 insertions(+)
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 000..b76ce876132
--- /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
+Date: Sun, 28 Feb 2021 02:51:10 +
+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-r1.ebuild
b/net-analyzer/pmacct/pmacct-1.7.6-r1.ebuild
new file mode 100644
index 000..2f066465acb
--- /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
+}
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pmacct/files/, net-analyzer/pmacct/
commit: 8e7a4cf914eb4cf0be07c35a0b6028c6929e9e14
Author: Jeroen Roovers gentoo org>
AuthorDate: Wed Jun 17 04:26:47 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Wed Jun 17 04:42:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e7a4cf9
net-analyzer/pmacct: Version 1.7.4_p1
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Closes: https://bugs.gentoo.org/show_bug.cgi?id=719112
Closes: https://bugs.gentoo.org/show_bug.cgi?id=723226
Signed-off-by: Jeroen Roovers gentoo.org>
net-analyzer/pmacct/Manifest | 1 +
.../pmacct/files/pmacct-1.7.4-nDPI-3.2.patch | 47 ++
net-analyzer/pmacct/files/pmacctd-init.d | 2 +-
net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild | 103 +
4 files changed, 152 insertions(+), 1 deletion(-)
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index e2625e381fb..b62b1bbeb28 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -3,3 +3,4 @@ DIST pmacct-1.7.1.tar.gz 1392360 BLAKE2B
75a4dda461c2fe643c24a901c19efacf325d192
DIST pmacct-1.7.2.tar.gz 1416302 BLAKE2B
5d6f9c5849c07c7bdd3b6251b2611935ff558ca393d2cc0d21e5e681b0069b3a5bb4a985a9dc59b62b8b4ed697ecbd4cbb71f0aba42ce8d1527187b98d2e90d3
SHA512
ffdc63e96fc6af6f5d531243bc0aec0925663d8e91e83ada275f8e9a969dcf85cebd06b17ae2c796722bb209602d5b2bc487757ec736a740a8f33698d93a8675
DIST pmacct-1.7.3.tar.gz 1467237 BLAKE2B
a2fb627df9f61f91c69a9333a968485695b45c8ebe812e11ba250185a5e93f262954290d7ee41789fb13f7f5c5ef336294be83c8d91adcd0fc3c348485e515af
SHA512
09d0e6721760035112cb0c7936fe177f7858b19fa1df2c7da84822dc816413e7c6bace35fe45ad32930961183d61f9e4f3a4879747be45f47ab658a3e0f055b2
DIST pmacct-1.7.4.tar.gz 1581213 BLAKE2B
3835abc91947af083932e01b828c2324f90595c973fdde9d9f4034dc7d03e12fad6bbe6e91e1462ec36963ccb41a5a740159f531d7e1929f4cd8d994b89a58a1
SHA512
780b6cc25562fb7b5a1f55b48ce9719b36c1ee0d9ee2b6db8d7f238cd5d9f204938313b13e3ff3f62c7b9b179279f18314eba38ad787ffc346a4b217da239ca1
+DIST pmacct-1.7.4_p1.tar.gz 3200089 BLAKE2B
638983a92df0a46441aefa78dc0f61fee94264870979f46674e851e3bf111ae71550f7e6b677d425fa4c688d4ed7735d82aae85a2e77155c1bfa050d8e76
SHA512
03553128975ced54ce08a1a543c794377c2b7a3c800de600a7b5e8aa483b1c3123dee536a361a47053233d60070cacaf269f1a16ad17b563fa9fc0ec7af6a467
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
new file mode 100644
index 000..bcbdbc834ca
--- /dev/null
+++ b/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch
@@ -0,0 +1,47 @@
+--- 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/files/pmacctd-init.d
b/net-analyzer/pmacct/files/pmacctd-init.d
index 1dccfcdd80f..bfc59c07abb 100644
--- a/net-analyzer/pmacct/files/pmacctd-init.d
+++ b/net-analyzer/pmacct/files/pmacctd-init.d
@@ -27,7 +27,7 @@ start() {
start-stop-daemon --start \
--pidfile "${PMACCTDPID}" \
--exec /usr/sbin/"${SVCNAME}" \
- -- -D -f "${PMACCTDCONF}" \ -F "${PMACCTDPID}" ${OPTS}
+ -- -D -f "${PMACCTDCONF}" -F "${PMACCTDPID}" ${OPTS}
eend $?
}
diff --git a/net-analyzer/pmacct/pm
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pmacct/files/, net-analyzer/pmacct/
commit: 279adbeeec72611d631ceb9d24de1675c93bcef4
Author: Jeroen Roovers gentoo org>
AuthorDate: Sat Dec 28 11:34:26 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sat Dec 28 11:45:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=279adbee
net-analyzer/pmacct: Fix building against >=nDPI-3.0
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Closes: https://bugs.gentoo.org/704072
Signed-off-by: Jeroen Roovers gentoo.org>
.../pmacct/files/pmacct-1.7.3-nDPI-3.0.patch | 28 ++
...{pmacct-1.7.3.ebuild => pmacct-1.7.3-r1.ebuild} | 12 --
2 files changed, 38 insertions(+), 2 deletions(-)
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
new file mode 100644
index 000..3cffef25862
--- /dev/null
+++ b/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch
@@ -0,0 +1,28 @@
+--- 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/pmacct-1.7.3.ebuild
b/net-analyzer/pmacct/pmacct-1.7.3-r1.ebuild
similarity index 92%
rename from net-analyzer/pmacct/pmacct-1.7.3.ebuild
rename to net-analyzer/pmacct/pmacct-1.7.3-r1.ebuild
index 5887b587804..33e50e3e831 100644
--- a/net-analyzer/pmacct/pmacct-1.7.3.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.7.3-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit flag-o-matic toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
DESCRIPTION="A network tool to gather IP traffic information"
HOMEPAGE="http://www.pmacct.net/";
@@ -32,7 +32,7 @@ RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pmacct/files/, net-analyzer/pmacct/
commit: d42daffe5676ab927e72a49bbe950ce511f711ef
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Sep 11 04:59:07 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Sep 11 04:59:07 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d42daffe
net-analyzer/pmacct: Version bump.
Package-Manager: portage-2.2.20.1
net-analyzer/pmacct/Manifest | 3 +-
.../pmacct/files/pmacct-0.12.0-gentoo.patch| 20 ---
net-analyzer/pmacct/files/pmacctd-init.d | 10 +++-
net-analyzer/pmacct/pmacct-0.14.3.ebuild | 68 --
.../{pmacct-1.5.0.ebuild => pmacct-1.5.2.ebuild} | 4 +-
5 files changed, 11 insertions(+), 94 deletions(-)
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index c760328..73544d3 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,3 +1,2 @@
-DIST pmacct-0.14.3.tar.gz 746387 SHA256
c3197dcb21b131da82eaaecc9dccbff894c35bf1cb74214e93ae1e7c1bdef50e SHA512
310cee3f74d41befd74f981aff6c1a33a2db14c7010e8d1283374d8f6be49fb825a768f992c7b24acca74710413148fd61006ae7e87ad566b7193d575fa6df36
WHIRLPOOL
bd7b8560ed5e30ff6342920ec04cca1795bf675dc90db7abf31c8d105f733109950ca28ac9c57d80cb2b6aef24f3db6259a71b170a032b1a77cdb98f5b7bcbe9
-DIST pmacct-1.5.0.tar.gz 843881 SHA256
28edc18aec67c2157c599dcf095dd9f26a4c06ca4dfe7da79390011b3fd432fc SHA512
e1ff47f6a987e76c5e5ac92896f9dac3722c681a5a85835dbf8bffba68dc5794c63f06c9576d1b8f667fb4fe2f9b17d8e0dd1d3a4a96673c43378d2aba3329a1
WHIRLPOOL
e886a73e732b7e63f5453710913372dfab671d33bbbc85dc4f10daab89173cdf5579ddfd2ad4019855d67705b52bafd1b31d1e2d14da34dfc00877db444e1419
DIST pmacct-1.5.1.tar.gz 874563 SHA256
96134549a10947f3f6d610b670a26f1a54e01af4be0eff09bf48c19246d33584 SHA512
c3a0ddaf1b8679df2097147ce844eb2a3e3058599aea457e463cd4e65a7601e0ce5bac5ca5e1c82afecd5edc92dae673eed3ed1787bfbd3e8ac2af5677885bb7
WHIRLPOOL
bd071ac30493f5ee2e0393eb9277dfae2d2fdd6283293aee589ae41ab326b0aaef0ec9b70a421eeca4df857a0046ca7b196e0692ffdd2ea12d9a7c66a74e9a32
+DIST pmacct-1.5.2.tar.gz 897530 SHA256
c12e3897e2f9aa89333968da46eb46855f357750ac1e06e36e72f374e2b54df9 SHA512
3705432cc2a28e179de637b8fc11becd2022b36191a13d440d5bec7d7e594d0936773f202f3d82e983a83695176380aa6a7c27748b632b18590be0ead599
WHIRLPOOL
e7bb1fa1b7372af7d932e19da1d14f3922d8a8ebda245fa03e2a5f283c66141a9299cc9dfa6f32e9384c7d2c9a2d2ef35ef62d7b9910e4f76cacc132231420e5
diff --git a/net-analyzer/pmacct/files/pmacct-0.12.0-gentoo.patch
b/net-analyzer/pmacct/files/pmacct-0.12.0-gentoo.patch
deleted file mode 100644
index 34efc1e..000
--- a/net-analyzer/pmacct/files/pmacct-0.12.0-gentoo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
a/configure
-+++ b/configure
-@@ -1103,7 +1103,7 @@
- echo $ac_n "checking whether to enable debugging compiler options""... $ac_c"
1>&6
- echo "configure:1105: checking whether to enable debugging compiler options"
>&5
- # Check whether --enable-debug or --disable-debug was given.
--if test "${enable_debug+set}" = set; then
-+if test "${enable_debug+set}" = TODO_THIS_WILL_NEVER_BE_TRUE; then
- enableval="$enable_debug"
- echo "$ac_t""yes" 1>&6
- tmp_CFLAGS=`echo $CFLAGS | sed 's/O2/O0/g'`
-@@ -1114,7 +1114,7 @@
- #CFLAGS="$CFLAGS -Wcast-align -Wcast-qual -Wnested-externs"
- #CFLAGS="$CFLAGS -Wshadow -Wbad-function-cast -Wwrite-strings"
- echo "$ac_t""no" 1>&6
--
-+ CFLAGS="$ac_save_CFLAGS"
- fi
-
-
diff --git a/net-analyzer/pmacct/files/pmacctd-init.d
b/net-analyzer/pmacct/files/pmacctd-init.d
index 3a0cc73..0c3fb90 100644
--- a/net-analyzer/pmacct/files/pmacctd-init.d
+++ b/net-analyzer/pmacct/files/pmacctd-init.d
@@ -25,13 +25,17 @@ checkconfig() {
start() {
checkconfig || return 1
ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --pidfile "${PMACCTDPID}" --exec
/usr/sbin/"${SVCNAME}" \
- -- -D -f "${PMACCTDCONF}" -F "${PMACCTDPID}" ${OPTS}
+ start-stop-daemon --start \
+ --pidfile "${PMACCTDPID}" \
+ --exec /usr/sbin/"${SVCNAME}" \
+ -- -D -f "${PMACCTDCONF}" \ -F "${PMACCTDPID}" ${OPTS}
eend $?
}
stop() {
ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --pidfile "${PMACCTDPID}" --exec
/usr/sbin/"${SVCNAME}"
+ start-stop-daemon --stop \
+ --pidfile "${PMACCTDPID}" \
+ --exec /usr/sbin/"${SVCNAME}"
eend $?
}
diff --git a/net-analyzer/pmacct/pmacct-0.14.3.ebuild
b/net-analyzer/pmacct/pmacct-0.14.3.ebuild
deleted file mode 100644
index c01735b..000
--- a/net-analyzer/pmacct/pmacct-0.14.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/";
-SRC_URI="http://www.pmacct
