summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Delaney <idella4@gentoo.org>2015-07-29 11:42:17 +0000
committerIan Delaney <idella4@gentoo.org>2015-07-29 11:42:17 +0000
commit418576673cfe5441fbba976d12b4aebdfb68d7d0 (patch)
treef522ab1aca0b893d0b44d700ba62955bbcc216c3 /net-firewall
parentRevert alpha keyword to ~alpha (wxGTK's dep has been package.use.stable.mask'... (diff)
downloadhistorical-418576673cfe5441fbba976d12b4aebdfb68d7d0.tar.gz
historical-418576673cfe5441fbba976d12b4aebdfb68d7d0.tar.bz2
historical-418576673cfe5441fbba976d12b4aebdfb68d7d0.zip
revbump; new script files added to equip for systemd, other script files edited from patches via bug #554690, remove defunct fwknop-2.6.6.ebuild to avoid any mixing of updated scripts
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xB8072B0D
Diffstat (limited to 'net-firewall')
-rw-r--r--net-firewall/fwknop/ChangeLog11
-rw-r--r--net-firewall/fwknop/Manifest33
-rw-r--r--net-firewall/fwknop/files/fwknopd.confd6
-rw-r--r--net-firewall/fwknop/files/fwknopd.init26
-rw-r--r--net-firewall/fwknop/files/fwknopd.service12
-rw-r--r--net-firewall/fwknop/fwknop-2.6.6-r1.ebuild (renamed from net-firewall/fwknop/fwknop-2.6.6.ebuild)3
6 files changed, 50 insertions, 41 deletions
diff --git a/net-firewall/fwknop/ChangeLog b/net-firewall/fwknop/ChangeLog
index 6dfbb17aea36..ccc93788727c 100644
--- a/net-firewall/fwknop/ChangeLog
+++ b/net-firewall/fwknop/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for net-firewall/fwknop
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwknop/ChangeLog,v 1.7 2015/05/01 09:54:59 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwknop/ChangeLog,v 1.8 2015/07/29 11:41:52 idella4 Exp $
+
+*fwknop-2.6.6-r1 (29 Jul 2015)
+
+ 29 Jul 2015; Ian Delaney <idella4@gentoo.org> +files/fwknopd.service,
+ +fwknop-2.6.6-r1.ebuild, -fwknop-2.6.6.ebuild, files/fwknopd.confd,
+ files/fwknopd.init:
+ revbump; new script files added to equip for systemd, other script files
+ edited from patches via bug #554690, remove defunct fwknop-2.6.6.ebuild to
+ avoid any mixing of updated scripts
01 May 2015; Ian Delaney <idella4@gentoo.org> files/fwknopd.confd,
files/fwknopd.init:
diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index 375913f5f601..7c0e8c008ffb 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -1,29 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
-AUX fwknopd.confd 434 SHA256 52db8e2ca8421050b5da395101a8ccd49852baf40d6be9aaa70d78022813415a SHA512 2a52201db31d03391018c419f9be9f10fbafda4e6ac3d8c81368ce6bc2bad1540e5fe71022ae3dbce7549a830ace5e6e600489899f8b48619b43680a2b0ca775 WHIRLPOOL 7bcd0c13252c1c04fea5e7e88d79ab3624c47ffd3457c67714018ca1f58306b72ab3e6f5a299ece2ebacdcc6d7b8f192fbb51e9687dbe5f553ed3014b2d41f88
-AUX fwknopd.init 2825 SHA256 bce868aef957617a5d8ccb334866bf0e7d4dee482b6969ce455305415c38d2df SHA512 9e264e5ba5cd9df75b0c9157c2e2f8be345fc43ae5bd43be330c56e99607884b9a291dca6dce89cb617d607ae86d6465491dd3ff286320716896cad897fb6114 WHIRLPOOL 577baa8ca3519e075ebff3a9632788b5d9a23970f2b711cefca9e03ce5ea8fd8182500cd1652f3283c6c766b71db805a36887756befa0ac87d3380164c5c5f41
+AUX fwknopd.confd 475 SHA256 818366d8012cf50771ab427bcf645de697e7d05e4bb80d5eb2f98291e071d510 SHA512 a23e42ca59f2d86b0ff1456773419d9b075bdae83fcd307d506dd9e282b58d24c6f6c50ea3418d5cce07a447f32f0089f747516e8f108b7e3c03944ea59a6412 WHIRLPOOL 79a7efe36d88bd4d313a342aa75bcb2a02acbb954c46947c5b9470277cabdd5c1cc66ccae5eb0b4e6a8002b5b0fde7ee4c069d160e2e19f2de8d48b3875a9382
+AUX fwknopd.init 2762 SHA256 748de6770137c152ec3dbef7f3b4149bc6f77d31ae1ca3e95f5e9c17a362e471 SHA512 b178d74529478de5d5d35cc1a3b6a29fa06a4fe7893b3fb5dac70d3185cfa7c8455d4623a49a227403fd68e2e4f4ac381ab6377ca79118dc040507cc8af099d2 WHIRLPOOL 5b5caa563d4c98cdd862e1bba79648db38641f8708cb05774fb314357279504dd664a4a4e4aaf11f9651b59de55419b38f60b404a90a62a475e1d7124475288d
+AUX fwknopd.service 235 SHA256 c88fbe0588731a5dea7d358680d5625876d36b6732ac51d8812390affc8d79b9 SHA512 890bbba586183275cbd3b420a9c0d609ff3eca0fd239b4af97e2730e2790f317fc114f51d60107ba4fbddd2cabb60c70d8b615e2a75bb80cf27d352c894a1c6d WHIRLPOOL 1389d12053c0a0904e661065095ee6d3102ae2fe2934814aabce7e282b7fc512e80c01a53cc9d74c78c861f95b738c47148dc1446e3f3271187c04da42ee3a3a
AUX fwknopd.tmpfiles.conf 31 SHA256 ba9eed2ec8f4230ab2070865a829e0da290761e93a0979212481c974314e77b7 SHA512 73b56a42c7728c9dabd82cd81bd6ffa1b948fe80fa67feee348ad65f957f1f2ea53c6b5d74fa2784ea75c45c2c27b5d989da4a618f3a4cf67914c927e04b74ae WHIRLPOOL 06466f7d6a70edc7a7a02b0c492e37143aab3735b7d294ea88a1371e4bf9ed70b47e871cdd293e9e879e7e40783bfaba90f6aa81580ac1a785f3e275ba21399a
DIST fwknop-2.6.6.tar.gz 2433846 SHA256 724e986b6bc47d3b6f5ba5c9232e2b411ae8ef4b2e8f7fffd16210c20d3be932 SHA512 ccd25701908a1bc653b59571013f0953ee40c967537b68cfaff48e1eea4fde11402712f70f07db308f7a37cfd49ef8ad11b1535d3012cf32e09cc677673c067f WHIRLPOOL df8025e8a2551e0485473715bc10fef31b373f38293b8f8f678aa7ec03f9fbe353a089cfbdbb783e5972b917313f4a90edfac4557e53bd962df6d8ba0e9fca2e
-EBUILD fwknop-2.6.6.ebuild 2344 SHA256 e892cd7e143c21945e73479f8c2bfc7da78e0bd06f487dc67ec6d07812f0d214 SHA512 54ef8af3bed0d463c9ca9eb452229eba851d79a76724979d6bed64dbfac3dbc14acde329543220160bc7ea22106a3a30ca7be68c5eceb965a304063c94a03d4e WHIRLPOOL a2745f43f874e45230aa0baa1a5e43da7c3f7b5223fc484ec6c399e8cc78d6222776fd6791387628d8699e90c4880099960e7e6e14ec96d3a78c2177fb305828
-MISC ChangeLog 1577 SHA256 ced83879a08acb09c22ab84bd4cba4d4a142f337a2ddeaa43d88a30ce19332df SHA512 482279dd52acaea3481eddac2d86d1ea64a597c5d1cf6d8b473531075772a926772c81630769225c96bd902eaf8c69faef8cf8e17adebafd3202695982c435e1 WHIRLPOOL 7a83bfc951fd21d4ef5919ca81d2dab0e2bd34ac41cee67181cdab39146617a46f5d8d49a55ce3780568e893de583e6a65fa7682e9d0c2d19e186e03e298f965
+EBUILD fwknop-2.6.6-r1.ebuild 2394 SHA256 b7265ac7591cfd980b9ed4ed9274c73d065183a7c350bded6032a6a1f2d2ec12 SHA512 8f9bf7a93368140ada094c7d1dfc2bcbe50e382038f57af6025c3b3512f4380ccb825ba937cbe2f5ef4fd9b3dd35f083f2251a76a18dcc81b5e70686ced9b393 WHIRLPOOL 4f4b0e78a395db7d553c0b1f0ff30089046560ba6618305a8cbee1a4c75d6a34928e4ed880269fc980e55006dbde8176e141e2bcf98543a9bb85c226deb5b876
+MISC ChangeLog 1964 SHA256 9ae9b87ddd19f9aa29b820260929906c94dca2b6b05dab5a88b4f33c29e1fe89 SHA512 f8e8d28aa3c3bf6e8cb9dd9706188e0b54e254ccc66144bfd3e43268410bf2fe1540a5a0ba9a0afd7804e7c43adc7077002d805bbac269a3d6f1132168d3313b WHIRLPOOL a41b48ea32db7becb4bd5af50baea40a69d51fe3594bab79197653e01c0465868b1342c8456d6179cd09ba7de6ff62592983c256724f05c923530afbc447d9fc
MISC metadata.xml 724 SHA256 f02c1043c6f967ceeff7f844373d974a557a372df3bc8d845ed7f919f309f3df SHA512 1aecd2aeb2186c83bef1571cea3d6211ca7b3caf01096cdd45db060ced881f0a5a19f0b870e8f68624760615680c449813c418c0d7e422e3ea2b34b7c3d6974b WHIRLPOOL d1e71e95b9b77a3fef9d308143cd5b5067e0742d9197a734d5dc605e782f1eff2fdaf764ea327c97d02c9b4178c5ea50c3b5601f1279bc8cb2d73a2794eee5ae
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
-iQJ8BAEBCgBmBQJVfwrIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiNQQQAKWJst3FJW3uDAlVlfLNeAbd
-5Quev+RiAlf8Y6l3YFcRdT26LQ+sBGge1OhHph9qudqP52BRjPrsQjk1hkbOE2GI
-PeSMe6mGIqWgv1xuOyQ4SLgsgfdUZUpW1bDaTSGIRwXrB5f4wS6jeARcXDLpDNBg
-bv80TsQ1VqwZ4dYy/z9JQOKK/chuwWtYYa1Wemdfu+xR6NQcNJ0gv4JeRBXb65e5
-R8mSGGzt+HyAp/BeFLHeCgh/x/JHag5rqdcPyx4Kb/DC8RFs/B1EgEWWbE9+Zyn2
-v1PI5qNsDb+lIsrhHlbKcsrTbmzraP0HhfiCNiXXVBLH7EXw2QC8gT5+Rfw2oX5y
-TULH/h+lHEgRFFBtwXvTISdAUEoRCpzs/tKbKGNbUtSvjHFB8qJ3Q3qcU/QY/Tr7
-zgqKuA1dmaD5uazMRbMtKcFkUUpLkhFHF1amnOtWqGNosPL1/aBqprw98v/aiQo0
-V8TLnQaJI0iX6IjzBRXS3fLjyqT7ph4kSwt0dxrTDjj/3zRiXFOlV7dUWXFnf3ir
-709mMafCP9doa1oJP84aRdX1ZcN2kc6AgOPbExQtyfmalF9/YrpZcq+eKNpi7l6c
-NCiR+Yq8ecO+ctOmrSRKGEspUOL0U096uS70IxgNzxIOqtSekAAXJcXg/oYc85WO
-itz38F6LUMvYgQEGJWD1
-=hcZf
+iKYEAREIAGYFAlW4vAJfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
+OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw2iQACg3TUNAEe5JNlmoKWtvyI3bBiu
+DikAn3gd2e5aPKhlLNU38b34IyBz9f2T
+=161z
-----END PGP SIGNATURE-----
diff --git a/net-firewall/fwknop/files/fwknopd.confd b/net-firewall/fwknop/files/fwknopd.confd
index 35dd9dabb38e..63bcd01dd82f 100644
--- a/net-firewall/fwknop/files/fwknopd.confd
+++ b/net-firewall/fwknop/files/fwknopd.confd
@@ -1,14 +1,14 @@
# /etc/conf.d/fwknopd: config file for /etc/init.d/fwknopd
-# Path to the fwknopd config files
+# Path to the fwknopd config directory (needs to be an absolute path).
FWKNOPD_CONFDIR="/etc/fwknop"
-# Options to pass to fwknopd daemon.
+# Additional options to pass to fwknopd.
# Refer to the fwknopd(8) manpage for more information.
-FWKNOPD_OPTS=""
+#FWKNOPD_OPTS=""
# Pid file to use (needs to be an absolute path).
diff --git a/net-firewall/fwknop/files/fwknopd.init b/net-firewall/fwknop/files/fwknopd.init
index 76e834c71712..68db3feda6aa 100644
--- a/net-firewall/fwknop/files/fwknopd.init
+++ b/net-firewall/fwknop/files/fwknopd.init
@@ -1,28 +1,27 @@
#!/sbin/runscript
# 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.4 2015/05/01 09:55:00 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwknop/files/fwknopd.init,v 1.5 2015/07/29 11:41:52 idella4 Exp $
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}
-: ${FWKNOPD_BINARY:=/usr/sbin/fwknopd}
depend() {
- need iptables
+ after iptables ip6tables ebtables firewall
use logger
if [ "${rc_need+set}" = "set" ]; then
: # Do nothing, the user has explicitly set rc_need
else
- warn_intf=''
+ local x warn_intf
for x in $(awk '/^PCAP_INTF/{ sub(";$", ""); print $2 }' "${FWKNOPD_CONFIG}" 2>/dev/null); do
- warn_intf="${warn_intf} $x"
+ warn_intf="${warn_intf} ${x}"
done
- unset x
- if [ "${warn_intf:+set}" = "set" ]; then
+ 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},"
@@ -30,14 +29,13 @@ depend() {
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 ! 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
- unset warn_intf
fi
}
@@ -70,7 +68,7 @@ start() {
ebegin "Starting ${SVCNAME}"
start-stop-daemon --start \
- --exec "${FWKNOPD_BINARY}" --pidfile="${FWKNOPD_PIDFILE}" \
+ --exec ${FWKNOPD_BINARY} --pidfile ${FWKNOPD_PIDFILE} \
-- ${FWKNOPD_OPTS}
eend $?
}
@@ -81,16 +79,14 @@ stop() {
fi
ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop \
- --exec "${FWKNOPD_BINARY}" --pidfile "${FWKNOPD_PIDFILE}"
+ start-stop-daemon --stop --pidfile ${FWKNOPD_PIDFILE}
eend $?
}
reload() {
checkconfig || return 1
- ebegin "Reloading ${SVCNAME}"
- start-stop-daemon --signal HUP \
- --exec "${FWKNOPD_BINARY}" --pidfile "${FWKNOPD_PIDFILE}"
+ ebegin "Reloading ${SVCNAME} configuration"
+ start-stop-daemon --signal HUP --pidfile ${FWKNOPD_PIDFILE}
eend $?
}
diff --git a/net-firewall/fwknop/files/fwknopd.service b/net-firewall/fwknop/files/fwknopd.service
new file mode 100644
index 000000000000..d2e8c3125200
--- /dev/null
+++ b/net-firewall/fwknop/files/fwknopd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Firewall Knock Operator Daemon
+After=network-online.target
+
+[Service]
+Type=forking
+PIDFile=/run/fwknop/fwknopd.pid
+ExecStart=/usr/sbin/fwknopd
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-firewall/fwknop/fwknop-2.6.6.ebuild b/net-firewall/fwknop/fwknop-2.6.6-r1.ebuild
index 100d0f892c90..195f457cc979 100644
--- a/net-firewall/fwknop/fwknop-2.6.6.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwknop/fwknop-2.6.6.ebuild,v 1.2 2015/05/01 04:45:42 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwknop/fwknop-2.6.6-r1.ebuild,v 1.1 2015/07/29 11:41:52 idella4 Exp $
EAPI=5
@@ -90,6 +90,7 @@ src_install() {
if use server; then
newinitd "${FILESDIR}/fwknopd.init" fwknopd
newconfd "${FILESDIR}/fwknopd.confd" fwknopd
+ systemd_dounit "${FILESDIR}/fwknopd.service"
systemd_newtmpfilesd "${FILESDIR}/fwknopd.tmpfiles.conf" fwknopd.conf
fi