[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/, net-firewall/fwknop/files/

2015-12-20 Thread Ian Delaney
commit: 291d0b043f537949804ecf1c2adb550d944ee405
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Mon Dec 21 02:19:24 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Mon Dec 21 02:19:24 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=291d0b04

net-firewall/fwknop: drop obsolete initscript revision suffix

Package-Manager: portage-2.2.24

 net-firewall/fwknop/files/{fwknopd.init-r1 => fwknopd.init} | 0
 net-firewall/fwknop/fwknop-2.6.7-r2.ebuild  | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/fwknop/files/fwknopd.init-r1 
b/net-firewall/fwknop/files/fwknopd.init
similarity index 100%
rename from net-firewall/fwknop/files/fwknopd.init-r1
rename to net-firewall/fwknop/files/fwknopd.init

diff --git a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild 
b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
index 46dbcae..50e95fe 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



[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/, net-firewall/fwknop/files/

2015-11-24 Thread Ian Delaney
commit: e7fbae855a57b354bc05bf6efa507474c8e8bc1a
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Mon Nov 23 15:08:31 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Tue Nov 24 23:28:02 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7fbae85

net-firewall/fwknop: remove old

 net-firewall/fwknop/files/fwknopd.init  |  92 --
 net-firewall/fwknop/fwknop-2.6.7.ebuild | 135 
 2 files changed, 227 deletions(-)

diff --git a/net-firewall/fwknop/files/fwknopd.init 
b/net-firewall/fwknop/files/fwknopd.init
deleted file mode 100644
index 232e1fc..000
--- a/net-firewall/fwknop/files/fwknopd.init
+++ /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
-   else
-   local x warn_intf
-   for x in $(awk '/^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 '^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.ebuild 
b/net-firewall/fwknop/fwknop-2.6.7.ebuild
deleted file mode 100644
index bbad392..000
--- a/net-firewall/fwknop/fwknop-2.6.7.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-DISABLE_AUTOFORMATTING=1
-
-DISTUTILS_OPTIONAL=1
-# Python extension supports only Python2
-# See https://github.com/mrash/fwknop/issues/167
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools-utils distutils-r1 linux-info readme.gentoo systemd
-
-DESCRIPTION="Single Packet Authorization and Port Knocking application"
-HOMEPAGE="http://www.cipherdyne.org/fwknop/;
-SRC_URI="https://github.com/mrash/${PN}/archive/${PV}.tar.gz