5 files changed, 76 insertions, 46 deletions
diff --git a/net-misc/netkit-rwho/ChangeLog b/net-misc/netkit-rwho/ChangeLog
index aa7b4a3ff2cf..c11fbd41ec98 100644
--- a/net-misc/netkit-rwho/ChangeLog
+++ b/net-misc/netkit-rwho/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/netkit-rwho
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rwho/ChangeLog,v 1.8 2004/12/29 19:57:27 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rwho/ChangeLog,v 1.9 2005/02/05 06:45:52 vapier Exp $
+
+*netkit-rwho-0.17-r1 (05 Feb 2005)
+
+  05 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/netkit-rwho-0.17-tiny-packet-dos.patch,
+  +netkit-rwho-0.17-r1.ebuild, -netkit-rwho-0.17.ebuild:
+  Add patch to fix DoS #78371.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/net-misc/netkit-rwho/files/digest-netkit-rwho-0.17 b/net-misc/netkit-rwho/files/digest-netkit-rwho-0.17-r1
index 5ed5db18811d..5ed5db18811d 100644
--- a/net-misc/netkit-rwho/files/digest-netkit-rwho-0.17
+++ b/net-misc/netkit-rwho/files/digest-netkit-rwho-0.17-r1
diff --git a/net-misc/netkit-rwho/files/netkit-rwho-0.17-tiny-packet-dos.patch b/net-misc/netkit-rwho/files/netkit-rwho-0.17-tiny-packet-dos.patch
new file mode 100644
index 000000000000..4c9b83063b47
--- /dev/null
+++ b/net-misc/netkit-rwho/files/netkit-rwho-0.17-tiny-packet-dos.patch
@@ -0,0 +1,20 @@
+If a user sends a packet which is smaller than WHDRSIZE, the code 
+will later hit a loop which will result in the service faulting.  
+A simple DoS where the server will be taken out, but something 
+that should be fixed :).
+
+http://bugs.gentoo.org/show_bug.cgi?id=78371
+
+--- rwhod/rwhod.c
++++ rwhod/rwhod.c
+@@ -258,6 +258,10 @@
+ 				syslog(LOG_WARNING, "recv: %m");
+ 			continue;
+ 		}
++		if (cc < WHDRSIZE) {
++			syslog(LOG_WARNING, "packet too small");
++			continue;
++		}
+ 		if (from.sin_port != sp->s_port) {
+ 			syslog(LOG_WARNING, "%d: bad from port",
+ 				ntohs(from.sin_port));
diff --git a/net-misc/netkit-rwho/netkit-rwho-0.17-r1.ebuild b/net-misc/netkit-rwho/netkit-rwho-0.17-r1.ebuild
new file mode 100644
index 000000000000..09e9490d86a4
--- /dev/null
+++ b/net-misc/netkit-rwho/netkit-rwho-0.17-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rwho/netkit-rwho-0.17-r1.ebuild,v 1.1 2005/02/05 06:45:52 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="Netkit - ruptime/rwho/rwhod"
+HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 mips ppc s390 sparc x86"
+IUSE=""
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-tiny-packet-dos.patch
+	epatch ${FILESDIR}/${P}-gentoo.diff
+}
+
+src_compile() {
+	./configure || die "configure failed"
+	sed -i \
+		-e "s:-O2::" \
+		-e "s:-Wpointer-arith::" \
+		MCONFIG
+	emake || die "emake failed"
+}
+
+src_install() {
+	keepdir /var/spool/rwho
+
+	into /usr
+	dobin ruptime/ruptime rwho/rwho || die "dobin failed"
+	dosbin rwhod/rwhod || die "dosbin failed"
+	doman ruptime/ruptime.1 rwho/rwho.1 rwhod/rwhod.8
+	dodoc README ChangeLog
+
+	newinitd ${FILESDIR}/${P}-rc rwhod
+}
diff --git a/net-misc/netkit-rwho/netkit-rwho-0.17.ebuild b/net-misc/netkit-rwho/netkit-rwho-0.17.ebuild
deleted file mode 100644
index 224a289b0006..000000000000
--- a/net-misc/netkit-rwho/netkit-rwho-0.17.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rwho/netkit-rwho-0.17.ebuild,v 1.9 2004/07/15 03:08:14 agriffis Exp $
-
-inherit eutils
-
-IUSE=""
-DESCRIPTION="Netkit - ruptime/rwho/rwhod"
-HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="x86 ~ppc ~sparc alpha ~mips s390"
-
-DEPEND="virtual/libc
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PF}-gentoo.diff
-}
-
-src_compile() {
-	./configure || die
-	sed -i "s:-O2::" -i "s:-Wpointer-arith::" MCONFIG
-	emake || die
-}
-
-src_install() {
-	keepdir /var/spool/rwho
-
-	into /usr
-	dobin ruptime/ruptime
-	doman ruptime/ruptime.1
-	dobin rwho/rwho
-	doman rwho/rwho.1
-	dosbin rwhod/rwhod
-	doman rwhod/rwhod.8
-	dodoc README ChangeLog
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${PF}-rc rwhod
-}