Closed bugs #59315, #59265 and #59251.

4 files changed, 41 insertions, 7 deletions

diff --git a/net-misc/knock/ChangeLog b/net-misc/knock/ChangeLog
index 8c9dd83a4300..e2ad3234061d 100644
--- a/net-misc/knock/ChangeLog
+++ b/net-misc/knock/ChangeLog
@@ -1,11 +1,11 @@
 # ChangeLog for net-misc/knock
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/ChangeLog,v 1.11 2004/08/27 11:18:55 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/ChangeLog,v 1.12 2004/08/27 11:33:04 pyrania Exp $
 
-  27 Aug 2004; <pyrania@gentoo.org> +files/knock-0.3-nonblock.patch,
-  knock-0.3.ebuild:
-  Added patch to make use of non-blocking TCP connections. Thanks to Per
-  Cederberg <per@percederberg.net> in bug #59315.
+  27 Aug 2004; <pyrania@gentoo.org> +files/knockd.conf.patch,
+  knock-0.1.ebuild, +files/knock-0.3-nonblock.patch, knock-0.3.ebuild:
+  Closed bugs #59315, #59265 and #59251. Thanks to Per Cederberg
+  <per@percederberg.net>.
 
   18 Jul 2004; Daniel Ahlberg <aliz@gentoo.org> knock-0.3.ebuild:
   Added amd64 keyword, closing #57090.
diff --git a/net-misc/knock/files/knockd.conf.patch b/net-misc/knock/files/knockd.conf.patch
new file mode 100644
index 000000000000..7154ad646f78
--- /dev/null
+++ b/net-misc/knock/files/knockd.conf.patch
@@ -0,0 +1,18 @@
+diff -Naur knock-0.3/knockd.conf knock-0.3_/knockd.conf
+--- knock-0.3/knockd.conf	2004-05-07 00:56:03.000000000 +0200
++++ knock-0.3_/knockd.conf	2004-08-27 13:23:51.103555768 +0200
+@@ -4,12 +4,12 @@
+ [openSSH]
+ 	sequence    = 7000,8000,9000
+ 	seq_timeout = 5
+-	command     = /usr/sbin/iptables -A INPUT -s %IP% -p tcp --dport 22 -j ACCEPT
++	command     = /sbin/iptables -A INPUT -s %IP% -p tcp --dport 22 -j ACCEPT
+ 	tcpflags    = syn
+ 
+ [closeSSH]
+ 	sequence    = 9000,8000,7000
+ 	seq_timeout = 5
+-	command     = /usr/sbin/iptables -D INPUT -s %IP% -p tcp --dport 22 -j ACCEPT
++	command     = /sbin/iptables -D INPUT -s %IP% -p tcp --dport 22 -j ACCEPT
+ 	tcpflags    = syn
+ 
diff --git a/net-misc/knock/knock-0.1.ebuild b/net-misc/knock/knock-0.1.ebuild
index 2df5b4480afe..eb55a81a47b3 100644
--- a/net-misc/knock/knock-0.1.ebuild
+++ b/net-misc/knock/knock-0.1.ebuild
@@ -1,16 +1,31 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/knock-0.1.ebuild,v 1.8 2004/07/12 01:40:04 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/knock-0.1.ebuild,v 1.9 2004/08/27 11:33:04 pyrania Exp $
+
+inherit eutils
 
 DESCRIPTION="A simple port-knocking daemon"
 HOMEPAGE="http://www.zeroflux.org/knock/"
 SRC_URI="http://www.zeroflux.org/knock/${P}.tar.gz"
 
+DEPEND=">=net-libs/libpcap-0.8.3-r1"
+
 KEYWORDS="x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-nonblock.patch
+	epatch ${FILESDIR}/knockd.conf.patch
+}
+
+src_compile() {
+	econf || die "could not configure"
+	emake || die "emake failed"
+}
+
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 	dodoc README
diff --git a/net-misc/knock/knock-0.3.ebuild b/net-misc/knock/knock-0.3.ebuild
index f1805790b745..52e91890c9fe 100644
--- a/net-misc/knock/knock-0.3.ebuild
+++ b/net-misc/knock/knock-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/knock-0.3.ebuild,v 1.6 2004/08/27 11:18:55 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/knock-0.3.ebuild,v 1.7 2004/08/27 11:33:04 pyrania Exp $
 
 inherit eutils
 
@@ -18,6 +18,7 @@ IUSE=""
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-nonblock.patch
+	epatch ${FILESDIR}/knockd.conf.patch
 }
 
 src_compile() {