* [gentoo-commits] gentoo-x86 commit in net-firewall/fwknop/files: fwknopd.confd fwknopd.init fwknop-2.6.0-remove-extra-run-from-paths.patch
@ 2015-04-29 23:18 Ian Delaney (idella4)
0 siblings, 0 replies; only message in thread
From: Ian Delaney (idella4) @ 2015-04-29 23:18 UTC (permalink / raw
To: gentoo-commits
idella4 15/04/29 23:18:49
Modified: fwknopd.confd fwknopd.init
Removed: fwknop-2.6.0-remove-extra-run-from-paths.patch
Log:
bump; ebuild supplied by Coacher in bug #519716, newinitd and newconfd files updated, removed prior version to avoid any mismatch, closes bug #519716
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Revision Changes Path
1.2 net-firewall/fwknop/files/fwknopd.confd
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/fwknop/files/fwknopd.confd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/fwknop/files/fwknopd.confd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/fwknop/files/fwknopd.confd?r1=1.1&r2=1.2
Index: fwknopd.confd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/fwknop/files/fwknopd.confd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fwknopd.confd 27 Apr 2014 10:50:49 -0000 1.1
+++ fwknopd.confd 29 Apr 2015 23:18:49 -0000 1.2
@@ -1,12 +1,12 @@
# /etc/conf.d/fwknopd: config file for /etc/init.d/fwknopd
-# Where are your fwknopd config files stored?
+# Path to the fwknopd config files
FWKNOPD_CONFDIR="/etc/fwknop"
# Options to pass to fwknopd daemon.
-# See the fwknopd(8) manpage for more info.
+# Refer to the fwknopd(8) manpage for more information.
FWKNOPD_OPTS=""
@@ -16,6 +16,7 @@
#FWKNOPD_PIDFILE="/run/fwknop/fwknopd.pid"
-# Path to the fwknopd binary (needs to be absolute path).
+# Path to the fwknopd binary (needs to be an absolute path).
#FWKNOPD_BINARY="/usr/sbin/fwknopd"
+9
1.2 net-firewall/fwknop/files/fwknopd.init
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/fwknop/files/fwknopd.init?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/fwknop/files/fwknopd.init?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/fwknop/files/fwknopd.init?r1=1.1&r2=1.2
Index: fwknopd.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/fwknop/files/fwknopd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fwknopd.init 27 Apr 2014 10:50:49 -0000 1.1
+++ fwknopd.init 29 Apr 2015 23:18:49 -0000 1.2
@@ -1,15 +1,15 @@
#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwknop/files/fwknopd.init,v 1.1 2014/04/27 10:50:49 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwknop/files/fwknopd.init,v 1.2 2015/04/29 23:18:49 idella4 Exp $
extra_commands="checkconfig"
extra_started_commands="reload"
-FWKNOPD_CONFDIR="${FWKNOPD_CONFDIR:-/etc/fwknop}"
-FWKNOPD_CONFIG="${FWKNOPD_CONFDIR}/fwknopd.conf"
-FWKNOPD_PIDFILE="${FWKNOPD_PIDFILE:-/run/fwknop/${SVCNAME}.pid}"
-FWKNOPD_BINARY="${FWKNOPD_BINARY:-/usr/sbin/fwknopd}"
+: ${FWKNOPD_CONFDIR:=/etc/fwknop}
+: ${FWKNOPD_CONFIG:=${FWKNOPD_CONFDIR}/fwknopd.conf}
+: ${FWKNOPD_PIDFILE:=/run/fwknop/${SVCNAME}.pid}
+: ${FWKNOPD_BINARY:=/usr/sbin/fwknopd}
depend() {
need iptables
@@ -17,47 +17,52 @@
if [ "${rc_need+set}" = "set" ]; then
: # Do nothing, the user has explicitly set rc_need
else
- warn_addr=''
+ warn_intf=''
for x in $(awk '/^PCAP_INTF/{ sub(";$", ""); print $2 }' "${FWKNOPD_CONFIG}" 2>/dev/null); do
- warn_addr="${warn_addr} $x"
+ warn_intf="${warn_intf} $x"
done
unset x
- if [ "${warn_addr:+set}" = "set" ]; then
+ if [ "${warn_intf:+set}" = "set" ]; then
need net
ewarn "You are binding an interface in PCAP_INTF statement in your fwknopd.conf!"
- ewarn "You must add rc_need=\"net.FOO\" to your /etc/conf.d/${SVCNAME}"
+ ewarn "You must add rc_need=\"net.FOO\" to your /etc/conf.d/${SVCNAME},"
ewarn "where FOO is the following interface(s):"
- ewarn "${warn_addr}"
+ ewarn "${warn_intf}"
else
# if PCAP_INTF and PCAP_FILE are not set, then fwknopd uses eth0
- if [ -z "$(grep "^PCAP_FILE" "${FWKNOPD_CONFIG}")" ]; then
+ if [ -z "$(grep \"^PCAP_FILE\" ${FWKNOPD_CONFIG})" ]; then
need net
- ewarn "You are not binding any interface in PCAP_INTF statement in your fwknopd.conf,"
- ewarn "neither you providing PCAP_FILE option. Therefore fwknopd will listen on eth0."
- ewarn "You must add rc_need=\"net.eth0\" to your /etc/conf.d/${SVCNAME}"
+ ewarn "You are not binding any interface in PCAP_INTF statement in your
+fwknopd.conf,"
+ ewarn "neither you are providing PCAP_FILE option. Thus fwknopd will listen on
+eth0."
+ ewarn "You must add rc_need=\"net.eth0\" to your /etc/conf.d/${SVCNAME}."
fi
fi
- unset warn_addr
+ unset warn_intf
fi
}
checkconfig() {
if [ ! -e "${FWKNOPD_CONFDIR}"/fwknopd.conf ]; then
eerror "You need ${FWKNOPD_CONFDIR}/fwknopd.conf file to run fwknopd"
- eerror "Example configuration located at /etc/fwknop/fwknopd.conf.example"
+ eerror "Example is located at /etc/fwknop/fwknopd.conf.example"
return 1
fi
if [ ! -e "${FWKNOPD_CONFDIR}"/access.conf ]; then
eerror "You need ${FWKNOPD_CONFDIR}/access.conf file to run fwknopd"
- eerror "Example configuration located at /etc/fwknop/access.conf.example"
+ eerror "Example is located at /etc/fwknop/access.conf.example"
return 1
fi
- [ "${FWKNOPD_PIDFILE}" != "/run/fwknop/fwknopd.pid" ] \
+ [ "${FWKNOPD_PIDFILE}" != "/run/fwknop/${SVCNAME}.pid" ] \
&& FWKNOPD_OPTS="${FWKNOPD_OPTS} --pid-file=${FWKNOPD_PIDFILE}"
+
[ "${FWKNOPD_CONFDIR}" != "/etc/fwknop" ] \
- && FWKNOPD_OPTS="${FWKNOPD_OPTS} -c ${FWKNOPD_CONFDIR}/fwknopd.conf -a ${FWKNOPD_CONFDIR}/access.conf"
+ && FWKNOPD_OPTS="${FWKNOPD_OPTS} \
+ --config=${FWKNOPD_CONFDIR}/fwknopd.conf \
+ --access-file=${FWKNOPD_CONFDIR}/access.conf"
return 0
}
@@ -68,7 +73,7 @@
ebegin "Starting ${SVCNAME}"
start-stop-daemon --start \
--exec "${FWKNOPD_BINARY}" --pidfile="${FWKNOPD_PIDFILE}" \
- -- "${FWKNOPD_OPTS}"
+ -- ${FWKNOPD_OPTS}
eend $?
}
@@ -91,3 +96,4 @@
--exec "${FWKNOPD_BINARY}" --pidfile "${FWKNOPD_PIDFILE}"
eend $?
}
+
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-04-29 23:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-29 23:18 [gentoo-commits] gentoo-x86 commit in net-firewall/fwknop/files: fwknopd.confd fwknopd.init fwknop-2.6.0-remove-extra-run-from-paths.patch Ian Delaney (idella4)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox