* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/fprobe/, net-analyzer/fprobe/files/
@ 2017-02-16 7:21 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2017-02-16 7:21 UTC (permalink / raw
To: gentoo-commits
commit: 8bd99b0239dc60e14372e76d3a118e829089bcae
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 07:20:26 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 07:20:26 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bd99b02
net-analyzer/fprobe: EAPI bump. Fix bashisms by Andrew Savchenko (bug #609112).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-analyzer/fprobe/files/conf.d-fprobe | 2 +-
net-analyzer/fprobe/files/init.d-fprobe | 8 +++----
.../{fprobe-1.1-r2.ebuild => fprobe-1.1-r3.ebuild} | 26 +++++++++++-----------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/net-analyzer/fprobe/files/conf.d-fprobe b/net-analyzer/fprobe/files/conf.d-fprobe
index f73ccf4c58..a93c5c10b2 100644
--- a/net-analyzer/fprobe/files/conf.d-fprobe
+++ b/net-analyzer/fprobe/files/conf.d-fprobe
@@ -23,7 +23,7 @@ IFACE=eth0
#LOCALIP=
# SNMP iface id
-SNMP_IFACE="${IFACE//eth}"
+SNMP_IFACE="${IFACE#eth}"
# Maximum number of concurrent flows to track
# using a specified amount of memory
diff --git a/net-analyzer/fprobe/files/init.d-fprobe b/net-analyzer/fprobe/files/init.d-fprobe
index efa5357177..c470af432c 100644
--- a/net-analyzer/fprobe/files/init.d-fprobe
+++ b/net-analyzer/fprobe/files/init.d-fprobe
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
depend() {
@@ -14,14 +14,14 @@ PIDFILE="/var/run/fprobe$PIDFILE_EXTRA.pid"
start() {
ebegin "Starting fprobe"
local OPTS=""
- [ "${PROMISC}" == "yes" ] || OPTS="${OPTS} -p"
+ [ "${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/*:}"
- optvalue="${!optvar}"
+ opt="${optname%:*}" optvar="${optname#*:}"
+ eval optvalue='$'$optvar
[ -n "$optvalue" ] && OPTS="${OPTS} -${opt} ${optvalue}"
done
OPTS="${OPTS} -l 1:${PIDFILE_ID} ${COLLECTORS}"
diff --git a/net-analyzer/fprobe/fprobe-1.1-r2.ebuild b/net-analyzer/fprobe/fprobe-1.1-r3.ebuild
similarity index 54%
rename from net-analyzer/fprobe/fprobe-1.1-r2.ebuild
rename to net-analyzer/fprobe/fprobe-1.1-r3.ebuild
index ba10e41b4a..8524efb162 100644
--- a/net-analyzer/fprobe/fprobe-1.1-r2.ebuild
+++ b/net-analyzer/fprobe/fprobe-1.1-r3.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
-inherit eutils
+EAPI=6
-DESCRIPTION="A libpcap-based tool to collect network traffic data and emit it as NetFlow flows"
+DESCRIPTION="libpcap-based tool to collect network traffic data and emit it as NetFlow flows"
HOMEPAGE="http://fprobe.sourceforge.net"
LICENSE="GPL-2"
@@ -15,15 +14,16 @@ KEYWORDS="~amd64 ~ppc ~x86"
IUSE="debug messages"
-DEPEND="net-libs/libpcap"
-
-src_prepare() {
- # The pidfile should be created by the parent process, before the
- # setuid/chroot is executed.
- epatch "${FILESDIR}"/fprobe-1.1-pidfile-sanity.patch
- # This seems to fail, uncertain why.
- epatch "${FILESDIR}"/fprobe-1.1-setgroups.patch
-}
+DEPEND="
+ net-libs/libpcap
+"
+RDEPEND="
+ ${DEPEND}
+"
+PATCHES=(
+ "${FILESDIR}"/fprobe-1.1-pidfile-sanity.patch
+ "${FILESDIR}"/fprobe-1.1-setgroups.patch
+)
src_configure() {
econf \
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/fprobe/, net-analyzer/fprobe/files/
@ 2022-07-30 9:20 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2022-07-30 9:20 UTC (permalink / raw
To: gentoo-commits
commit: 760c81eb61289e88af4858c01b8561b1f26385c1
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 09:20:07 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 09:20:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=760c81eb
net-analyzer/fprobe: drop 1.1-r3
Signed-off-by: David Seifert <soap <AT> gentoo.org>
net-analyzer/fprobe/files/conf.d-fprobe | 71 --------------------------------
net-analyzer/fprobe/files/init.d-fprobe | 41 ------------------
net-analyzer/fprobe/fprobe-1.1-r3.ebuild | 43 -------------------
3 files changed, 155 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/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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/fprobe/, net-analyzer/fprobe/files/
@ 2022-07-30 9:20 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2022-07-30 9:20 UTC (permalink / raw
To: gentoo-commits
commit: 416d9a6613ba91327f6e372476aefd5ca5408ef4
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 09:20:08 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 09:20:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=416d9a66
net-analyzer/fprobe: update EAPI 6 -> 8
Signed-off-by: David Seifert <soap <AT> gentoo.org>
net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch | 11 ++++-------
.../{fprobe-1.1-r4.ebuild => fprobe-1.1-r5.ebuild} | 20 +++++++-------------
2 files changed, 11 insertions(+), 20 deletions(-)
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/fprobe-1.1-r4.ebuild b/net-analyzer/fprobe/fprobe-1.1-r5.ebuild
similarity index 83%
rename from net-analyzer/fprobe/fprobe-1.1-r4.ebuild
rename to net-analyzer/fprobe/fprobe-1.1-r5.ebuild
index 76646bcf6a10..1aee1c4aa4f3 100644
--- a/net-analyzer/fprobe/fprobe-1.1-r4.ebuild
+++ b/net-analyzer/fprobe/fprobe-1.1-r5.ebuild
@@ -1,24 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
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"
+
+LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
-
IUSE="debug messages"
-DEPEND="
- net-libs/libpcap
-"
-RDEPEND="
- ${DEPEND}
-"
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}"
+
PATCHES=(
"${FILESDIR}"/fprobe-1.1-pidfile-sanity.patch
"${FILESDIR}"/fprobe-1.1-setgroups.patch
@@ -30,8 +26,6 @@ src_configure() {
$(use_enable messages)
}
-DOCS=( AUTHORS NEWS README TODO )
-
src_install() {
default
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-30 9:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-30 9:20 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/fprobe/, net-analyzer/fprobe/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2022-07-30 9:20 David Seifert
2017-02-16 7:21 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox