Revbump to fix buildsystem problems and adept to openrc (thanks Diego Elio Pettenò for the updates, bug 403925)

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

5 files changed, 108 insertions, 7 deletions

diff --git a/net-misc/knock/ChangeLog b/net-misc/knock/ChangeLog
index f853a9eefb7f..f65ce317f198 100644
--- a/net-misc/knock/ChangeLog
+++ b/net-misc/knock/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/knock
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/ChangeLog,v 1.41 2011/12/21 08:39:56 phajdan.jr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/ChangeLog,v 1.42 2012/02/15 18:21:36 xmw Exp $
+
+*knock-0.5-r2 (15 Feb 2012)
+
+  15 Feb 2012; Michael Weber <xmw@gentoo.org> +knock-0.5-r2.ebuild,
+  +files/knockd.confd.2, +files/knockd.initd.2:
+  Revbump to fix buildsystem problems and adept to openrc (thanks Diego Elio
+  Pettenò for the updates, bug 403925)
 
   21 Dec 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> knock-0.5-r1.ebuild:
   x86 stable wrt bug #393985
diff --git a/net-misc/knock/Manifest b/net-misc/knock/Manifest
index c5354a889aaf..9d9652e853cc 100644
--- a/net-misc/knock/Manifest
+++ b/net-misc/knock/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX knock-0.5-gcc-4.3.patch 248 RMD160 197f27ccb79d40e94311e26912515ae9451dae46 SHA1 f3b8756a6dcb1a148856a54f4df9ab765ca9646c SHA256 e4e9db616068adcafcb9bfe3ef674fa3ea823bba3caa6fe133f728493b7970f3
 AUX knockd.confd 264 RMD160 7b938d3e2a36d76694d8fcc313fbd15620065f57 SHA1 8a3cf4003e9efd05bdd955bd417abb21e79a73a3 SHA256 2af786ff26705fb91f87296cb600c4e058031a5d6d550d4ac54e832cc937f88b
+AUX knockd.confd.2 296 RMD160 1402133d45e380c9aea3073a65b3c274b7174b19 SHA1 38b95554cbec8cd3da37fbd65ac0451e6750a015 SHA256 694a4d49f68238778f56a6f8ed84bf00d448458034b6b8662b35e9d9c7125532
 AUX knockd.initd 492 RMD160 3a46092965b673c0b7de09706bdeddecdb2fa675 SHA1 41bb302c41abe3640ddf0992f7643c69fa7768dc SHA256 8e11f2bc31260227c869c402dbd2abe7bfcc6f237499441f4b798fb6040389ad
+AUX knockd.initd.2 633 RMD160 53a106f4e2fd78d286cae2e5d111abcb1e45f1ea SHA1 fc21378be41fb96b7cce70c26b362831d9ec0667 SHA256 e66bc74ff29ce7db236e2a302d3f8b1b12f304277ff581f38762d670ebd7be89
 DIST knock-0.5.tar.gz 83990 RMD160 089ea289a51478a89945c46469b378c3b33fff6d SHA1 26f3b2f2d698bc6978390ef6e93c628361605059 SHA256 c4c141166a10c45b139e5e656d0c98bbb99567abb35163863fc1df1a025cde15
 EBUILD knock-0.5-r1.ebuild 1243 RMD160 7de20c1b9688bf76adf54bcdaa187f6247cf4b82 SHA1 f75795d908e6945d2d524ab37b51839727fe3f0d SHA256 0751d2ae939eaf279e89bf680c34d5e7f0a23d88c153ee4994e8abb55ae58072
+EBUILD knock-0.5-r2.ebuild 1375 RMD160 c946be19c35ac9c9133597ff141fb544a385ca60 SHA1 114079fbd18a355be3b473d1cad9b4505474e27c SHA256 d66ee0e9caac5d5f1206a588596dccb71a074595b554ad03819fedd834e645a5
 EBUILD knock-0.5.ebuild 947 RMD160 a42629af92d462e31273582843c516d7869f8ac0 SHA1 47d4ad9f1ae3c3a9cb72769bc35a8eeab8336707 SHA256 e02dbbde5d8e878006035228e7d6ec53ff61ff218e11eac206add7ca3abe3b78
-MISC ChangeLog 4456 RMD160 8dc8f41159a10a2d1a43027f162877d7a3a94ff9 SHA1 8c37a5de0d6d6db7f46bb860f28ffd55d768af07 SHA256 d630d5c3d232583bcf3c67b85bb3d10cdc032e30b5fb2d6e5fb174d2751b5847
+MISC ChangeLog 4712 RMD160 562f1375b613c3b74e77eb786cafa2be84c35dab SHA1 163f9db10cc1100810b82014824c757045d82aaa SHA256 f3994c5afc6c58d3481972e776946f561a3bf3e6a20fe3cbc394737b2a9b9f99
 MISC metadata.xml 315 RMD160 afb937fe81d18a4aea146155c42d4f9d5547b9be SHA1 1791be98843993a469c74c4e04713e68954be7b2 SHA256 f55312cb6377d083000e5ab0ce23bb8a1f904984a23053a62e44ea2f97092c74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk7xm2IACgkQuUQtlDBCeQKVPACfU1KvoU9mblL9anT4D7FUVH4i
-SUQAniYhQ6o1yF/pKFlAKUwwdjOgJvmH
-=VFTS
+iF4EAREIAAYFAk8797oACgkQknrdDGLu8JAkHgD8CXUoP2d8T4U9e0KR+OldS9Je
+bOi7Rd2M0JK7fh0Yg98A/08iJEdcW8SXDxOgBPgrX6aSr3jbheF3JvewdlGpcgqZ
+=DZe3
 -----END PGP SIGNATURE-----
diff --git a/net-misc/knock/files/knockd.confd.2 b/net-misc/knock/files/knockd.confd.2
new file mode 100644
index 000000000000..8aafe7551086
--- /dev/null
+++ b/net-misc/knock/files/knockd.confd.2
@@ -0,0 +1,9 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/files/knockd.confd.2,v 1.1 2012/02/15 18:21:36 xmw Exp $
+
+# interface to listen to
+IFACE="eth0"
+
+# extra options for knockd daemon
+OPTS=""
diff --git a/net-misc/knock/files/knockd.initd.2 b/net-misc/knock/files/knockd.initd.2
new file mode 100644
index 000000000000..447a2de59af7
--- /dev/null
+++ b/net-misc/knock/files/knockd.initd.2
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/files/knockd.initd.2,v 1.1 2012/02/15 18:21:36 xmw Exp $
+
+: ${CONFIGFILE:=/etc/knockd.conf}
+: ${IFACE:=eth0}
+
+get_config() {
+	[ -f ${CONFIGFILE} ] && conf=$(awk 'tolower($1) == "'$1'" { print $3 }' ${CONFIGFILE})
+
+	echo ${conf:-$2}
+}
+
+depend() {
+	need net
+	use net.${IFACE}
+
+	[ "$(get_config usesyslog no)" != "no" ] && use logger
+}
+
+pidfile=$(get_config pidfile /var/run/knockd.pid)
+
+command=/usr/sbin/knockd
+command_args="-d -i ${IFACE} ${OPTS}"
diff --git a/net-misc/knock/knock-0.5-r2.ebuild b/net-misc/knock/knock-0.5-r2.ebuild
new file mode 100644
index 000000000000..21f00e68e905
--- /dev/null
+++ b/net-misc/knock/knock-0.5-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/knock-0.5-r2.ebuild,v 1.1 2012/02/15 18:21:36 xmw Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="A simple port-knocking daemon"
+HOMEPAGE="http://www.zeroflux.org/projects/knock"
+SRC_URI="http://www.zeroflux.org/proj/knock/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="+server"
+
+DEPEND="server? ( net-libs/libpcap )"
+RDEPEND="${DEPEND}
+	server? ( sys-apps/openrc )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
+
+	sed -i -e "s:/usr/sbin/iptables:/sbin/iptables:g" knockd.conf || die
+
+	if ! use server ; then
+		sed -i -e '/^all:/s:knockd::' \
+			-e '/$(INSTALL).*knockd/d' Makefile.in || die
+	fi
+}
+
+src_compile() {
+	# package does stupid stuff with CXXFLAGS, and is actually pure C.
+	export CXXFLAGS="${CFLAGS}"
+	default_src_compile
+}
+
+DOCS=( ChangeLog README TODO )
+
+src_install() {
+	default_src_install
+
+	if use server ; then
+		newinitd "${FILESDIR}"/knockd.initd.2 knock
+		newconfd "${FILESDIR}"/knockd.confd.2 knock
+	fi
+}
+
+pkg_postinst() {
+	if use server && ! has_version net-firewall/iptables ; then
+		einfo
+		elog "You're really encouraged to install net-firewall/iptables to"
+		elog "actually modify your firewall and use the example configuration."
+		einfo
+	fi
+}