From 27b0740bf48a0a181090a49d20f368ac8474e90b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 Jul 2022 15:10:23 +0100 Subject: gentoo auto-resync : 30:07:2022 - 15:10:23 --- net-analyzer/fprobe/Manifest | 7 +-- net-analyzer/fprobe/files/conf.d-fprobe | 71 ---------------------- .../fprobe/files/fprobe-1.1-setgroups.patch | 11 ++-- net-analyzer/fprobe/files/init.d-fprobe | 41 ------------- net-analyzer/fprobe/fprobe-1.1-r3.ebuild | 43 ------------- net-analyzer/fprobe/fprobe-1.1-r4.ebuild | 43 ------------- net-analyzer/fprobe/fprobe-1.1-r5.ebuild | 37 +++++++++++ 7 files changed, 43 insertions(+), 210 deletions(-) delete mode 100644 net-analyzer/fprobe/files/conf.d-fprobe delete mode 100644 net-analyzer/fprobe/files/init.d-fprobe delete mode 100644 net-analyzer/fprobe/fprobe-1.1-r3.ebuild delete mode 100644 net-analyzer/fprobe/fprobe-1.1-r4.ebuild create mode 100644 net-analyzer/fprobe/fprobe-1.1-r5.ebuild (limited to 'net-analyzer/fprobe') diff --git a/net-analyzer/fprobe/Manifest b/net-analyzer/fprobe/Manifest index 33bf68816f0a..6802c7bff69c 100644 --- a/net-analyzer/fprobe/Manifest +++ b/net-analyzer/fprobe/Manifest @@ -1,10 +1,7 @@ -AUX conf.d-fprobe 1620 BLAKE2B f4da70c8e6d314e1f074f38f89042623720bdd5015258a689e1f93070c950e2d08ec417a58849f994ea59c3a33929712805fe5c828295df01cbb94b4f44ab3f5 SHA512 82bc02f7538b6fade9deb6fc01d788089bcd3fac30f718f63c8ad6565414f1adc95cf57336d2d8e11dfc4622bcae9c185c322390977204e7f78730c87c7cdf7c AUX conf.d-fprobe-r1 1650 BLAKE2B bd28485ea2a7335cd086977584880615e9f11a114470e25034d448a82ee673d1ade68ee304af11256e184098494f3e06d0a272185fe2750b281d3c1653bb66d4 SHA512 554c94bf2bde9aaa63e22c7a32abed95bc2272a18e507bc43411a1f687920717e4a43cabb2c87c6425a4733f0498bfb90870039aba533e5a437fe44243ff5427 AUX fprobe-1.1-pidfile-sanity.patch 1319 BLAKE2B 911a4ec1f48f602c750a659c478380aae6b2bff983599e4720793223a640a27c8f9014e2da33699909e7d43fc1e0590c80bf3feee244f7046c766f0bfd790276 SHA512 c33d4f0f14c5b5523ffddc8ad43cd11d6d21c96a18cfbca72551426ea1fcec4bfbc86af23a63732129ee6b905f44fb0d05f045d692eb2e1406c400a9d4994c49 -AUX fprobe-1.1-setgroups.patch 454 BLAKE2B cec2168dbe296dea2e38d87398fd9d44543f1a0e679f8f02e0161363b4e436e07eb2c4ffc1242aeebb7db26f00d01c5360b2dc5dde60676d8f07ca609ccf8ba8 SHA512 a5248f5962f2ccb9e9235ae772d72b74db40504894e2ce40644af740849a98cfdaaa74beb151ca0e852f2df1419ee2366ed5850a15a23a54ebd3aab7569060fc -AUX init.d-fprobe 1099 BLAKE2B 0c20d0b476298b05fd88841f40acd241897210edbbf35041f87e86f9a512e1f8da7e0b4e59425dbb364555690608ca8f950a63fd4c9b96c67301eecdfac98338 SHA512 60823b35f809ada8de94f6427e2371681f646545b227974c4d5c94ae5153d48ad3815c848702606dc2ee18622787f1d04c499a241d60475c00303c6b652b9e51 +AUX fprobe-1.1-setgroups.patch 436 BLAKE2B 7bcff851652f7500ca509878948db87881a497857bef842f58901af5978f85d300a5dcef0c398a83f97741586860b605249b67466bea490264fb854b65f41352 SHA512 87f4ee868c9e481fa547bf67d7bf5ab2f69281b3459cddb0bdb405eff2412331b5a38d1d6d63d1c4169e20208d8de5d17bb3d1f3311020df76417d4c0da4d63f AUX init.d-fprobe-r1 1061 BLAKE2B 15baf6583dd9e00d228d49ef35bcb1c1029e4410288188070058d58be0798c81afdc1d7227fd25a341534aa68c61244b15673709762c057cdd0ae9f48fbaf494 SHA512 0a1286a71bdd3a2002eb750664eac0d7a56b3772c31edb2fe6dbec9831850431211dcd04fa86ed5b15131bb7fdbb541b30bd796c9de3ed616b00c52765cd757f DIST fprobe-1.1.tar.bz2 104358 BLAKE2B 960fd8941ec2a7656b9eb02a0b6ae091b6ab564b4f97aa8147ce1bc3785964008168a1ac43a3fbe2e342987ee68fff711648edb910a059222017fe1282205e8e SHA512 35fa4bedf2c615093b6637630322115e12f005bc43186b86c55c6bdc76ae5308dd31e1d05632e26e07a30fba88d76b9acc98632bee4f372edcf9df5da3e32210 -EBUILD fprobe-1.1-r3.ebuild 801 BLAKE2B db254f316f6e3dc634b5e145322ebcc515c8baeec598fa91419a7522d0efb39e0162ad285a22c3f18583e72427b721e2ffbfebaa352d0becce9c68cd477e3ee0 SHA512 6af18b0521b9c8fcdfc0abf0c3a9163adf65869c3181b16a2574b0c3a9c42442ef911dc8fe7420fbc3d3668e32b5076987f25502153b4ee80c6be331f05f496b -EBUILD fprobe-1.1-r4.ebuild 805 BLAKE2B f17d14ee899c6f0f72238f2d9ff6b71648ccc2a9d756d4bc8a7bd04cdf069d7c68029d5d8b1b06a4ef63eab4ad2e48349a39055f980a99652301d416d1416e3e SHA512 b8b0554b853b0a9c50cce814912aa8acf2ea7914639a71caa9df0742be66276e839c0dd644b876b8a534e80837f3ee322c6918572a1f6d6bb29e2fd9b3f52d2f +EBUILD fprobe-1.1-r5.ebuild 765 BLAKE2B 415682441c1b62684504c26595201310b05f12f6bbda7d292dd17934c5f61533fa1efa487514a9e1981534ffda366d6c9730965a6d7b88baffbb8a5bfc413470 SHA512 53d9891fae6a6112dff55351354cf278ae579284f726bad0633f0bc68559a12045dec2de5e693b21aa71266a8055c566bc2be00d8adae53cf550d798d21e0ad9 MISC metadata.xml 427 BLAKE2B b088738560ccdfb0de31d8efb51b0a47bec78b87f6331c8621627e1acef0c97f04de92efaa711f839953a11e4f943fab447503da1486db45ace918ce55682f80 SHA512 433edbd738899b119195e8630503e51cf9f2b72662820b8ad986b770d2fe6c78b55ab1b718a33416378dce3348bfb0dba4352d334523b095df5b634d8a632f09 diff --git a/net-analyzer/fprobe/files/conf.d-fprobe b/net-analyzer/fprobe/files/conf.d-fprobe deleted file mode 100644 index a93c5c10b207..000000000000 --- a/net-analyzer/fprobe/files/conf.d-fprobe +++ /dev/null @@ -1,71 +0,0 @@ -# Config file for /etc/init.d/fprobe - -# Do we want the interface in promiscous mode [yes/no] -#PROMISC=no - -# Interface -IFACE=eth0 - -# If configured, only capture packets matching this tcpdump expression -#FILTER="" - -# Flow state timers -#TIMER_EXPIRED=5 -#TIMER_FRAGMENTED=30 -#TIMER_IDLE=60 -#TIMER_ACTIVE=300 - -# This is the default and should be left unless you know what you are doing -#FLOW_VER=5 - -# local ip. if configured fprobe will use this as the source IP for sending ALL flow data -# If you want to specify a specific source address per collecter, customize it below -#LOCALIP= - -# SNMP iface id -SNMP_IFACE="${IFACE#eth}" - -# Maximum number of concurrent flows to track -# using a specified amount of memory -#MEMBULK=10000 -#MEMLIMIT= - -# Pending queue -#PENDING=100 - -# Kernel capture buffer size (kB) -#KERNBUF=1024 - -# Realtime priority [0=disabled, 1..99] -#RTPRIO=0 - -# Delay N nanoseconds after each B bytes -#DELAY="0:0" - -# How much of the start of each packet to grab -#SNAPLEN=256 - -# chroot() to this location after startup -CHROOT="/var/empty" - -# User to run as. must have perms to the pidfile directory /var/run/fprobe/ -USER=nobody - -# logging level for syslog (0=EMERG, ..., 6=INFO, 7=DEBUG) -#LOGLEVEL=6 - -# If you want to run multiple instances of fprobe, -# You MUST set this variable to a unique INTEGER for each one! -PIDFILE_ID='' - -# remote ip. this is where we send flows -REMOTEIP=127.0.0.1 -# port to listen on -PORT=2055 -# Collector type, see the manpage for valid types -TYPE='' - -# If you want multiple collectors, just specify each one here -COLLECTORS="${REMOTEIP}:${PORT}/${LOCALIP}/${TYPE}" - -# vim:ft=gentoo-conf-d: diff --git a/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch b/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch index 803a2a9ce43a..948c6fee29c1 100644 --- a/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch +++ b/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch @@ -4,15 +4,12 @@ Signed-off-by: Robin H. Johnson --- a/src/fprobe.c +++ b/src/fprobe.c -@@ -1541,10 +1541,10 @@ - } - +@@ -1543,7 +1543,7 @@ if (pw) { - if (setgroups(0, NULL) < 0) { - my_log(LOG_CRIT, "setgroups: %s", strerror(errno)); + if (setgroups(0, NULL) < 0) { + my_log(LOG_CRIT, "setgroups: %s", strerror(errno)); - exit(1); + //exit(1); - } + } if (setregid(pw->pw_gid, pw->pw_gid)) { my_log(LOG_CRIT, "setregid(%u): %s", pw->pw_gid, strerror(errno)); - exit(1); diff --git a/net-analyzer/fprobe/files/init.d-fprobe b/net-analyzer/fprobe/files/init.d-fprobe deleted file mode 100644 index c470af432c9c..000000000000 --- a/net-analyzer/fprobe/files/init.d-fprobe +++ /dev/null @@ -1,41 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -BIN=/usr/sbin/fprobe -PIDFILE_EXTRA="" -[ -n "$PIDFILE_ID" ] && PIDFILE_EXTRA="[$PIDFILE_ID]" -PIDFILE="/var/run/fprobe$PIDFILE_EXTRA.pid" - -start() { - ebegin "Starting fprobe" - local OPTS="" - [ "${PROMISC}" = "yes" ] || OPTS="${OPTS} -p" - [ -n "${FILTER}" ] && OPTS="${OPTS} -f '${FILTER}'" - for optname in i:IFACE s:TIMER_EXPIRED g:TIME_FRAGMENTED d:TIMER_IDLE \ - e:TIMER_ACTIVE n:FLOW_VER a:LOCALIP x:SNMP_IFACE b:MEMBULK \ - m:MEMLIMIT q:PENDING B:KERNBUF r:RTPRIO t:DELAY S:SNAPLEN \ - c:CHROOT u:USER v:LOGLEVEL ; do - opt="${optname%:*}" optvar="${optname#*:}" - eval optvalue='$'$optvar - [ -n "$optvalue" ] && OPTS="${OPTS} -${opt} ${optvalue}" - done - OPTS="${OPTS} -l 1:${PIDFILE_ID} ${COLLECTORS}" - start-stop-daemon --start --exec $BIN \ - --pidfile ${PIDFILE} \ - -- ${OPTS} - eend $? -} - -stop() { - ebegin "Stopping fprobe" - start-stop-daemon --stop --quiet --exec $BIN \ - --pidfile ${PIDFILE} - eend $? -} - -# vim:ft=gentoo-init-d: diff --git a/net-analyzer/fprobe/fprobe-1.1-r3.ebuild b/net-analyzer/fprobe/fprobe-1.1-r3.ebuild deleted file mode 100644 index d86d043a9c3f..000000000000 --- a/net-analyzer/fprobe/fprobe-1.1-r3.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="libpcap-based tool to collect network traffic data and emit it as NetFlow flows" -HOMEPAGE="http://fprobe.sourceforge.net" -LICENSE="GPL-2" - -SRC_URI="mirror://sourceforge/fprobe/${P}.tar.bz2" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" - -IUSE="debug messages" - -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" -PATCHES=( - "${FILESDIR}"/fprobe-1.1-pidfile-sanity.patch - "${FILESDIR}"/fprobe-1.1-setgroups.patch -) - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable messages) -} - -DOCS=( AUTHORS NEWS README TODO ) - -src_install() { - default - - docinto contrib - dodoc contrib/tg.sh - - newinitd "${FILESDIR}"/init.d-fprobe fprobe - newconfd "${FILESDIR}"/conf.d-fprobe fprobe -} diff --git a/net-analyzer/fprobe/fprobe-1.1-r4.ebuild b/net-analyzer/fprobe/fprobe-1.1-r4.ebuild deleted file mode 100644 index 76646bcf6a10..000000000000 --- a/net-analyzer/fprobe/fprobe-1.1-r4.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="libpcap-based tool to collect network traffic data and emit it as NetFlow flows" -HOMEPAGE="http://fprobe.sourceforge.net" -LICENSE="GPL-2" - -SRC_URI="mirror://sourceforge/fprobe/${P}.tar.bz2" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -IUSE="debug messages" - -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" -PATCHES=( - "${FILESDIR}"/fprobe-1.1-pidfile-sanity.patch - "${FILESDIR}"/fprobe-1.1-setgroups.patch -) - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable messages) -} - -DOCS=( AUTHORS NEWS README TODO ) - -src_install() { - default - - docinto contrib - dodoc contrib/tg.sh - - newinitd "${FILESDIR}"/init.d-fprobe-r1 fprobe - newconfd "${FILESDIR}"/conf.d-fprobe-r1 fprobe -} diff --git a/net-analyzer/fprobe/fprobe-1.1-r5.ebuild b/net-analyzer/fprobe/fprobe-1.1-r5.ebuild new file mode 100644 index 000000000000..1aee1c4aa4f3 --- /dev/null +++ b/net-analyzer/fprobe/fprobe-1.1-r5.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="libpcap-based tool to collect network traffic data and emit it as NetFlow flows" +HOMEPAGE="http://fprobe.sourceforge.net" +SRC_URI="mirror://sourceforge/fprobe/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc x86" +IUSE="debug messages" + +RDEPEND="net-libs/libpcap" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/fprobe-1.1-pidfile-sanity.patch + "${FILESDIR}"/fprobe-1.1-setgroups.patch +) + +src_configure() { + econf \ + $(use_enable debug) \ + $(use_enable messages) +} + +src_install() { + default + + docinto contrib + dodoc contrib/tg.sh + + newinitd "${FILESDIR}"/init.d-fprobe-r1 fprobe + newconfd "${FILESDIR}"/conf.d-fprobe-r1 fprobe +} -- cgit v1.2.3