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

  to Tavis Ormandy.

Package-Manager: portage-2.1.2_rc4-r5

5 files changed, 82 insertions, 16 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/Manifest b/net-ftp/oftpd/Manifest
index 76a92d575f3b..3e431acd77d0 100644
--- a/net-ftp/oftpd/Manifest
+++ b/net-ftp/oftpd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX conf.d.oftpd 469 RMD160 2e70e1d86efadaf72d0f6fe56bd8f07167a7badb SHA1 8e0d30aa2ecf77a58a3790ecc1fee32a420d22d9 SHA256 d1bab71ab0942df8dcb2f88bb50a3c318fe97676d278ccf26d540fdc9c4e69ba
 MD5 b0ba4d96ae0eb98abce711409607eda4 files/conf.d.oftpd 469
 RMD160 2e70e1d86efadaf72d0f6fe56bd8f07167a7badb files/conf.d.oftpd 469
@@ -17,6 +14,10 @@ AUX init.d.oftpd-r1 703 RMD160 aa950de215f93b9eacdbf7cd03b7cebe30c5d42a SHA1 1c8
 MD5 72d1cf62ed5467e49076dcdb4e932d9d files/init.d.oftpd-r1 703
 RMD160 aa950de215f93b9eacdbf7cd03b7cebe30c5d42a files/init.d.oftpd-r1 703
 SHA256 b631b9a3b76cfcee2b13298150dbf0f72defa61affc25f8feb1783a17d153057 files/init.d.oftpd-r1 703
+AUX oftpd-0.3.7-family.patch 550 RMD160 f99e24cda14e2a273564e1d637f9478b0c502c61 SHA1 4c2b80ea4e464458c480defdd2d1a791a3e6ac30 SHA256 f97f380705c42a215b2f4f094cce9b9ea6d5778a605bd532334a8fe07d829023
+MD5 10906822e0dd532aa46a2a8d7a158fac files/oftpd-0.3.7-family.patch 550
+RMD160 f99e24cda14e2a273564e1d637f9478b0c502c61 files/oftpd-0.3.7-family.patch 550
+SHA256 f97f380705c42a215b2f4f094cce9b9ea6d5778a605bd532334a8fe07d829023 files/oftpd-0.3.7-family.patch 550
 DIST oftpd-0.3.7.tar.gz 97364 RMD160 9430607bf0c51847a4e4cc97c84be0495c931183 SHA1 d6d3ce43c009bb68736d50739e9a2f60bede99c1 SHA256 b135cd2bc6c54e03e5374845964eab73d5e567160c15bb4226c1c922b1e6d64e
 EBUILD oftpd-0.3.7-r1.ebuild 830 RMD160 895e298be88736f0a805ffc636e3a3957785ebc3 SHA1 a3ecba7fa1ccf086bcf062ec705a1317b1439d58 SHA256 9e10f38429d2556cd33c49382909239a4343ba8af11b220bcb50f57ee9bf4dfe
 MD5 0be4a8fd5b7885debf2ecb96d2e1759c oftpd-0.3.7-r1.ebuild 830
@@ -26,10 +27,14 @@ EBUILD oftpd-0.3.7-r2.ebuild 854 RMD160 8dcb132b4df3e59e26d323d63977a0196ebdba0b
 MD5 909d324e7a8886a29255fa81d7c058bb oftpd-0.3.7-r2.ebuild 854
 RMD160 8dcb132b4df3e59e26d323d63977a0196ebdba0b oftpd-0.3.7-r2.ebuild 854
 SHA256 a3701e490b7d94392ebaafe562c29197d23ac8a15e2f657bf29a6d2278b67aeb oftpd-0.3.7-r2.ebuild 854
-MISC ChangeLog 2688 RMD160 313d8dc051c7df4c2f5e8b7532d4873d1bca0096 SHA1 e149659ef56fe775772f8ad538ee2d60ea9c003e SHA256 f2553850f4f9895618d5794334b7362ba71df40253cf05e1d17a2dc941ed96e4
-MD5 b2d6cf60dd5cdd10a719859185fad323 ChangeLog 2688
-RMD160 313d8dc051c7df4c2f5e8b7532d4873d1bca0096 ChangeLog 2688
-SHA256 f2553850f4f9895618d5794334b7362ba71df40253cf05e1d17a2dc941ed96e4 ChangeLog 2688
+EBUILD oftpd-0.3.7-r3.ebuild 1032 RMD160 9d8fd653aff07136c556ee4f51e6acf8c3b849b2 SHA1 a52629a6e64b566e67f2e8c809cdf76615ee17ec SHA256 408fbba2a24b39568b1834f0845df6c4398dce3260d7dba53572f6296293274c
+MD5 972e276c2f944ed7a280637242765ae7 oftpd-0.3.7-r3.ebuild 1032
+RMD160 9d8fd653aff07136c556ee4f51e6acf8c3b849b2 oftpd-0.3.7-r3.ebuild 1032
+SHA256 408fbba2a24b39568b1834f0845df6c4398dce3260d7dba53572f6296293274c oftpd-0.3.7-r3.ebuild 1032
+MISC ChangeLog 2926 RMD160 8cf4fa1435d7893b7a01c717d2ff15c3c96ed3d3 SHA1 ce7cacd05b3695fc94f4b36606a8cebaadab4bcc SHA256 e2ffa17629e8caebc686fa986cb9a16aa6ecc9f3c0fa1a1d66b8901082da383c
+MD5 119caa5938a9d4bd6fca02ebc5778ce6 ChangeLog 2926
+RMD160 8cf4fa1435d7893b7a01c717d2ff15c3c96ed3d3 ChangeLog 2926
+SHA256 e2ffa17629e8caebc686fa986cb9a16aa6ecc9f3c0fa1a1d66b8901082da383c ChangeLog 2926
 MISC metadata.xml 351 RMD160 4a8b37935566ffd8494d6aa07fea354b9e5b23d6 SHA1 a2ef43f52872fddf8afc96186fd32a44c3905fde SHA256 b1977f6854b1afe72bf1d656404f40074a9839dd9a367d42421d4457f7d827d7
 MD5 0f7a846dd3f2197538502db078109b71 metadata.xml 351
 RMD160 4a8b37935566ffd8494d6aa07fea354b9e5b23d6 metadata.xml 351
@@ -40,10 +45,6 @@ SHA256 6444a256a7ab8f7ac1025186c0aac133e9595d71803b0be88b91c46ebd24f96d files/di
 MD5 128a91c86542e3d6ca93f0adc5111940 files/digest-oftpd-0.3.7-r2 232
 RMD160 1b71c941c55e2e708f36d3f30fe2b37d71f0076f files/digest-oftpd-0.3.7-r2 232
 SHA256 6444a256a7ab8f7ac1025186c0aac133e9595d71803b0be88b91c46ebd24f96d files/digest-oftpd-0.3.7-r2 232
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFcIFnkT4lNIS36YERAnB6AJsGolRQMzPnmsopnQabs4sn8Uj6igCgqSU/
-QHmk2fMZ1tefgJEpARGfais=
-=W0LL
------END PGP SIGNATURE-----
+MD5 128a91c86542e3d6ca93f0adc5111940 files/digest-oftpd-0.3.7-r3 232
+RMD160 1b71c941c55e2e708f36d3f30fe2b37d71f0076f files/digest-oftpd-0.3.7-r3 232
+SHA256 6444a256a7ab8f7ac1025186c0aac133e9595d71803b0be88b91c46ebd24f96d files/digest-oftpd-0.3.7-r3 232
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
+}