bump; ebuild supplied by Coacher in bug #519716, newinitd and newconfd files updated, removed prior version to avoid any mismatch, closes bug #519716

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

8 files changed, 150 insertions, 246 deletions

diff --git a/net-firewall/fwknop/ChangeLog b/net-firewall/fwknop/ChangeLog
index 3b0e90048281..69600891f0c2 100644
--- a/net-firewall/fwknop/ChangeLog
+++ b/net-firewall/fwknop/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/fwknop
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwknop/ChangeLog,v 1.3 2014/05/28 16:19:46 swift Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwknop/ChangeLog,v 1.4 2015/04/29 23:18:49 idella4 Exp $
+
+*fwknop-2.6.6 (29 Apr 2015)
+
+  29 Apr 2015; Ian Delaney <idella4@gentoo.org> +fwknop-2.6.6.ebuild,
+  -files/fwknop-2.6.0-remove-extra-run-from-paths.patch, -fwknop-2.6.2.ebuild,
+  files/fwknopd.confd, files/fwknopd.init, metadata.xml:
+  bump; ebuild supplied by Coacher in bug #519716, newinitd and newconfd files
+  updated, removed prior version to avoid any mismatch, closes bug #519716
 
   28 May 2014; Sven Vermeulen <swift@gentoo.org> -fwknop-2.6.1.ebuild:
   Remove 2.6.1 ebuild (double free bug). Thanks to Coacher (itumaykin@)
diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index 5169f68a75e8..d41679d71b06 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -1,28 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX fwknop-2.6.0-remove-extra-run-from-paths.patch 3882 SHA256 3af991cfc6cb649eb69a55e5918cda56e04666078017f5f9cb0f174d7310ce7f SHA512 c78d8012ac25b6dc1a567fe9da3663efc97de922075186608e09ad64c7accd57307065b1eb4a0795ff8a739d4768d39acef30083cc38e7f37b549772cca77769 WHIRLPOOL 763794926ac767ae8092384d6b38447ce2b1fb9e29f7f0ec098b18d9f0b54f424b81b51941dc2c0f1e722f0914a8f578ad457eab03f9399113a38b45147f30b1
-AUX fwknopd.confd 430 SHA256 15ae748d86eab4798a46699b765c2113385589b3ea9185f34b8ffaadabe55fc3 SHA512 dc35ca1f7e4f4d9ce45742ab5d6ce40d554cdf1629ba9be5499ef89ae8ce4a84ba810ab33a85cba0b56394ee15f5b43c244a0dbbd7554aa8cf883170309647db WHIRLPOOL 55dcf5a34b00f69b14aadc90dc2198de66c898f3d5b68f44812a332cee15d9f5fab429e899ff418158f7602f2ad42f675bb3f47f90416876abdb7471fc234b97
-AUX fwknopd.init 2861 SHA256 1f3218ceed22b27fcfc7af00461944e8a58431b4157c2f3a90fa34a45b6f9b70 SHA512 aa323716cbf7d2a497741d08fca6e66f7d513a48874033f36b874a6094957d14f546ff09386590fd2ec7438e4dbd577adde4276078343522516975166c2040ef WHIRLPOOL 723fa73d0dae239ebb36ffb72c96977c28fe2df0c6f904808197e3bfbe796e4be8a170caa6d7a255569cb4b29ed9c0d392438229090ea01fda5094044af7ce0d
+AUX fwknopd.confd 436 SHA256 0213f791077d66f36cc333d372fa9f2297a308d52b295fd2fcb2adc6165b4061 SHA512 7f15640194387ff4531569c98bc451b06f86ad24b8cb4f6b4f14cc5bd9411893549f39d4581da1113b1ec6b9cb09fac01968ef846a0ce18dd1b354bf7d105b58 WHIRLPOOL c82aefa4dc413cbbd624710f5697c54066943c9f5a88e4004ce7d35c5e5759beba95ff0686a8d106ca62a2c57bcb71d0e398b52fc749bfa00c3598846a626e16
+AUX fwknopd.init 2830 SHA256 229f8bbb2e9dca2bb698eb63536cf7cb5347aba5ed5cd4a86220fff603c695f1 SHA512 cb7f7f0627ca12ad58d3bba945eb6ee11ba59e28ac80f689ed4c0de5c9bd4952fcd57c6968d7bf5e52ee22bf1c0d27b74bc615ba33e353126e0102431206183b WHIRLPOOL 4cebdeba4c9821ee641463e491d169913f5c9eab33a3023361600d5d21fa4b0165f381d18f86eb448c2ab5ddcb2ebd49d54e287ec83fdb8fdb54e9f729aaa05b
 AUX fwknopd.tmpfiles.conf 31 SHA256 ba9eed2ec8f4230ab2070865a829e0da290761e93a0979212481c974314e77b7 SHA512 73b56a42c7728c9dabd82cd81bd6ffa1b948fe80fa67feee348ad65f957f1f2ea53c6b5d74fa2784ea75c45c2c27b5d989da4a618f3a4cf67914c927e04b74ae WHIRLPOOL 06466f7d6a70edc7a7a02b0c492e37143aab3735b7d294ea88a1371e4bf9ed70b47e871cdd293e9e879e7e40783bfaba90f6aa81580ac1a785f3e275ba21399a
-DIST fwknop-2.6.2.tar.gz 1543093 SHA256 92311a25dae68122806d37929790c2408098f3c43731bd5ab23095b364530af8 SHA512 4a1b5ca66a68ad577c5cca58c89dd2b89a4b7d8e35f5f85cbbd3080c53dbe61e1e15d462ed8436c90c7a1177e2a0c453917474ad2ecfd8823936e39157790420 WHIRLPOOL 5544f1fe52b857d13404680dfedf3f1b25447f3b27130c7a60b35f17e19c6c6d73cabb12967252e9589b80a91d56402b929ddfff405f91f54d8cd51fb8bcbc99
-EBUILD fwknop-2.6.2.ebuild 2635 SHA256 2e6f0bf37f66d4d530ae59dc46103337e38206d25b564aaeac2fe9f8958651a3 SHA512 31280d177a3012653fca4b47fd397821ac3aab214da3bfdf80367ddd3df4937d4de2ab01219a3ccef1b834513356e90bad7ec4a5c5fe996180adc654e3b32e4e WHIRLPOOL 197cd64270550b70ddde1609307bb5b16df38c72de18e1efeb541396962d51939298f2b27c4a77919270ac25103cedaac06e6a5ea49e4d1d3d8ddd6a805bad21
-MISC ChangeLog 925 SHA256 904047a1fd2637d60f855978c117f7463e6be4257949d58a334e933ec6f08f50 SHA512 782667c34a6999b6c65c70fb509dfed6c5135a0bfb26cbc02e0e209c6b2b8389310db4cde2fd8fdd34a52baddda497e384fc479957c7c94c1106db0065d86736 WHIRLPOOL fec6e33c2d9b4bf25488af97ec112f4b616b79e0164f2346516de2e285860ea25d7ff5883a007c2484830d8a0a7816e42fbf9945cf7f8a21a2231c7003e39eb4
-MISC metadata.xml 574 SHA256 d6eb4d9a0ca69fb6c0bbeb52231a5f6d972037f271501e02e8332672c34ee4e8 SHA512 9495f48b3398c436c8a99a96782527c815175b3cd3f4f65ff72aeaf26f67b5d967ff377f9334e0db953845376b23cc315004d7870c845da92de5e9259298d415 WHIRLPOOL 5aacec6338562bbe4106e950f8dc9c83f0e7e015e254c84230f6486affefd79ffd42df5ba331d712b2c005a8050796ab3e0c521bfea7f67b7bcf851c2ce7dfb4
+DIST fwknop-2.6.6.tar.gz 2433846 SHA256 724e986b6bc47d3b6f5ba5c9232e2b411ae8ef4b2e8f7fffd16210c20d3be932 SHA512 ccd25701908a1bc653b59571013f0953ee40c967537b68cfaff48e1eea4fde11402712f70f07db308f7a37cfd49ef8ad11b1535d3012cf32e09cc677673c067f WHIRLPOOL df8025e8a2551e0485473715bc10fef31b373f38293b8f8f678aa7ec03f9fbe353a089cfbdbb783e5972b917313f4a90edfac4557e53bd962df6d8ba0e9fca2e
+EBUILD fwknop-2.6.6.ebuild 2273 SHA256 73fc54a837f57ab009da6c12b96aba549b38b88abb914312d8a04ea3c5af5f2e SHA512 3379b4bf3a8d5bf159b525d9f6cb7f3d0343f1a24f2705c9863d1eb76c9b434893c7c001c791e9e77f4f9b1bf742ebedec2d791316d9076d1ea48532f27784b9 WHIRLPOOL 0b0bd8ee9c55d93a4ec39c470fd9fb6f74941ec986b6249894eb349c1b6dbb571eef5943d748305d27acb5600213e6df73458f132a9204bed7bb788f47772183
+MISC ChangeLog 1317 SHA256 02ae78975b7a09037e9aabedb8cc9cbd7eac280df07aa4929febf14fe2a8b249 SHA512 0819d111f58c6ae40e393c748959bb9748f002271f3227dbe79a44772487001f0056acce6564199000cff8b58fddce0be6828d3e88622183b2c4dcde7760fbc6 WHIRLPOOL 5298027d2a5c4293171b5603a73cde9834262202c2d93c03efba64d7ca724f353397fc3b461d95f8db453095167435035eacd917b7bfbae957d34bd88052f140
+MISC metadata.xml 647 SHA256 2caae38bd6cc6a99d740dab2ad1323ecfc6246e76acbf9d36dd5dc37766f70c7 SHA512 639a086617a20fd54690d2a047e99bc445986b773a791926c16d069d3ba8be4081ed24e4c3a5ea9dd0a7cb3cd0e215c6790817df7bfcdfc0db6112472612eade WHIRLPOOL a91f0045cb355289aca56e1938935da029b61491d59fa3314a13fcf224c7412a2756d55759eaa302d0d472a45e662328cbd8b58224f03859ef493e67c6441b74
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJThgyKAAoJEC7dUkA7aK9H5nsP/3Aah1aKP7JKaU5ZRPCGuDUZ
-4+htDuzCWDSCDJ9ougUioy51MRfnlONwCooZ7Mp+BBJPoy/AiMcSRuXDzvZGOI8H
-BN+qrb8ghY44EOlDWupYbjm0huodyA5HvCNlOEEA4O9oXoBq/jHaji9kFUQQ/0tp
-xhR4dwA2rE9q/hWHyVHBbUQGNT9/u1ED2ZzftpsXcukcLBg/83oidauKVKTOKZ7Q
-D31go776DIlGjiTVG25QK+MSbkDINZ7UHYH7lKBgNK3bnbgaXWkxALfuyW/nxPaf
-UQDU2E8Me2315Ptl2QDYl7HT5MTXHA1Rmf1UwgV7uh2c0CkPk+dcv/p/cYJetrQN
-FskSOBYgt+7uoJO8VSMnwbINsjyrFTlIwnJuAJuY129h1zF7QNXmyzB5uotQCktR
-QDZfFjr90BplZa9DT+CeSKPiaiKkOWe8WSyIkbAqOtZlX/PaJOmMwPk/knjJXvGt
-BY5fm69yk5F4WjJxZtnbGTp9O5geGke+vByJ87P3Ggxd6k/PGC7RJ1rCp/Jpuq+h
-MlOjCd1/Ef87opLw5yipOZaCdXqZbPsnIAmkk3lIkI6haOYNNN1hYjyWM3yHidFe
-O971mEHVm896NsqZrodXKRvv3zBxC1NC+lifrKV/PFldDGE+SMTaBMDkT3aT0Waa
-5XXcfNAt/FoxXEisWa5o
-=iwkY
+iEYEAREIAAYFAlVBZuUACgkQso7CE7gHKw3lUgCgj0dZr5C8wsbQwCRyWaLDRB6x
+ykcAoKlwx51S8D13yAAzZkmnpehdCQbL
+=4OjV
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/fwknop/files/fwknop-2.6.0-remove-extra-run-from-paths.patch b/net-firewall/fwknop/files/fwknop-2.6.0-remove-extra-run-from-paths.patch
deleted file mode 100644
index b2f36ff02d81..000000000000
--- a/net-firewall/fwknop/files/fwknop-2.6.0-remove-extra-run-from-paths.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/doc/fwknopd.man.asciidoc b/doc/fwknopd.man.asciidoc
-index 082b6fb..cad4d2b 100644
---- a/doc/fwknopd.man.asciidoc
-+++ b/doc/fwknopd.man.asciidoc
-@@ -68,7 +68,7 @@ COMMAND-LINE OPTIONS
- *-d, --digest-file*='<digest-file>'::
-     Specify the location of the 'digest.cache' file.  If this option is
-     not given, 'fwknopd' will use the compile-time default location (typically
--    '@localstatedir@/run/fwknop/digest.cache').
-+    '@localstatedir@/fwknop/digest.cache').
- 
- *-D, --dump-config*::
-     Dump the configuration values that *fwknopd* derives from the
-@@ -98,7 +98,7 @@ COMMAND-LINE OPTIONS
- *-p, --pid-file*='<pid-file>'::
-     Specify the location of the 'fwknopd.pid' file.  If this option is
-     not given, 'fwknopd' will use the compile-time default location (typically
--    '@localstatedir@/run/fwknop/fwknopd.pid).
-+    '@localstatedir@/fwknop/fwknopd.pid).
- 
- *-P, --pcap-filter*='<filter>'::
-     Specify a Berkeley packet filter statement on the *fwknopd* command
-@@ -132,7 +132,7 @@ COMMAND-LINE OPTIONS
- *--rotate-digest-cache*::
-     Rotate the digest cache file by renaming it to ``<name>-old'', and
-     starting a new one.  The digest cache file is typically found in
--    '@localstatedir@/run/fwknop/digest.cache'.
-+    '@localstatedir@/fwknop/digest.cache'.
- 
- *-S, --status*::
-     Display the status of any *fwknopd* processes that may or not be
-diff --git a/extras/apparmor/usr.sbin.fwknopd b/extras/apparmor/usr.sbin.fwknopd
-index e967a56..cacf767 100644
---- a/extras/apparmor/usr.sbin.fwknopd
-+++ b/extras/apparmor/usr.sbin.fwknopd
-@@ -1,6 +1,4 @@
- # Last Modified: Sun Aug 18 22:54:57 2013
--# Assumes fwknopd was built with:
--#    './configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var'
- #include <tunables/global>
- 
- /usr/sbin/fwknopd {
-diff --git a/server/fwknopd.8.in b/server/fwknopd.8.in
-index bb41b6f..6235790 100644
---- a/server/fwknopd.8.in
-+++ b/server/fwknopd.8.in
-@@ -94,7 +94,7 @@ Specify the location of the
- file\&. If this option is not given,
- \fIfwknopd\fR
- will use the compile\-time default location (typically
--\fI@localstatedir@/run/fwknop/digest\&.cache\fR)\&.
-+\fI@localstatedir@/fwknop/digest\&.cache\fR)\&.
- .RE
- .PP
- \fB\-D, \-\-dump\-config\fR
-@@ -148,7 +148,7 @@ Specify the location of the
- \fIfwknopd\&.pid\fR
- file\&. If this option is not given,
- \fIfwknopd\fR
--will use the compile\-time default location (typically \*(Aq@localstatedir@/run/fwknop/fwknopd\&.pid)\&.
-+will use the compile\-time default location (typically \*(Aq@localstatedir@/fwknop/fwknopd\&.pid)\&.
- .RE
- .PP
- \fB\-P, \-\-pcap\-filter\fR=\fI<filter>\fR
-@@ -195,7 +195,7 @@ files\&. This will also force a flush of the current \(lqFWKNOP\(rq iptables cha
- \fB\-\-rotate\-digest\-cache\fR
- .RS 4
- Rotate the digest cache file by renaming it to \(lq<name>\-old\(rq, and starting a new one\&. The digest cache file is typically found in
--\fI@localstatedir@/run/fwknop/digest\&.cache\fR\&.
-+\fI@localstatedir@/fwknop/digest\&.cache\fR\&.
- .RE
- .PP
- \fB\-S, \-\-status\fR
-diff --git a/server/fwknopd.conf.inst b/server/fwknopd.conf.inst
-index acf7a77..db653ee 100644
---- a/server/fwknopd.conf.inst
-+++ b/server/fwknopd.conf.inst
-@@ -370,7 +370,7 @@
- 
- # Directories - These can override compile-time defaults.
- #
--#FWKNOP_RUN_DIR              /var/run/fwknop;
-+#FWKNOP_RUN_DIR              /run/fwknop;
- #FWKNOP_CONF_DIR             /etc/fwknop;
- 
- # Files
-diff --git a/server/fwknopd_common.h b/server/fwknopd_common.h
-index 2e632ed..b416f91 100644
---- a/server/fwknopd_common.h
-+++ b/server/fwknopd_common.h
-@@ -70,7 +70,7 @@
-   /* Our default run directory is based on LOCALSTATEDIR as set by the
-    * configure script. This is where we put the PID and digest cache files.
-   */
--  #define DEF_RUN_DIR       SYSRUNDIR"/run/"PACKAGE_NAME
-+  #define DEF_RUN_DIR       SYSRUNDIR"/"PACKAGE_NAME
- #endif
- 
- /* More Conf defaults
diff --git a/net-firewall/fwknop/files/fwknopd.confd b/net-firewall/fwknop/files/fwknopd.confd
index 9fdd4e598eb4..077954a5962b 100644
--- a/net-firewall/fwknop/files/fwknopd.confd
+++ b/net-firewall/fwknop/files/fwknopd.confd
@@ -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_OPTS=""
 #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
diff --git a/net-firewall/fwknop/files/fwknopd.init b/net-firewall/fwknop/files/fwknopd.init
index 9dcdb90d2722..2b7874955b00 100644
--- a/net-firewall/fwknop/files/fwknopd.init
+++ b/net-firewall/fwknop/files/fwknopd.init
@@ -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 @@ depend() {
 	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 @@ start() {
 	ebegin "Starting ${SVCNAME}"
 	start-stop-daemon --start \
 		--exec "${FWKNOPD_BINARY}" --pidfile="${FWKNOPD_PIDFILE}" \
-		-- "${FWKNOPD_OPTS}"
+		-- ${FWKNOPD_OPTS}
 	eend $?
 }
 
@@ -91,3 +96,4 @@ reload() {
 		--exec "${FWKNOPD_BINARY}" --pidfile "${FWKNOPD_PIDFILE}"
 	eend $?
 }
+
diff --git a/net-firewall/fwknop/fwknop-2.6.2.ebuild b/net-firewall/fwknop/fwknop-2.6.2.ebuild
deleted file mode 100644
index e22e71a6fa6e..000000000000
--- a/net-firewall/fwknop/fwknop-2.6.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwknop/fwknop-2.6.2.ebuild,v 1.1 2014/05/28 16:17:58 swift Exp $
-
-EAPI=5
-
-# does work with python 2.7, doesn't work with python 3.3 on my machine
-# more feedback is welcome
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-inherit autotools distutils-r1 eutils systemd
-
-DESCRIPTION="Single Packet Authorization and Port Knocking application"
-HOMEPAGE="http://www.cipherdyne.org/fwknop/"
-SRC_URI="http://www.cipherdyne.org/${PN}/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="client extras gdbm gpg python server"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	gpg? (
-		dev-libs/libassuan
-		dev-libs/libgpg-error
-	)
-"
-DEPEND="${RDEPEND}
-	gdbm? ( sys-libs/gdbm )
-	gpg? ( app-crypt/gpgme )
-	server? (
-		net-libs/libpcap
-		net-firewall/iptables
-	)
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( ChangeLog README )
-
-src_prepare() {
-	# Remove extra run/ subdir from localstatedir paths
-	#
-	# fwknopd's default location for digest-cache and pidfile is
-	# localstatedir/run/fwknop (see server/fwknopd_common.h).
-	# Such files (cache, pidfile) should be placed in /run/fwknop instead.
-	# fwknopd's default apparmor policy also assumes that these files are in
-	# /run/fwknop, i.e. localstatedir is /var and /var/run is a symlink to /run.
-	# Relying on /var/run -> /run symlink is not the best practice.
-	# This is why simply binding localstatedir to /var is not enough.
-	# Instead we strip hardcoded run/ subdir from localstatedir paths
-	# ans set localstatedir to /run below.
-	epatch "${FILESDIR}/fwknop-2.6.0-remove-extra-run-from-paths.patch"
-
-	# Install example configs with .example suffix
-	if use server; then
-		sed -i 's/conf;/conf.example;/g' "${S}"/Makefile.am || die
-	fi
-	eautoreconf
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/run \
-		--enable-digest-cache \
-		$(use_enable client) \
-		$(use_enable !gdbm file-cache) \
-		$(use_enable server) \
-		$(use_with gpg gpgme)
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		cd "${S}"/python || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-
-	if use server; then
-		newinitd "${FILESDIR}/fwknopd.init" fwknopd
-		newconfd "${FILESDIR}/fwknopd.confd" fwknopd
-		systemd_newtmpfilesd "${FILESDIR}/fwknopd.tmpfiles.conf" fwknopd.conf
-	fi
-
-	use extras && dodoc "${S}/extras/apparmor/usr.sbin.fwknopd"
-
-	if use python; then
-		# Unset DOCS since distutils-r1.eclass interferes
-		DOCS=()
-		cd "${S}"/python || die
-		distutils-r1_src_install
-	fi
-}
diff --git a/net-firewall/fwknop/fwknop-2.6.6.ebuild b/net-firewall/fwknop/fwknop-2.6.6.ebuild
new file mode 100644
index 000000000000..277614bb3005
--- /dev/null
+++ b/net-firewall/fwknop/fwknop-2.6.6.ebuild
@@ -0,0 +1,98 @@
+# 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.1 2015/04/29 23:18:49 idella4 Exp $
+
+EAPI=5
+
+# Does work with python 2.7, does not work with python 3.3 on my machine
+# More feedback is welcome
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools-utils distutils-r1 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 -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="client extras gdbm gpg python server udp-server"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	client? ( net-misc/wget[ssl] )
+	gpg? (
+		dev-libs/libassuan
+		dev-libs/libgpg-error
+	)"
+
+DEPEND="${RDEPEND}
+	gdbm? ( sys-libs/gdbm )
+	gpg? ( app-crypt/gpgme )
+	server? (
+		!udp-server? ( net-libs/libpcap )
+		net-firewall/iptables
+	)"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	udp-server? ( server )"
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+	# Install example configs with .example suffix
+	if use server; then
+		sed -i 's/conf;/conf.example;/g' "${S}"/Makefile.am || die
+	fi
+
+	autotools-utils_src_prepare
+
+	if use python; then
+		cd "${S}"/python || die
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/run
+		--enable-digest-cache
+		$(use_enable client)
+		$(use_enable !gdbm file-cache)
+		$(use_enable server)
+		$(use_enable udp-server)
+		$(use_with gpg gpgme)
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	if use python; then
+		cd "${S}"/python || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+	prune_libtool_files --modules
+
+	if use server; then
+		newinitd "${FILESDIR}/fwknopd.init" fwknopd
+		newconfd "${FILESDIR}/fwknopd.confd" fwknopd
+		systemd_newtmpfilesd "${FILESDIR}/fwknopd.tmpfiles.conf" fwknopd.conf
+	fi
+
+	use extras && dodoc "${S}/extras/apparmor/usr.sbin.fwknopd"
+
+	if use python; then
+		# Unset DOCS since distutils-r1.eclass interferes
+		local DOCS=()
+		cd "${S}"/python || die
+		distutils-r1_src_install
+	fi
+}
diff --git a/net-firewall/fwknop/metadata.xml b/net-firewall/fwknop/metadata.xml
index 44450e1f19a4..b1eafd609fc3 100644
--- a/net-firewall/fwknop/metadata.xml
+++ b/net-firewall/fwknop/metadata.xml
@@ -12,5 +12,6 @@
 		<flag name="gpg">Enable GPG support via <pkg>app-crypt/gpgme</pkg></flag>
 		<flag name="server">Build fwknopd server</flag>
 		<flag name="extras">Install example apparmor policy</flag>
+		<flag name="udp-server">Build fwknopd with UDP server mode only</flag>
 	</use>
 </pkgmetadata>