Stop crashing when requesting an unsupported address family, #159178 thanks

  to Tavis Ormandy.

(Portage version: 2.1.2_rc4-r5)

4 files changed, 67 insertions, 2 deletions

diff --git a/net-ftp/oftpd/ChangeLog b/net-ftp/oftpd/ChangeLog
index f93e907550dc..7adbbe287f2a 100644
--- a/net-ftp/oftpd/ChangeLog
+++ b/net-ftp/oftpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/oftpd
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.18 2006/12/01 19:24:16 wolf31o2 Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.19 2007/01/04 12:38:55 uberlord Exp $
+
+*oftpd-0.3.7-r3 (04 Jan 2007)
+
+  04 Jan 2007; Roy Marples <uberlord@gentoo.org>
+  +files/oftpd-0.3.7-family.patch, +oftpd-0.3.7-r3.ebuild:
+  Stop crashing when requesting an unsupported address family, #159178 thanks
+  to Tavis Ormandy.
 
   01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> oftpd-0.3.7-r2.ebuild:
   Stable on x86 wrt bug #130500.
diff --git a/net-ftp/oftpd/files/digest-oftpd-0.3.7-r3 b/net-ftp/oftpd/files/digest-oftpd-0.3.7-r3
new file mode 100644
index 000000000000..8781d7079178
--- /dev/null
+++ b/net-ftp/oftpd/files/digest-oftpd-0.3.7-r3
@@ -0,0 +1,3 @@
+MD5 1a396ad12584c7efe3a0e712dadf28be oftpd-0.3.7.tar.gz 97364
+RMD160 9430607bf0c51847a4e4cc97c84be0495c931183 oftpd-0.3.7.tar.gz 97364
+SHA256 b135cd2bc6c54e03e5374845964eab73d5e567160c15bb4226c1c922b1e6d64e oftpd-0.3.7.tar.gz 97364
diff --git a/net-ftp/oftpd/files/oftpd-0.3.7-family.patch b/net-ftp/oftpd/files/oftpd-0.3.7-family.patch
new file mode 100644
index 000000000000..601188e367ff
--- /dev/null
+++ b/net-ftp/oftpd/files/oftpd-0.3.7-family.patch
@@ -0,0 +1,15 @@
+--- oftpd-0.3.7.orig/src/ftp_session.c	2004-03-25 20:46:40.000000000 +0000
++++ oftpd-0.3.7/src/ftp_session.c	2006-12-27 11:38:56.219883456 +0000
+@@ -683,10 +683,12 @@ static void do_lprt(ftp_session_t *f, co
+ #ifdef INET6
+     if ((SSFAM(host_port) != AF_INET) && (SSFAM(host_port) != AF_INET6)) {
+         reply(f, 521, "Only IPv4 and IPv6 supported, address families (4,6)");
++        return;
+     }
+ #else
+     if (SSFAM(host_port) != AF_INET) {
+         reply(f, 521, "Only IPv4 supported, address family (4)");
++        return;
+     }
+ #endif
+ 
diff --git a/net-ftp/oftpd/oftpd-0.3.7-r3.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r3.ebuild
new file mode 100644
index 000000000000..e3390288825a
--- /dev/null
+++ b/net-ftp/oftpd/oftpd-0.3.7-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7-r3.ebuild,v 1.1 2007/01/04 12:38:55 uberlord Exp $
+
+inherit eutils
+
+DESCRIPTION="Secure, small, anonymous only ftpd"
+HOMEPAGE="http://www.time-travellers.org/oftpd"
+SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="net-ftp/ftpbase"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Don't crash when using an unsupported address family, #159178.
+	epatch "${FILESDIR}"/oftpd-0.3.7-family.patch
+}
+
+src_compile() {
+	# local myconf
+	# ipv6 support busted according to lamer
+	# use ipv6 && myconf="${myconf} --enable-ipv6"
+	econf --bindir=/usr/sbin || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS BUGS FAQ NEWS README TODO
+	keepdir /home/ftp
+	newinitd "${FILESDIR}"/init.d.oftpd oftpd
+	newconfd "${FILESDIR}"/conf.d.oftpd oftpd
+}