Bump to 2.6.2 (bug #509672)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

3 files changed, 122 insertions, 9 deletions

diff --git a/net-firewall/fwknop/ChangeLog b/net-firewall/fwknop/ChangeLog
index 56a48c2d7301..913189d0d9ad 100644
--- a/net-firewall/fwknop/ChangeLog
+++ b/net-firewall/fwknop/ChangeLog
@@ -1,6 +1,11 @@
 # 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.1 2014/04/27 10:50:49 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwknop/ChangeLog,v 1.2 2014/05/28 16:17:58 swift Exp $
+
+*fwknop-2.6.2 (28 May 2014)
+
+  28 May 2014; Sven Vermeulen <swift@gentoo.org> +fwknop-2.6.2.ebuild:
+  Bump to 2.6.2 (bug #509672)
 
 *fwknop-2.6.1 (27 Apr 2014)
 
diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index b47dadf89d4f..abcf761c37fa 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -6,17 +6,25 @@ AUX fwknopd.confd 430 SHA256 15ae748d86eab4798a46699b765c2113385589b3ea9185f34b8
 AUX fwknopd.init 2861 SHA256 1f3218ceed22b27fcfc7af00461944e8a58431b4157c2f3a90fa34a45b6f9b70 SHA512 aa323716cbf7d2a497741d08fca6e66f7d513a48874033f36b874a6094957d14f546ff09386590fd2ec7438e4dbd577adde4276078343522516975166c2040ef WHIRLPOOL 723fa73d0dae239ebb36ffb72c96977c28fe2df0c6f904808197e3bfbe796e4be8a170caa6d7a255569cb4b29ed9c0d392438229090ea01fda5094044af7ce0d
 AUX fwknopd.tmpfiles.conf 31 SHA256 ba9eed2ec8f4230ab2070865a829e0da290761e93a0979212481c974314e77b7 SHA512 73b56a42c7728c9dabd82cd81bd6ffa1b948fe80fa67feee348ad65f957f1f2ea53c6b5d74fa2784ea75c45c2c27b5d989da4a618f3a4cf67914c927e04b74ae WHIRLPOOL 06466f7d6a70edc7a7a02b0c492e37143aab3735b7d294ea88a1371e4bf9ed70b47e871cdd293e9e879e7e40783bfaba90f6aa81580ac1a785f3e275ba21399a
 DIST fwknop-2.6.1.tar.gz 1553640 SHA256 fefe71bc82b13c396c9783e78663a1a6faf83cea01138da7c626e451249b8ce2 SHA512 dc64229d9713ae52949366906485462459dfc56674dedd844fa89494f0a4a2ff122899355f4067f1f7fa78a1275c45e048bcdb501f16b5903e4dafd0bbb55dc3 WHIRLPOOL 50a6948a94b4ab2792593f27910dcd67a6cfb62e86c97c67cd6be94e5dbf63c31fc3630c5f4877e09f89d5c0726e45883567135ea85f31695fb6d513ac216454
+DIST fwknop-2.6.2.tar.gz 1543093 SHA256 92311a25dae68122806d37929790c2408098f3c43731bd5ab23095b364530af8 SHA512 4a1b5ca66a68ad577c5cca58c89dd2b89a4b7d8e35f5f85cbbd3080c53dbe61e1e15d462ed8436c90c7a1177e2a0c453917474ad2ecfd8823936e39157790420 WHIRLPOOL 5544f1fe52b857d13404680dfedf3f1b25447f3b27130c7a60b35f17e19c6c6d73cabb12967252e9589b80a91d56402b929ddfff405f91f54d8cd51fb8bcbc99
 EBUILD fwknop-2.6.1.ebuild 2636 SHA256 8e07cfbc569d8d79265062eee19aa14c0ff4999c1f0d4d9fa9b546b4eb53624e SHA512 fbba80a1d5d5231e260b75a6c1453cefd1d59b0067a9bf92ea843744e93c00975176990f46853f734746fbc800eafe08c389dbd6375d174a018043f7c8a9ec46 WHIRLPOOL 36ad35d671f8318f2670cbd75154cd0ebb541b43e0ecd69a63d193b5fa7e67c2f3bee65ca72ddee2a199fc8b53ff481aaca9dd1d48a9affde6e53fd362d3689a
-MISC ChangeLog 651 SHA256 7d61a5ddaffa6574bb997742a2c9d965e03298c2955b4b0794bed73ad37ca53d SHA512 9cbc3655e88a9c60a6feca1130c6f0036d343e2fd76b325c5f863b0d553445b68940a3d7dab8a74c8739371919891984858524d827a322a54206a92779253351 WHIRLPOOL 4bd8a63976c1e2fc1363155ab94a8b5dc5ec515929f12293ad141d308ffb1e6665300f296203396e521c1ac0c5b688018ccfe8af4bdd22f0cfa387efa860fee0
+EBUILD fwknop-2.6.2.ebuild 2635 SHA256 2e6f0bf37f66d4d530ae59dc46103337e38206d25b564aaeac2fe9f8958651a3 SHA512 31280d177a3012653fca4b47fd397821ac3aab214da3bfdf80367ddd3df4937d4de2ab01219a3ccef1b834513356e90bad7ec4a5c5fe996180adc654e3b32e4e WHIRLPOOL 197cd64270550b70ddde1609307bb5b16df38c72de18e1efeb541396962d51939298f2b27c4a77919270ac25103cedaac06e6a5ea49e4d1d3d8ddd6a805bad21
+MISC ChangeLog 781 SHA256 bdec9f898cc2fb498729ce7083e6ac317b53e78fdda712442b4238788b1971ba SHA512 40f8758422e0ce08243ee8a3a30ae98baa3b8b39ae12f3b35cb533cc0df1116e6e17bb3fd6d5e0e48398e99aa56e78e3b38263b0f5a66abe44341ec42b629e54 WHIRLPOOL 5e03b0e2d393b9bf040c6f0d25791bbd5071cfac7c7e13591d5850104605b1318bb6a8d9bf89414a20fc4785998770fb716224dd98559223459e5daa2546943f
 MISC metadata.xml 574 SHA256 d6eb4d9a0ca69fb6c0bbeb52231a5f6d972037f271501e02e8332672c34ee4e8 SHA512 9495f48b3398c436c8a99a96782527c815175b3cd3f4f65ff72aeaf26f67b5d967ff377f9334e0db953845376b23cc315004d7870c845da92de5e9259298d415 WHIRLPOOL 5aacec6338562bbe4106e950f8dc9c83f0e7e015e254c84230f6486affefd79ffd42df5ba331d712b2c005a8050796ab3e0c521bfea7f67b7bcf851c2ce7dfb4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTXODKAAoJEJWyH81tNOV9PNEH/Rk689qwOvpzQ2Mmlu4PwFZ8
-P0GF8xAFM7aHJoV+TEHJ3olR+e+9mPNTsNkUzZlmMwa36lWadT4QT7u+jNve0DTy
-2bvWHWQbxhJq7Yz4u7uuHDR4s44A295CtOmkpqw961Oj+qqCwAfmJDOnXuij0nrS
-T/x6xMa1blNxcijT059HRb/3ENdn0eBoGtEKKTIOU873KtEtAlU1f4nj5isqpEv1
-Gq+yRG3yYsiezLRRQ2OPR9KFiILF2nw9aKi0NWFF/2vQpn6hOCJStgadwiWpZmbu
-hMC13XX0mbCxtuGWKJxtwRRNKaq08PbZ/I8oZyIgOusBqP2jkoRgMwZ2MKMXdeY=
-=vBMn
+iQIcBAEBCAAGBQJThgwkAAoJEC7dUkA7aK9HkR8QAI8Jk1YXlFILrM352wmrZmSo
+q51TWirY6bFF5vj8zd0LIYQJOF8pmbHDReXqL89DMXsvOZOEtBOvIkmpdcVnRA1F
+U0t+lCJISgqsJJ5QI/o9GPNOlyfZTEYlTDBk+N5/0dYFI0opMlp+uMr7y4ASJOtL
+vvf5bMrnXa+WkIxLD27KcN58qCjummghfbtTe7czwu5DtVDkGrelK2LD262oiAu1
+0t9B42SUMFoI/XpOQdstuGe6H/cTyIHGgCMRoxfBJHvh2PuxZbwSoS+0mDq6V4BL
+yIUnouRYpaGCVvRuxklj6hDpyYR1ISWy94+EMqL/LnV5jYf+yIWhz8h9DiDMLz73
+ly9ZCcWHxxRAfHFdN+MHbh3o7tN996AeYzOssh2+aQhJaEi5mWkjggbWbd4pVV7B
+N4jGHTbH8ERZ6SLzHC7DvvOu735/L04HNhNkDZe2m2zeivH2IePtkEjKlMLWXhZt
+kB46u/1bpD8162BNyG2Qynd+jYqy5yYaDICCNOS0CakGEX045lRFARcN2vezf0n6
+J0b319fqG+XHb5Xax1N4GAQ/OI7Eb1u4IgEC51vEzo3IMQprCnQvuuFN71BeyGNX
+o7Pz+5kngd/a0Kf6hHqj9tCNUmFaPbiumyTtsBl4s6ikrV75HWZtNHug8Ct/VU7G
+PIISdQbMzHQOEYNrHA8l
+=WGex
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/fwknop/fwknop-2.6.2.ebuild b/net-firewall/fwknop/fwknop-2.6.2.ebuild
new file mode 100644
index 000000000000..e22e71a6fa6e
--- /dev/null
+++ b/net-firewall/fwknop/fwknop-2.6.2.ebuild
@@ -0,0 +1,100 @@
+# 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
+}