From d04cadc096cda5a3b8a1ce0cdacfea60904ded6d Mon Sep 17 00:00:00 2001
From: geos_one <geos_one@6952d904-891a-0410-993b-d76249ca496b>
Date: Sun, 9 May 2010 08:15:50 +0000
Subject: [PATCH] net-ftp/oftpd: add ipv6 patch

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2183 6952d904-891a-0410-993b-d76249ca496b
---
 net-ftp/oftpd/ChangeLog                 |  4 +++
 net-ftp/oftpd/Manifest                  |  3 +-
 net-ftp/oftpd/files/oftpd-0.3.7-r4.diff | 42 +++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 net-ftp/oftpd/files/oftpd-0.3.7-r4.diff

diff --git a/net-ftp/oftpd/ChangeLog b/net-ftp/oftpd/ChangeLog
index 648a648d..48663aa8 100644
--- a/net-ftp/oftpd/ChangeLog
+++ b/net-ftp/oftpd/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 May 2010; Mario Fetka <mario.fetka@gmail.com>
+  +files/oftpd-0.3.7-r4.diff:
+  add ipv6 patch
+
   05 Jan 2010; Mario Fetka <mario.fetka@gmail.com> +metadata.xml:
   initial checkin based on official gentoo ebuild but with proper ipv6 patch
 
diff --git a/net-ftp/oftpd/Manifest b/net-ftp/oftpd/Manifest
index b2a3090a..5510dcd2 100644
--- a/net-ftp/oftpd/Manifest
+++ b/net-ftp/oftpd/Manifest
@@ -2,7 +2,8 @@ AUX conf.d.oftpd-r1 578 RMD160 84ba38720a6a2ac8f0873ebbc4cab82f0394232c SHA1 821
 AUX init.d.oftpd-r1 722 RMD160 3e24790f4d56d2eff46ce810c8433a10f852c1ad SHA1 49e4d235f382eedd24b25955c1cf2764a94ee08b SHA256 cd3c98cc8bc3255503d9cc9946749d53d90410bf9d4c0a3a9ddb6819c87ab84e
 AUX oftpd-0.3.7-family-1.patch 936 RMD160 0668323bb69fac190d8b1c4bcb0f5ed1c9c2b692 SHA1 945970c75cd4d23b4027f72521f4390a8b8ee4e6 SHA256 fe903d6fbb4a523f7b85dfb4c112f489da07764e8d67e15faa9b8380d400ba2a
 AUX oftpd-0.3.7-ipv6rel2-1.patch 44765 RMD160 563fafe68e9e1be6b96116b7ae0c24204147b6f7 SHA1 5b7fd9a9b46cdcb2e3d081bdecb255b584826d42 SHA256 4ae576a749c26dd66432c273ec71c0d7fc34a4159cd7fd7760e484304eeb1ccc
+AUX oftpd-0.3.7-r4.diff 1254 RMD160 64dbf5d120e03beffb3bce72ce16d647f54c906c SHA1 f8182ff728b0d9752429702e7ca04e79051dfca2 SHA256 4497626ffbbff1134b8940da423a2ad1f8fecba0e743d370e73da756ae949438
 DIST oftpd-0.3.7.tar.gz 97364 RMD160 9430607bf0c51847a4e4cc97c84be0495c931183 SHA1 d6d3ce43c009bb68736d50739e9a2f60bede99c1 SHA256 b135cd2bc6c54e03e5374845964eab73d5e567160c15bb4226c1c922b1e6d64e
 EBUILD oftpd-0.3.7-r5.ebuild 1030 RMD160 0754f5ee486989d5703e9215b9765678d757fcb4 SHA1 65b01a4c08f8c5fe47e49c15388939fa9438173e SHA256 96739a8ff08100c97ca1d0f00bf5e5f803e7eb563ee8e9cc1bd85eced93ea4ad
-MISC ChangeLog 258 RMD160 b06d727a0e4102335a8502bd0a70077cff286869 SHA1 c4857180a1532c6b5d67e8c7d2e29e0932049e6e SHA256 b09ab21bef85e129acc7cfb9d799f853209f5bc3ee53b02b71af10cf3822ae98
+MISC ChangeLog 357 RMD160 ce9c79b713c53b1aeafb0ff90efd87bfc3de3d19 SHA1 df763134e0e3b4efb6ceac46e92e4208bbcc0377 SHA256 a93b70e75e3adc3c38f8c0060d1aa6dd611cbca8a694fa8f5d7b1bbdea7abbbf
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/net-ftp/oftpd/files/oftpd-0.3.7-r4.diff b/net-ftp/oftpd/files/oftpd-0.3.7-r4.diff
new file mode 100644
index 00000000..ea116668
--- /dev/null
+++ b/net-ftp/oftpd/files/oftpd-0.3.7-r4.diff
@@ -0,0 +1,42 @@
+--- /usr/portage/net-ftp/oftpd/oftpd-0.3.7-r4.ebuild	2009-05-29 16:00:05.000000000 +0200
++++ oftpd-0.3.7-r5.ebuild	2010-01-05 23:07:34.079555852 +0100
+@@ -1,9 +1,9 @@
+-# Copyright 1999-2009 Gentoo Foundation
++# Copyright 1999-2010 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-r4.ebuild,v 1.1 2009/05/29 14:00:05 rbu Exp $
++# $Header: $
+ 
+ EAPI=2
+-inherit eutils
++inherit eutils autotools
+ 
+ DESCRIPTION="Secure, small, anonymous only ftpd"
+ HOMEPAGE="http://www.time-travellers.org/oftpd"
+@@ -12,21 +12,23 @@
+ LICENSE="as-is"
+ SLOT="0"
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86"
+-IUSE=""
++IUSE="ipv6"
+ 
+ DEPEND="net-ftp/ftpbase"
+ RDEPEND="${DEPEND}"
+ 
+ src_prepare() {
++	epatch "${FILESDIR}"/oftpd-0.3.7-ipv6rel2-1.patch
+ 	# Don't crash when using an unsupported address family, #159178.
+-	epatch "${FILESDIR}"/oftpd-0.3.7-family.patch
++	epatch "${FILESDIR}"/oftpd-0.3.7-family-1.patch
++	eautoreconf
+ }
+ 
+ src_configure() {
+ 	# local myconf
+ 	# ipv6 support busted according to lamer
+ 	# use ipv6 && myconf="${myconf} --enable-ipv6"
+-	econf --bindir=/usr/sbin || die
++	econf --bindir=/usr/sbin $(use_enable ipv6) || die
+ }
+ 
+ src_install() {