From 291d0b043f537949804ecf1c2adb550d944ee405 Mon Sep 17 00:00:00 2001 From: Ilya Tumaykin Date: Mon, 21 Dec 2015 05:19:24 +0300 Subject: net-firewall/fwknop: drop obsolete initscript revision suffix Package-Manager: portage-2.2.24 --- net-firewall/fwknop/files/fwknopd.init | 92 ++++++++++++++++++++++++++++++ net-firewall/fwknop/files/fwknopd.init-r1 | 92 ------------------------------ net-firewall/fwknop/fwknop-2.6.7-r2.ebuild | 2 +- 3 files changed, 93 insertions(+), 93 deletions(-) create mode 100644 net-firewall/fwknop/files/fwknopd.init delete mode 100644 net-firewall/fwknop/files/fwknopd.init-r1 (limited to 'net-firewall') diff --git a/net-firewall/fwknop/files/fwknopd.init b/net-firewall/fwknop/files/fwknopd.init new file mode 100644 index 000000000000..9e8ecdc36d97 --- /dev/null +++ b/net-firewall/fwknop/files/fwknopd.init @@ -0,0 +1,92 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +extra_commands="checkconfig" +extra_started_commands="reload" + +: ${FWKNOPD_BINARY:=/usr/sbin/fwknopd} +: ${FWKNOPD_CONFDIR:=/etc/fwknop} +: ${FWKNOPD_CONFIG:=${FWKNOPD_CONFDIR}/fwknopd.conf} +: ${FWKNOPD_PIDFILE:=/run/fwknop/${SVCNAME}.pid} + +depend() { + after iptables ip6tables ebtables firewall + use logger + if [ "${rc_need+set}" = "set" ]; then + : # Do nothing, the user has explicitly set rc_need + elif [ -f "${FWKNOPD_CONFIG}" ]; then + local x warn_intf + for x in $(awk '/^[[:blank:]]*PCAP_INTF/{ sub(";$", ""); print $2 }' "${FWKNOPD_CONFIG}" 2>/dev/null); do + warn_intf="${warn_intf} ${x}" + done + if [ -n "${warn_intf}" ]; 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 "where FOO is the following interface(s):" + ewarn "${warn_intf}" + else + # If PCAP_INTF and PCAP_FILE are not set, then fwknopd uses eth0 + if ! grep -q '^[[:blank:]]*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 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 + fi +} + +checkconfig() { + if [ ! -e "${FWKNOPD_CONFDIR}"/fwknopd.conf ]; then + eerror "You need ${FWKNOPD_CONFDIR}/fwknopd.conf file to run fwknopd" + 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 is located at /etc/fwknop/access.conf.example" + return 1 + fi + + [ "${FWKNOPD_PIDFILE}" != "/run/fwknop/${SVCNAME}.pid" ] \ + && FWKNOPD_OPTS="${FWKNOPD_OPTS} --pid-file=${FWKNOPD_PIDFILE}" + + [ "${FWKNOPD_CONFDIR}" != "/etc/fwknop" ] \ + && FWKNOPD_OPTS="${FWKNOPD_OPTS} \ + --config=${FWKNOPD_CONFDIR}/fwknopd.conf \ + --access-file=${FWKNOPD_CONFDIR}/access.conf" + + return 0 +} + +start() { + checkconfig || return 1 + + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start \ + --exec ${FWKNOPD_BINARY} --pidfile ${FWKNOPD_PIDFILE} \ + -- ${FWKNOPD_OPTS} + eend $? +} + +stop() { + if [ "${RC_CMD}" = "restart" ]; then + checkconfig || return 1 + fi + + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --pidfile ${FWKNOPD_PIDFILE} + eend $? +} + +reload() { + checkconfig || return 1 + + ebegin "Reloading ${SVCNAME} configuration" + start-stop-daemon --signal HUP --pidfile ${FWKNOPD_PIDFILE} + eend $? +} diff --git a/net-firewall/fwknop/files/fwknopd.init-r1 b/net-firewall/fwknop/files/fwknopd.init-r1 deleted file mode 100644 index 9e8ecdc36d97..000000000000 --- a/net-firewall/fwknop/files/fwknopd.init-r1 +++ /dev/null @@ -1,92 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -extra_commands="checkconfig" -extra_started_commands="reload" - -: ${FWKNOPD_BINARY:=/usr/sbin/fwknopd} -: ${FWKNOPD_CONFDIR:=/etc/fwknop} -: ${FWKNOPD_CONFIG:=${FWKNOPD_CONFDIR}/fwknopd.conf} -: ${FWKNOPD_PIDFILE:=/run/fwknop/${SVCNAME}.pid} - -depend() { - after iptables ip6tables ebtables firewall - use logger - if [ "${rc_need+set}" = "set" ]; then - : # Do nothing, the user has explicitly set rc_need - elif [ -f "${FWKNOPD_CONFIG}" ]; then - local x warn_intf - for x in $(awk '/^[[:blank:]]*PCAP_INTF/{ sub(";$", ""); print $2 }' "${FWKNOPD_CONFIG}" 2>/dev/null); do - warn_intf="${warn_intf} ${x}" - done - if [ -n "${warn_intf}" ]; 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 "where FOO is the following interface(s):" - ewarn "${warn_intf}" - else - # If PCAP_INTF and PCAP_FILE are not set, then fwknopd uses eth0 - if ! grep -q '^[[:blank:]]*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 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 - fi -} - -checkconfig() { - if [ ! -e "${FWKNOPD_CONFDIR}"/fwknopd.conf ]; then - eerror "You need ${FWKNOPD_CONFDIR}/fwknopd.conf file to run fwknopd" - 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 is located at /etc/fwknop/access.conf.example" - return 1 - fi - - [ "${FWKNOPD_PIDFILE}" != "/run/fwknop/${SVCNAME}.pid" ] \ - && FWKNOPD_OPTS="${FWKNOPD_OPTS} --pid-file=${FWKNOPD_PIDFILE}" - - [ "${FWKNOPD_CONFDIR}" != "/etc/fwknop" ] \ - && FWKNOPD_OPTS="${FWKNOPD_OPTS} \ - --config=${FWKNOPD_CONFDIR}/fwknopd.conf \ - --access-file=${FWKNOPD_CONFDIR}/access.conf" - - return 0 -} - -start() { - checkconfig || return 1 - - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start \ - --exec ${FWKNOPD_BINARY} --pidfile ${FWKNOPD_PIDFILE} \ - -- ${FWKNOPD_OPTS} - eend $? -} - -stop() { - if [ "${RC_CMD}" = "restart" ]; then - checkconfig || return 1 - fi - - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --pidfile ${FWKNOPD_PIDFILE} - eend $? -} - -reload() { - checkconfig || return 1 - - ebegin "Reloading ${SVCNAME} configuration" - start-stop-daemon --signal HUP --pidfile ${FWKNOPD_PIDFILE} - eend $? -} diff --git a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild index 46dbcae86577..50e95fe2c11c 100644 --- a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild +++ b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild @@ -113,7 +113,7 @@ src_install() { prune_libtool_files --modules if use server; then - newinitd "${FILESDIR}/fwknopd.init-r1" fwknopd + newinitd "${FILESDIR}/fwknopd.init" fwknopd newconfd "${FILESDIR}/fwknopd.confd" fwknopd systemd_dounit extras/systemd/fwknopd.service systemd_newtmpfilesd extras/systemd/fwknopd.tmpfiles.conf fwknopd.conf -- cgit v1.2.3-65-gdbad