gentoo auto-resync : 30:07:2022 - 15:10:23

3 files changed, 4 insertions, 119 deletions

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 <robbat2@gentoo.org>
 
 --- 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: