From 2719f73b6813d11d13a9650cdd2ab8ec6e69385d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Jul 2022 15:43:36 +0100 Subject: gentoo resync : 09.07.2022 --- net-analyzer/pmacct/Manifest | 9 ++- net-analyzer/pmacct/files/nfacctd.service | 18 +++++ net-analyzer/pmacct/files/pmacctd.service | 19 +++++ net-analyzer/pmacct/files/sfacctd.service | 18 +++++ net-analyzer/pmacct/metadata.xml | 3 + net-analyzer/pmacct/pmacct-1.7.7-r1.ebuild | 109 +++++++++++++++++++++++++++++ net-analyzer/pmacct/pmacct-9999.ebuild | 109 +++++++++++++++++++++++++++++ net-analyzer/pmacct/pmacct-999999.ebuild | 94 ------------------------- 8 files changed, 283 insertions(+), 96 deletions(-) create mode 100644 net-analyzer/pmacct/files/nfacctd.service create mode 100644 net-analyzer/pmacct/files/pmacctd.service create mode 100644 net-analyzer/pmacct/files/sfacctd.service create mode 100644 net-analyzer/pmacct/pmacct-1.7.7-r1.ebuild create mode 100644 net-analyzer/pmacct/pmacct-9999.ebuild delete mode 100644 net-analyzer/pmacct/pmacct-999999.ebuild (limited to 'net-analyzer/pmacct') diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest index 5f825ebc37a1..84c9a5161ce2 100644 --- a/net-analyzer/pmacct/Manifest +++ b/net-analyzer/pmacct/Manifest @@ -1,10 +1,15 @@ +AUX nfacctd.service 372 BLAKE2B 9b15af6cf0c9cca8fbd45511db7bc51f2ca04aca349813bb8abc0670ee7a687c9453c13e9406eef7301a1c2a52ef3974fe52064197ede69d754e2d16a6ce52cd SHA512 0e25c7fb6a3ccf0e201c895c76e10bd3ffa258ee0de127e7a227369b50c8427601bdebdab53ad72cbcdae8f35ed3a4bc83b5234f616c0eb4aa64eb6509cf4f4e 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 +AUX pmacctd.service 382 BLAKE2B 32bc56cffd69785a8ecc13b6ed7592c729f1d829ba5ad92c7928b54dc7f8e04a605806427ef9834f7d196c29ae77dbe31a51019e9ea95f745835f71c4e5f0730 SHA512 203aaa83ee4e194a11476a11e6b2eb787bcddcb8b3b5853c80520bbe1287286dfc56a28d3d34db03627a58e4923b7abf0ac41185d79a231061848cd990693cc7 +AUX sfacctd.service 370 BLAKE2B 49a18ae94d108d043f1e67f7c2082f7f154c2a7c5e795f457e6bf2b48fb8d43d9e94bbd9b07a0765e4f27f3b5e6339491701a470622b3d51fc031af91751a648 SHA512 89833651c56b63098ba93965470e7450ea44e43a10790e4bfed050031dbe8c5e15965721c20b0c7e700f693428f65a98e9737dd944efc477abd9776b18fed0d8 DIST pmacct-1.7.6.tar.gz 2126837 BLAKE2B df04822e88f9409d335457031fb26ce4ae8b5da13cf2f55f8d6c78eb50dade62ef763d389ac81a509d9351e12844446ac73171e9966a5aeeecc0e5fb10219c73 SHA512 b370d20f8b8d49b9114db3ab74c66cd16962dee5e7c3642fab0b2787c4ea924a249ff4d8d770c0ccc8ca81366b9a5e557dcfb7cdddf878b99b719d0accdb949a +DIST pmacct-1.7.7.tar.gz 2149629 BLAKE2B 00357cbf1f52452c4a9ee9807e2c18f823019521cc9cb99553fe262826d7343e286694d666c7bab59e62767598ff373b3abafbecfdd43a823ba8784777740643 SHA512 7bc4c48041f023b5cd7ba927722478b0008d751bdb679f44beb2b281f4b16cb0bafb211d0fb947516ca80f86082f1bce578973ec298f4947ffd9d063a44bd00b EBUILD pmacct-1.7.6-r2.ebuild 2154 BLAKE2B e27390ed851b65f2040d0206dfec450cb3c76e47c873c28bd3328c34f732f094b64e8155d8ababa2456a654de58f3e6ee04232df842dd9a38c5541173bd62436 SHA512 29b3def341c1d7733afdc39a400f28b8d1e7adff7383e14b3d4f3a5ddf9b9b1fb95a6626e901b0b2feaa3ab4946414e3fcd1da95c6e1f86e3ca9bd8dfe45edb5 EBUILD pmacct-1.7.6-r3.ebuild 2196 BLAKE2B 257f50df7f45eed32ae95965998b77a11800dd4fa2f8f010442525002a262009a11619941aa4ad99076e39f59deceeb05f8a6853036c6c55642441d2b3359c4a SHA512 dfc7ec6b9f33cb21797271ac5b533dcce5a3c36bd0696fb116f6534a5c0c77354bb663671642403d46141c8ea7662930432c0618bc6c50cd86efc0614409eab1 -EBUILD pmacct-999999.ebuild 2109 BLAKE2B 42b545bea0b7c97d1bb12a8c2247be19fa6b335703b160b77d4a6cfe292258a87660b026eedd626d7d7e4669239eb866f852caf1fdc5800e0c4334cd8a00296f SHA512 e39cb151c33ac53a22376a55a5d23d99561a5c7fcddbecf42dc966e1112824a16e86aae9925a3c66645d68aa8230f71061defd3f4c41b3807b7bb73a2ac1d6f2 -MISC metadata.xml 1241 BLAKE2B fdaae9649fb01505523873cdf5873329e4a636b4cc7087f5bcf9cf0dec5acc907d6cca8a8bb0c9e8b5ab378aa76c6ab5dea5da42647daca8a1a218c0ae1985a2 SHA512 5f94b8356e7c0be897534a2a78ea78b43bd763764a179e90a44ba662dbffdca4ce12505d64c973bbd8bd51dbe5d45a40b2ff3576a0af8f8d88d0ae31e9c6228b +EBUILD pmacct-1.7.7-r1.ebuild 2375 BLAKE2B 90f2386edb435fd1d1274f0951833405f860494570f04061e92efce801cac61b985bfc08ad68a27baf4c2ad09886b1cf7676aa2f9af14b09b9eeb957ca20baa2 SHA512 b417bb4f2b7ee8580c876381dd601d79dd4adefa276b16e7c9e2564dbf14a7fd94f376eed6636a4cfc1fce70a272683e65cac5894fb694d7b602f65ddd551cb0 +EBUILD pmacct-9999.ebuild 2375 BLAKE2B 90f2386edb435fd1d1274f0951833405f860494570f04061e92efce801cac61b985bfc08ad68a27baf4c2ad09886b1cf7676aa2f9af14b09b9eeb957ca20baa2 SHA512 b417bb4f2b7ee8580c876381dd601d79dd4adefa276b16e7c9e2564dbf14a7fd94f376eed6636a4cfc1fce70a272683e65cac5894fb694d7b602f65ddd551cb0 +MISC metadata.xml 1319 BLAKE2B 0c53f8db498bcc1837e4f99ee751c5948eacc6cb513efcf7fc63f160f863a6995048b5e7987f28be2e5b0d190b7830a6d5a3f740392087371bd977ac1a50ba9a SHA512 a767f13848e711702a32586ebb02401d93e9ef65eca1d5a7f1b7951d4875638b730d074a8c09cbdc0d14b1b9b641472102ea91d1c52b4108201f7a382b2b142a diff --git a/net-analyzer/pmacct/files/nfacctd.service b/net-analyzer/pmacct/files/nfacctd.service new file mode 100644 index 000000000000..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 000000000000..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 000000000000..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/metadata.xml b/net-analyzer/pmacct/metadata.xml index a700a40b473b..1c025fea769e 100644 --- a/net-analyzer/pmacct/metadata.xml +++ b/net-analyzer/pmacct/metadata.xml @@ -19,4 +19,7 @@ Link IPv4/IPv6 traffic accounting binaries Enable support for ZeroMQ through net-libs/zeromq + + pmacct/pmacct + diff --git a/net-analyzer/pmacct/pmacct-1.7.7-r1.ebuild b/net-analyzer/pmacct/pmacct-1.7.7-r1.ebuild new file mode 100644 index 000000000000..55db903b6abd --- /dev/null +++ b/net-analyzer/pmacct/pmacct-1.7.7-r1.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2022 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 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 + + local myeconfargs=( + $(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 + ) + + econf "${myeconfargs[@]}" +} + +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 + + 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-9999.ebuild b/net-analyzer/pmacct/pmacct-9999.ebuild new file mode 100644 index 000000000000..55db903b6abd --- /dev/null +++ b/net-analyzer/pmacct/pmacct-9999.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2022 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 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 + + local myeconfargs=( + $(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 + ) + + econf "${myeconfargs[@]}" +} + +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 + + 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-999999.ebuild b/net-analyzer/pmacct/pmacct-999999.ebuild deleted file mode 100644 index 4446fb29a9c9..000000000000 --- a/net-analyzer/pmacct/pmacct-999999.ebuild +++ /dev/null @@ -1,94 +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 git-r3 toolchain-funcs - -DESCRIPTION="A network tool to gather IP traffic information" -HOMEPAGE="http://www.pmacct.net/" -EGIT_REPO_URI="https://github.com/pmacct/pmacct/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -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" - -DOCS=( - CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE - docs/INTERNALS docs/PLUGINS docs/SIGNALS -) - -src_prepare() { - default - sed -i -e 's|-Werror||g' configure.ac || die - 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 -} -- cgit v1.2.3