commit: 511c783052d807355fdf5654ba8d0b83d31a3be5 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Feb 14 23:24:19 2026 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Feb 14 23:24:19 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=511c7830
net-analyzer/pmacct: add 1.7.9 Bug: https://bugs.gentoo.org/945353 Signed-off-by: David Seifert <soap <AT> gentoo.org> net-analyzer/pmacct/Manifest | 1 + .../pmacct/files/pmacct-1.7.9-build-system.patch | 27 ++++++ net-analyzer/pmacct/files/pmacct-1.7.9-c23.patch | 49 ++++++++++ net-analyzer/pmacct/pmacct-1.7.9.ebuild | 108 +++++++++++++++++++++ 4 files changed, 185 insertions(+) diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest index 2d7d7e60d533..2daa348a24d4 100644 --- a/net-analyzer/pmacct/Manifest +++ b/net-analyzer/pmacct/Manifest @@ -1 +1,2 @@ DIST pmacct-1.7.8.tar.gz 2175335 BLAKE2B 1b95d48c479d59f2d4a7654e870e6f61c984c57c31aebbfb9fbf86f2d1027cde6a0f334489f33186bbb19ee7bdf94726f0053faa4829273de2d1975f58dff97f SHA512 df576644688ddb1957aa1583b101b96d86ab404c1416e0709b1bc85d691d13841bdb92a37a4526bc9273101dd11e3134d2fb35c06d2cbcde8e5bf7e84751a1c2 +DIST pmacct-1.7.9.tar.gz 2132268 BLAKE2B 70bca376e76d774527ef81f5688ed8f33723989d5a4627532e1bfa66789933ff7cb95848d9347763ce86c2fd34887916d60c40db309ec48fe9fa8d2f084e4e0a SHA512 a12b76c094c1f6abc8c3de31219d9471d3422a3ed27d4edf8785d14c9bebe1cc6fd070ea839f02a2e2f70da87943aa7843586092cff1a9965d36d84a79585129 diff --git a/net-analyzer/pmacct/files/pmacct-1.7.9-build-system.patch b/net-analyzer/pmacct/files/pmacct-1.7.9-build-system.patch new file mode 100644 index 000000000000..3e9680b79043 --- /dev/null +++ b/net-analyzer/pmacct/files/pmacct-1.7.9-build-system.patch @@ -0,0 +1,27 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1212,11 +1212,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, +@@ -1263,9 +1259,9 @@ + AC_MSG_RESULT(yes) + tmp_CFLAGS=`echo $CFLAGS | sed 's/O2/O0/g'` + CFLAGS="$tmp_CFLAGS" +- CFLAGS="$CFLAGS -g -Wall -Werror" ++ CFLAGS="$CFLAGS -g -Wall" + else +- CFLAGS="$CFLAGS -Wall -Werror" ++ CFLAGS="$CFLAGS -Wall" + AC_MSG_RESULT(no) + fi + ], diff --git a/net-analyzer/pmacct/files/pmacct-1.7.9-c23.patch b/net-analyzer/pmacct/files/pmacct-1.7.9-c23.patch new file mode 100644 index 000000000000..b1c80c0fce65 --- /dev/null +++ b/net-analyzer/pmacct/files/pmacct-1.7.9-c23.patch @@ -0,0 +1,49 @@ +From 6466578967d3d39c46f7ec10b308bca36568697d Mon Sep 17 00:00:00 2001 +From: Paolo Lucente <[email protected]> +Date: Tue, 11 Mar 2025 23:02:05 +0000 +Subject: [PATCH] * fix, making gcc15 happy. Patch contributed by Petr Gajdos + +--- a/src/pmacct.h ++++ b/src/pmacct.h +@@ -368,9 +368,9 @@ struct child_ctl2 { + #include "util.h" + + /* prototypes */ +-void startup_handle_falling_child(); +-void handle_falling_child(); +-void ignore_falling_child(); ++void startup_handle_falling_child(int); ++void handle_falling_child(int); ++void ignore_falling_child(int); + void PM_sigint_handler(int); + void PM_sigalrm_noop_handler(int); + void reload(int); +--- a/src/signals.c ++++ b/src/signals.c +@@ -29,7 +29,7 @@ + extern struct plugins_list_entry *plugin_list; + + /* functions */ +-void startup_handle_falling_child() ++void startup_handle_falling_child(int unused) + { + int i, j; + +@@ -42,7 +42,7 @@ void startup_handle_falling_child() + } + } + +-void handle_falling_child() ++void handle_falling_child(int unused) + { + struct plugins_list_entry *list = NULL; + int j, ret; +@@ -100,7 +100,7 @@ void handle_falling_child() + } + } + +-void ignore_falling_child() ++void ignore_falling_child(int unused) + { + pid_t cpid; + int status; diff --git a/net-analyzer/pmacct/pmacct-1.7.9.ebuild b/net-analyzer/pmacct/pmacct-1.7.9.ebuild new file mode 100644 index 000000000000..9067df99452c --- /dev/null +++ b/net-analyzer/pmacct/pmacct-1.7.9.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs systemd + +DESCRIPTION="A network tool to gather IP traffic information" +HOMEPAGE="http://www.pmacct.net/"; + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/pmacct/pmacct"; + inherit git-r3 +else + SRC_URI="https://github.com/pmacct/pmacct/releases/download/v${PV}/${P}.tar.gz + http://www.pmacct.net/${P}.tar.gz"; + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" + +IUSE="+bgp-bins +bmp-bins geoipv2 jansson kafka +l2 mysql ndpi nflog postgres rabbitmq sqlite +st-bins +traffic-bins zmq" + +REQUIRED_USE=" + kafka? ( jansson ) + rabbitmq? ( jansson ) +" + +RDEPEND="dev-libs/libcdada + net-libs/libpcap + 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.9-build-system.patch + "${FILESDIR}"/${PN}-1.7.9-c23.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 + + local myeconfargs=( + $(use_enable bgp-bins) + $(use_enable bmp-bins) + $(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-ebpf + --disable-debug + --disable-mongodb + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + local dirname + for dirname in examples sql; do + dodoc -r ${dirname} + done + + 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 +}
