Revbump to re-add ipv6 support, fixes bug 157005

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

6 files changed, 442 insertions, 5 deletions

diff --git a/net-ftp/oftpd/ChangeLog b/net-ftp/oftpd/ChangeLog
index 981da3fc25fd..73ae3855a8be 100644
--- a/net-ftp/oftpd/ChangeLog
+++ b/net-ftp/oftpd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-ftp/oftpd
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.27 2009/06/13 19:31:06 grobian Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.28 2010/09/01 10:00:39 xmw Exp $
+
+*oftpd-0.3.7-r5 (01 Sep 2010)
+
+  01 Sep 2010; Michael Weber <xmw@gentoo.org> +oftpd-0.3.7-r5.ebuild,
+  +files/oftpd-0.3.7-family-1.patch,
+  +files/oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch, metadata.xml:
+  Revbump to re-add ipv6 support, fixes bug 157005, thanks to Bruno
+  <bonbons67@internet.lu> and Mario Fetka (geos_one) <mario.fetka@gmail.com>
+  for their work on this bug.
 
   13 Jun 2009; Fabian Groffen <grobian@gentoo.org> files/init.d.oftpd-r1:
   (Non-maintainer commit) Fix bug #273440, patch by Lars Wendler (Polynomial-C)
diff --git a/net-ftp/oftpd/Manifest b/net-ftp/oftpd/Manifest
index c04c2f2e41c7..fa0d35fed7ed 100644
--- a/net-ftp/oftpd/Manifest
+++ b/net-ftp/oftpd/Manifest
@@ -2,9 +2,13 @@ AUX conf.d.oftpd 469 RMD160 2e70e1d86efadaf72d0f6fe56bd8f07167a7badb SHA1 8e0d30
 AUX conf.d.oftpd-r1 578 RMD160 84ba38720a6a2ac8f0873ebbc4cab82f0394232c SHA1 821a500ff9a3d8e35f7aaf39c4c3935546399ae1 SHA256 6ba360cac50935ee9c8ed2961b95e57d7c63c5f63dc0ce7befb942756e054f62
 AUX init.d.oftpd 676 RMD160 95af3c24dda70f631f487495d0a67f280ec1277a SHA1 e50c5f5b83ec97129aa6510d7ba957f565b36773 SHA256 96d69985013735c39e6e4913797fe753e8971cf836e4bc8e5a8f5ed3d8dc03a2
 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-family.patch 550 RMD160 f99e24cda14e2a273564e1d637f9478b0c502c61 SHA1 4c2b80ea4e464458c480defdd2d1a791a3e6ac30 SHA256 f97f380705c42a215b2f4f094cce9b9ea6d5778a605bd532334a8fe07d829023
+AUX oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch 14107 RMD160 73cd9354fc48d887d6c38eff1c0bb0baff0a83ba SHA1 6a1a1d7382e9c04b8e38534e5cdb78841ccbee16 SHA256 83101b57c00cebe9ed456d79697520f582fc427d18ecf84137c502709fef6bf3
+DIST oftpd-0.3.6-ipv6rel2.patch.gz 12478 RMD160 32c080fa2898272b7bde05c806371021bc2d9ea9 SHA1 0502988b5bde25961efdceb36c303dbb351744ea SHA256 b1165052e0169e1495b5009111f07ba56cb81ce34234b9578a9eb2862e76ac3d
 DIST oftpd-0.3.7.tar.gz 97364 RMD160 9430607bf0c51847a4e4cc97c84be0495c931183 SHA1 d6d3ce43c009bb68736d50739e9a2f60bede99c1 SHA256 b135cd2bc6c54e03e5374845964eab73d5e567160c15bb4226c1c922b1e6d64e
 EBUILD oftpd-0.3.7-r3.ebuild 1042 RMD160 469cda3176006ad6434c69eb21f998bd487fe586 SHA1 730851bdfd154d4242c45384dba08698e19c3fac SHA256 33677fd0c45af6bdf47cf873211a260483afa236432efe5c4f7fc717e89e9323
 EBUILD oftpd-0.3.7-r4.ebuild 1025 RMD160 11068cffccf61dab85f30e1f059ac24caad37f3a SHA1 9f5cd1db083b7955a05f9afa9c4d3ef2ea8d7e54 SHA256 956f0c9fbe359fcf1622776021b4a6ecc70a0b4b8edc1f0a68441b56bf12190f
-MISC ChangeLog 4099 RMD160 76bdd27c415021dcb71d7b8a381d6f7666e590d5 SHA1 415efbd68627ef23b64f3db86376dbed1170e04c SHA256 5bf2ac626553b9ee8353d7716847b94fba4dd7cca912c4e8babd77b3d64aef22
-MISC metadata.xml 241 RMD160 dbd39e15096a9c09432225b4dee87bcadcb33907 SHA1 1beb1a93e4526085c26b282271027ad508b29059 SHA256 950a704ea9fcebef2e688e8bd6e0f0d292c967e246d58e4778b9955b1d615ab4
+EBUILD oftpd-0.3.7-r5.ebuild 1236 RMD160 136ae9fb1f98ba2ce9726d9ed8496b534414e38f SHA1 ccb6403c019b7f4f0037089950eb2e469ef9b034 SHA256 2a19c893c2179b10f4241e139238e1c09805b7a8f6900a7f0c568d9629a585f0
+MISC ChangeLog 4475 RMD160 4d49b2ac305ab46ebb9d8857da7f554c2e8a83d6 SHA1 c3724e784463ac095d6197c6d1c9f6430eba72d7 SHA256 4a22b13cae9f6355f783f946b8263f927e8e7ebd7d03a5e964eb020a86351a15
+MISC metadata.xml 255 RMD160 074d0756614e5268d188aa562b5774eedda511d0 SHA1 ee37445e389c446bbdc21503ba2b6c9dd6746eb1 SHA256 d540a4739cb022c072918b4b0b648e9121a7dcb956ddee9505fa6b9f9fc813e7
diff --git a/net-ftp/oftpd/files/oftpd-0.3.7-family-1.patch b/net-ftp/oftpd/files/oftpd-0.3.7-family-1.patch
new file mode 100644
index 000000000000..490612d8752e
--- /dev/null
+++ b/net-ftp/oftpd/files/oftpd-0.3.7-family-1.patch
@@ -0,0 +1,23 @@
+Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
+Date: 2010-01-05
+Initial Package Version: 0.3.7
+Origin: http://gentoo.mirror.solnet.ch/net-ftp/oftpd/files/oftpd-0.3.7-family.patch
+Upstream Status: unkonwn
+Description: dont crash on wrong protocol family
+ 
+diff -Naur oftpd-0.3.7.orig/src/ftp_session.c oftpd-0.3.7/src/ftp_session.c
+--- oftpd-0.3.7.orig/src/ftp_session.c	2010-01-05 21:56:48.540303543 +0000
++++ oftpd-0.3.7/src/ftp_session.c	2010-01-05 21:57:29.995553119 +0000
+@@ -708,10 +708,12 @@
+     if ((((struct sockaddr *)host_port)->sa_family != AF_INET) && 
+         (((struct sockaddr *)host_port)->sa_family != AF_INET6)) {
+         reply(f, 521, "Only IPv4 and IPv6 supported, address families (4,6)");
++        return;
+     }
+ #else
+     if (((struct sockaddr *)host_port)->sa_family != AF_INET) {
+         reply(f, 521, "Only IPv4 supported, address family (4)");
++        return;
+     }
+ #endif
+ 
diff --git a/net-ftp/oftpd/files/oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch b/net-ftp/oftpd/files/oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch
new file mode 100644
index 000000000000..e3ed8df775f8
--- /dev/null
+++ b/net-ftp/oftpd/files/oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch
@@ -0,0 +1,354 @@
+Difference from upstream mentioned patch for version 0.3.6
+ftp://ftp.deepspace6.net/pub/ds6/sources/oftpd/oftpd-0.3.6-ipv6rel2.patch.gz
+to Mario Fetka (geos_one) (mario dot fetka at gmail dot com) at 
+http://bugs.gentoo.org/attachment.cgi?id=220543&action=view
+
+--- oftpd-0.3.6-ipv6rel2.patch	2010-09-01 11:17:37.137000090 +0200
++++ oftpd-0.3.6-ipv6rel2.patch	2010-09-01 11:15:21.900000084 +0200
+@@ -1,146 +1,10 @@
+-diff -urN oftpd-0.3.6-orig/Makefile.in oftpd-0.3.6/Makefile.in
+---- oftpd-0.3.6-orig/Makefile.in	Mon May 28 00:53:40 2001
+-+++ oftpd-0.3.6/Makefile.in	Fri Jun  8 19:09:50 2001
+-@@ -72,8 +72,8 @@
+- CONFIG_HEADER = ./src/config.h
+- CONFIG_CLEAN_FILES = 
+- DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
+--Makefile.in NEWS TODO acconfig.h aclocal.m4 configure configure.in \
+--install-sh missing mkinstalldirs src/config.h.in src/stamp-h.in
+-+Makefile.in NEWS TODO aclocal.m4 configure configure.in install-sh \
+-+missing mkinstalldirs
+- 
+- 
+- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+-@@ -83,9 +83,9 @@
+- all: all-redirect
+- .SUFFIXES:
+- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
+-+	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
+- 
+--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+- 	cd $(top_builddir) \
+- 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+- 
+-@@ -97,34 +97,6 @@
+- $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+- 	cd $(srcdir) && $(AUTOCONF)
+- 
+--src/config.h: src/stamp-h
+--	@if test ! -f $@; then \
+--		rm -f src/stamp-h; \
+--		$(MAKE) src/stamp-h; \
+--	else :; fi
+--src/stamp-h: $(srcdir)/src/config.h.in $(top_builddir)/config.status
+--	cd $(top_builddir) \
+--	  && CONFIG_FILES= CONFIG_HEADERS=src/config.h \
+--	     $(SHELL) ./config.status
+--	@echo timestamp > src/stamp-h 2> /dev/null
+--$(srcdir)/src/config.h.in: $(srcdir)/src/stamp-h.in
+--	@if test ! -f $@; then \
+--		rm -f $(srcdir)/src/stamp-h.in; \
+--		$(MAKE) $(srcdir)/src/stamp-h.in; \
+--	else :; fi
+--$(srcdir)/src/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
+--	cd $(top_srcdir) && $(AUTOHEADER)
+--	@echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null
+--
+--mostlyclean-hdr:
+--
+--clean-hdr:
+--
+--distclean-hdr:
+--	-rm -f src/config.h
+--
+--maintainer-clean-hdr:
+--
+- # This directory's subdirectories are mostly independent; you can cd
+- # into them and run `make' without going through this Makefile.
+- # To change the values of `make' variables: instead of editing Makefiles,
+-@@ -252,6 +224,11 @@
+- 	-rm -rf $(distdir)
+- 	mkdir $(distdir)
+- 	-chmod 777 $(distdir)
+-+	here=`cd $(top_builddir) && pwd`; \
+-+	top_distdir=`cd $(distdir) && pwd`; \
+-+	distdir=`cd $(distdir) && pwd`; \
+-+	cd $(top_srcdir) \
+-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
+- 	$(mkinstalldirs) $(distdir)/dist $(distdir)/init
+- 	@for file in $(DISTFILES); do \
+- 	  d=$(srcdir); \
+-@@ -309,32 +286,32 @@
+- 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+- 
+- maintainer-clean-generic:
+--mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
+-+mostlyclean-am:  mostlyclean-tags mostlyclean-generic
+- 
+- mostlyclean: mostlyclean-recursive
+- 
+--clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
+-+clean-am:  clean-tags clean-generic mostlyclean-am
+- 
+- clean: clean-recursive
+- 
+--distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
+-+distclean-am:  distclean-tags distclean-generic clean-am
+- 
+- distclean: distclean-recursive
+- 	-rm -f config.status
+- 
+--maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
+--		maintainer-clean-generic distclean-am
+-+maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
+-+		distclean-am
+- 	@echo "This command is intended for maintainers to use;"
+- 	@echo "it deletes files that may require special tools to rebuild."
+- 
+- maintainer-clean: maintainer-clean-recursive
+- 	-rm -f config.status
+- 
+--.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+--install-data-recursive uninstall-data-recursive install-exec-recursive \
+--uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+--all-recursive check-recursive installcheck-recursive info-recursive \
+--dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+-+.PHONY: install-data-recursive uninstall-data-recursive \
+-+install-exec-recursive uninstall-exec-recursive installdirs-recursive \
+-+uninstalldirs-recursive all-recursive check-recursive \
+-+installcheck-recursive info-recursive dvi-recursive \
+-+mostlyclean-recursive distclean-recursive clean-recursive \
+- maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+- distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+- dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+-diff -urN oftpd-0.3.6-orig/man/Makefile.in oftpd-0.3.6/man/Makefile.in
+---- oftpd-0.3.6-orig/man/Makefile.in	Mon May 28 00:53:44 2001
+-+++ oftpd-0.3.6/man/Makefile.in	Fri Jun  8 19:09:50 2001
+-@@ -84,9 +84,9 @@
+- all: all-redirect
+- .SUFFIXES:
+- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps man/Makefile
+-+	cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile
+- 
+--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+- 	cd $(top_builddir) \
+- 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+- 
+-@@ -138,6 +138,11 @@
+- subdir = man
+- 
+- distdir: $(DISTFILES)
+-+	here=`cd $(top_builddir) && pwd`; \
+-+	top_distdir=`cd $(top_distdir) && pwd`; \
+-+	distdir=`cd $(distdir) && pwd`; \
+-+	cd $(top_srcdir) \
+-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu man/Makefile
+- 	@for file in $(DISTFILES); do \
+- 	  d=$(srcdir); \
+- 	  if test -d $$d/$$file; then \
++Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
++Date: 2010-01-05
++Initial Package Version: 0.3.6
++Origin: ftp://ftp.deepspace6.net/pub/ds6/sources/oftpd/oftpd-0.3.6-ipv6rel2.patch.gz
++Upstream Status: unknown
++Description: add better ipv6 support to oftpd
++ 
+ diff -urN oftpd-0.3.6-orig/src/Makefile.am oftpd-0.3.6/src/Makefile.am
+ --- oftpd-0.3.6-orig/src/Makefile.am	Wed Apr 18 01:05:16 2001
+ +++ oftpd-0.3.6/src/Makefile.am	Fri Jun  8 19:09:45 2001
+@@ -148,158 +12,6 @@
+  bin_PROGRAMS = oftpd
+ -oftpd_SOURCES = file_list.c file_list.h ftp_command.c ftp_command.h ftp_listener.c ftp_listener.h ftp_session.c ftp_session.h oftpd.c oftpd.h telnet_session.c telnet_session.h watchdog.c watchdog.h error.c error.h af_portability.h daemon_assert.c daemon_assert.h
+ +oftpd_SOURCES = file_list.c file_list.h ftp_command.c ftp_command.h ftp_listener.c ftp_listener.h ftp_session.c ftp_session.h oftpd.c oftpd.h telnet_session.c telnet_session.h watchdog.c watchdog.h error.c error.h af_portability.h af_portability.c daemon_assert.c daemon_assert.h
+-diff -urN oftpd-0.3.6-orig/src/Makefile.in oftpd-0.3.6/src/Makefile.in
+---- oftpd-0.3.6-orig/src/Makefile.in	Mon May 28 00:53:42 2001
+-+++ oftpd-0.3.6/src/Makefile.in	Fri Jun  8 19:09:50 2001
+-@@ -66,7 +66,7 @@
+- VERSION = @VERSION@
+- 
+- bin_PROGRAMS = oftpd
+--oftpd_SOURCES = file_list.c file_list.h ftp_command.c ftp_command.h ftp_listener.c ftp_listener.h ftp_session.c ftp_session.h oftpd.c oftpd.h telnet_session.c telnet_session.h watchdog.c watchdog.h error.c error.h af_portability.h daemon_assert.c daemon_assert.h
+-+oftpd_SOURCES = file_list.c file_list.h ftp_command.c ftp_command.h ftp_listener.c ftp_listener.h ftp_session.c ftp_session.h oftpd.c oftpd.h telnet_session.c telnet_session.h watchdog.c watchdog.h error.c error.h af_portability.h af_portability.c daemon_assert.c daemon_assert.h
+- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+- CONFIG_HEADER = config.h
+- CONFIG_CLEAN_FILES = 
+-@@ -78,7 +78,8 @@
+- LDFLAGS = @LDFLAGS@
+- LIBS = @LIBS@
+- oftpd_OBJECTS =  file_list.o ftp_command.o ftp_listener.o ftp_session.o \
+--oftpd.o telnet_session.o watchdog.o error.o daemon_assert.o
+-+oftpd.o telnet_session.o watchdog.o error.o af_portability.o \
+-+daemon_assert.o
+- oftpd_LDADD = $(LDADD)
+- oftpd_DEPENDENCIES = 
+- oftpd_LDFLAGS = 
+-@@ -93,6 +94,10 @@
+- 
+- TAR = gtar
+- GZIP_ENV = --best
+-+DEP_FILES =  .deps/af_portability.P .deps/daemon_assert.P .deps/error.P \
+-+.deps/file_list.P .deps/ftp_command.P .deps/ftp_listener.P \
+-+.deps/ftp_session.P .deps/oftpd.P .deps/telnet_session.P \
+-+.deps/watchdog.P
+- SOURCES = $(oftpd_SOURCES)
+- OBJECTS = $(oftpd_OBJECTS)
+- 
+-@@ -100,9 +105,9 @@
+- .SUFFIXES:
+- .SUFFIXES: .S .c .o .s
+- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
+-+	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
+- 
+--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+- 	cd $(top_builddir) \
+- 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+- 
+-@@ -160,9 +165,6 @@
+- 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+- 	done
+- 
+--.c.o:
+--	$(COMPILE) -c $<
+--
+- .s.o:
+- 	$(COMPILE) -c $<
+- 
+-@@ -217,6 +219,11 @@
+- subdir = src
+- 
+- distdir: $(DISTFILES)
+-+	here=`cd $(top_builddir) && pwd`; \
+-+	top_distdir=`cd $(top_distdir) && pwd`; \
+-+	distdir=`cd $(distdir) && pwd`; \
+-+	cd $(top_srcdir) \
+-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
+- 	@for file in $(DISTFILES); do \
+- 	  d=$(srcdir); \
+- 	  if test -d $$d/$$file; then \
+-@@ -228,6 +235,37 @@
+- 	  fi; \
+- 	done
+- 
+-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+-+
+-+-include $(DEP_FILES)
+-+
+-+mostlyclean-depend:
+-+
+-+clean-depend:
+-+
+-+distclean-depend:
+-+	-rm -rf .deps
+-+
+-+maintainer-clean-depend:
+-+
+-+%.o: %.c
+-+	@echo '$(COMPILE) -c $<'; \
+-+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+-+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+-+	tr ' ' '\012' < .deps/$(*F).pp \
+-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+-+	    >> .deps/$(*F).P; \
+-+	rm .deps/$(*F).pp
+-+
+-+%.lo: %.c
+-+	@echo '$(LTCOMPILE) -c $<'; \
+-+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+-+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+-+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+-+	tr ' ' '\012' < .deps/$(*F).pp \
+-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+-+	    >> .deps/$(*F).P; \
+-+	rm -f .deps/$(*F).pp
+- info-am:
+- info: info-am
+- dvi-am:
+-@@ -268,24 +306,26 @@
+- 
+- maintainer-clean-generic:
+- mostlyclean-am:  mostlyclean-hdr mostlyclean-binPROGRAMS \
+--		mostlyclean-compile mostlyclean-tags \
+-+		mostlyclean-compile mostlyclean-tags mostlyclean-depend \
+- 		mostlyclean-generic
+- 
+- mostlyclean: mostlyclean-am
+- 
+- clean-am:  clean-hdr clean-binPROGRAMS clean-compile clean-tags \
+--		clean-generic mostlyclean-am
+-+		clean-depend clean-generic mostlyclean-am
+- 
+- clean: clean-am
+- 
+- distclean-am:  distclean-hdr distclean-binPROGRAMS distclean-compile \
+--		distclean-tags distclean-generic clean-am
+-+		distclean-tags distclean-depend distclean-generic \
+-+		clean-am
+- 
+- distclean: distclean-am
+- 
+- maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-binPROGRAMS \
+- 		maintainer-clean-compile maintainer-clean-tags \
+--		maintainer-clean-generic distclean-am
+-+		maintainer-clean-depend maintainer-clean-generic \
+-+		distclean-am
+- 	@echo "This command is intended for maintainers to use;"
+- 	@echo "it deletes files that may require special tools to rebuild."
+- 
+-@@ -296,10 +336,11 @@
+- maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
+- mostlyclean-compile distclean-compile clean-compile \
+- maintainer-clean-compile tags mostlyclean-tags distclean-tags \
+--clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+--check-am installcheck-am installcheck all-recursive-am install-exec-am \
+--install-exec install-data-am install-data install-am install \
+--uninstall-am uninstall all-redirect all-am all installdirs \
+-+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+-+distclean-depend clean-depend maintainer-clean-depend info-am info \
+-+dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
+-+install-exec-am install-exec install-data-am install-data install-am \
+-+install uninstall-am uninstall all-redirect all-am all installdirs \
+- mostlyclean-generic distclean-generic clean-generic \
+- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+- 
+ diff -urN oftpd-0.3.6-orig/src/af_portability.c oftpd-0.3.6/src/af_portability.c
+ --- oftpd-0.3.6-orig/src/af_portability.c	Thu Jan  1 01:00:00 1970
+ +++ oftpd-0.3.6/src/af_portability.c	Fri Jun  8 19:01:31 2001
+@@ -376,7 +88,7 @@
+ diff -urN oftpd-0.3.6-orig/src/config.h.in oftpd-0.3.6/src/config.h.in
+ --- oftpd-0.3.6-orig/src/config.h.in	Sun May 27 23:04:05 2001
+ +++ oftpd-0.3.6/src/config.h.in	Fri Jun  8 19:03:43 2001
+-@@ -100,14 +100,14 @@
++@@ -97,15 +97,15 @@
+  /* Define if you have the <limits.h> header file.  */
+  #undef HAVE_LIMITS_H
+  
+@@ -388,12 +100,13 @@
+  
+  /* Define if you have the <sys/types.h> header file.  */
+  #undef HAVE_SYS_TYPES_H
+--
++ 
+ -/* Define if you have the <syslog.h> header file.  */
+ -#undef HAVE_SYSLOG_H
+- 
++-
+  /* Define if you have the <unistd.h> header file.  */
+  #undef HAVE_UNISTD_H
++ 
+ diff -urN oftpd-0.3.6-orig/src/error.c oftpd-0.3.6/src/error.c
+ --- oftpd-0.3.6-orig/src/error.c	Wed Apr 18 23:41:04 2001
+ +++ oftpd-0.3.6/src/error.c	Thu Jun 21 20:57:09 2001
+@@ -1436,7 +1149,7 @@
+  	}
+  #else
+  	if (memcmp(&f->client_addr.sin_addr, 
+-@@ -1803,20 +1893,69 @@
++@@ -1811,20 +1901,69 @@
+      }
+  }
+  
diff --git a/net-ftp/oftpd/metadata.xml b/net-ftp/oftpd/metadata.xml
index 7dfbf76fcdf9..81b23f04061d 100644
--- a/net-ftp/oftpd/metadata.xml
+++ b/net-ftp/oftpd/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
   <herd>no-herd</herd>
   <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
+    <email>xmw@gentoo.org</email>
+	<name>Michael Weber</name>
   </maintainer>
 </pkgmetadata>
diff --git a/net-ftp/oftpd/oftpd-0.3.7-r5.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r5.ebuild
new file mode 100644
index 000000000000..e3be0fe5f834
--- /dev/null
+++ b/net-ftp/oftpd/oftpd-0.3.7-r5.ebuild
@@ -0,0 +1,46 @@
+# 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-r5.ebuild,v 1.1 2010/09/01 10:00:39 xmw Exp $
+
+EAPI=2
+
+inherit autotools 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
+	ftp://ftp.deepspace6.net/pub/ds6/sources/${PN}/${PN}-0.3.6-ipv6rel2.patch.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="ipv6"
+
+DEPEND="net-ftp/ftpbase"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	epatch "${FILESDIR}"/oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch
+
+	cd "${S}" || die
+	epatch "${WORKDIR}"/${PN}-0.3.6-ipv6rel2.patch
+
+	# Don't crash when using an unsupported address family, #159178.
+	# updated in bug #157005
+	epatch "${FILESDIR}"/${P}-family-1.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --bindir=/usr/sbin $(use_enable ipv6)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS BUGS FAQ NEWS README TODO || die
+	keepdir /home/ftp
+	newinitd "${FILESDIR}"/init.d.oftpd-r1 oftpd || die
+	newconfd "${FILESDIR}"/conf.d.oftpd-r1 oftpd || die
+}