aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2013-01-25 13:47:37 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2013-01-25 13:49:36 +0000
commit400badb4d8cb651d1daf2de3e2973c8fb459b5a9 (patch)
tree65c00ba10a32f93aec061afa3a3b87d4dcdfabcd
parent54ac885b4810846a7c36e7f7a02c6986acb7b426 (diff)
downloadaports-400badb4d8cb651d1daf2de3e2973c8fb459b5a9.tar.bz2
aports-400badb4d8cb651d1daf2de3e2973c8fb459b5a9.tar.xz
main/fprobe-ulog: add support for ulog-nlgroup
(cherry picked from commit 986f52de429afaf6b1dca4b476c7b9038bccffc7)
-rw-r--r--main/fprobe-ulog/APKBUILD6
-rw-r--r--main/fprobe-ulog/fprobe-ulog.confd4
-rwxr-xr-xmain/fprobe-ulog/fprobe-ulog.initd8
3 files changed, 9 insertions, 9 deletions
diff --git a/main/fprobe-ulog/APKBUILD b/main/fprobe-ulog/APKBUILD
index 76c665c878..139aaf02c1 100644
--- a/main/fprobe-ulog/APKBUILD
+++ b/main/fprobe-ulog/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=fprobe-ulog
pkgver=1.1
-pkgrel=1
+pkgrel=2
pkgdesc="netfilter-based tool that collect network traffic"
url="http://fprobe.sourceforge.net/"
arch="all"
@@ -46,6 +46,6 @@ package() {
}
md5sums="cdb2e4edc47e8a3d5479eeabfb979ebc fprobe-ulog-1.1.tar.bz2
-a92104da52c99532d1d01007b78940fc fprobe-ulog.confd
-744975c055421223940a278517b34d47 fprobe-ulog.initd
+8aabfe548f2fb197a10c8ccfaa4d0a23 fprobe-ulog.confd
+df64f84f28af0976bff35a8fda8d663a fprobe-ulog.initd
f1316ad835c1a2b6565b4dc448b022df fprobe-1.1-pidfile-sanity.patch"
diff --git a/main/fprobe-ulog/fprobe-ulog.confd b/main/fprobe-ulog/fprobe-ulog.confd
index 758d97f463..32f62bbca0 100644
--- a/main/fprobe-ulog/fprobe-ulog.confd
+++ b/main/fprobe-ulog/fprobe-ulog.confd
@@ -1,8 +1,8 @@
# Config file for /etc/init.d/fprobe
DAEMON=/usr/sbin/fprobe-ulog
-# Do we want the interface in promiscous mode [yes/no]
-#PROMISC=no
+# ULOG group bitwise mask (default 1)
+# ULOG_GROUP=1
# If configured, only capture packets matching this tcpdump expression
#FILTER=""
diff --git a/main/fprobe-ulog/fprobe-ulog.initd b/main/fprobe-ulog/fprobe-ulog.initd
index d8f5c9acff..283fac8f2f 100755
--- a/main/fprobe-ulog/fprobe-ulog.initd
+++ b/main/fprobe-ulog/fprobe-ulog.initd
@@ -16,10 +16,10 @@ start() {
local OPTS=""
set --
[ -n "${FILTER}" ] && set -- -f "${FILTER}"
- for optname in 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 \
- c:CHROOT u:USER v:LOGLEVEL ; do
+ for optname in U:ULOG_GROUP 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 c:CHROOT u:USER v:LOGLEVEL ; do
opt="${optname/:*}" optvar="${optname/*:}"
eval optvalue="\$$optvar"
[ -n "$optvalue" ] && OPTS="${OPTS} -${opt} ${optvalue}"