addresses gentoo bug #31465 and proftpd bug #2204. reverse dns lookups now work

4 files changed, 62 insertions, 4 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index df299df12fd3..e3651835416f 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.41 2003/10/16 06:05:13 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.42 2003/10/21 09:57:42 raker Exp $
+
+  20 Oct 2003; Nick Hadaway <raker@gentoo.org> proftpd-1.2.9_rc3.ebuild:
+  Added files/1.2.9_rc3-reversedns.diff which was taken from the 
+  upstream cvs repository.  Gentoo bug #31465 and proftpd bug #2204.
 
 *proftpd-1.2.9_rc3 (16 Oct 2003)
 
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 01fdc07e4b43..d57fe496e214 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -4,8 +4,8 @@ MD5 7312398ea208fcb46ef6709cbdc295d8 proftpd-1.2.9_rc2-r1.ebuild 3160
 MD5 6af0a703972bb7f858aabcc18896454b proftpd-1.2.5-r1.ebuild 2487
 MD5 ed644dbda898814d27dbf3b8b8775fef proftpd-1.2.9_rc1.ebuild 2911
 MD5 bef00204f7097fbe4c9cc00c6f638e93 proftpd-1.2.7.ebuild 3670
-MD5 8404b8a288b60aa65a896812565a33f9 proftpd-1.2.9_rc3.ebuild 3123
-MD5 174945d135559213ce18985cbf638492 ChangeLog 6628
+MD5 46dda3e01d28cea22470232c9559b961 proftpd-1.2.9_rc3.ebuild 3123
+MD5 abfc45449d61cea70890f1337a9e1b6b ChangeLog 6837
 MD5 1eabb88c18a1821e01eab0a586de02d9 metadata.xml 259
 MD5 305b9ec34f3caa3722cf5a7dc1a59880 files/proftpd.rc6 743
 MD5 b338504ed873219e368abab7df6c276d files/proftpd.conf 1704
diff --git a/net-ftp/proftpd/files/1.2.9_rc3-reversedns.diff b/net-ftp/proftpd/files/1.2.9_rc3-reversedns.diff
new file mode 100644
index 000000000000..aa7ede335202
--- /dev/null
+++ b/net-ftp/proftpd/files/1.2.9_rc3-reversedns.diff
@@ -0,0 +1,48 @@
+Index: include/netaddr.h
+===================================================================
+RCS file: /cvsroot/proftp/proftpd/include/netaddr.h,v
+retrieving revision 1.13
+diff -u -r1.13 netaddr.h
+--- include/netaddr.h	11 Oct 2003 16:57:24 -0000	1.13
++++ include/netaddr.h	17 Oct 2003 14:14:36 -0000
+@@ -160,7 +160,8 @@
+ int pr_netaddr_loopback(const pr_netaddr_t *);
+ 
+ /* Returns TRUE if the given pr_netaddr_t is of the AF_INET6 family and
+- * contains an IPv4-mapped IPv6 address; otherwise FALSE is returned.
++ * contains an IPv4-mapped IPv6 address; otherwise FALSE is returned.  A
++ * return value of -1 is used to indicate an error.
+  */
+ int pr_netaddr_is_v4mappedv6(const pr_netaddr_t *);
+ 
+Index: modules/mod_core.c
+===================================================================
+RCS file: /cvsroot/proftp/proftpd/modules/mod_core.c,v
+retrieving revision 1.194
+diff -u -r1.194 mod_core.c
+--- modules/mod_core.c	17 Oct 2003 13:19:54 -0000	1.194
++++ modules/mod_core.c	17 Oct 2003 14:14:37 -0000
+      * address if the remote client address is an IPv4-mapped IPv6 address.
+      */
+     if (pr_netaddr_get_family(remote_addr) == AF_INET6 &&
+-        !pr_netaddr_is_v4mappedv6(remote_addr)) {
++        pr_netaddr_is_v4mappedv6(remote_addr) != TRUE) {
+       log_pri(PR_LOG_WARNING, "Refused PORT %s (IPv4/IPv6 address mismatch)",
+         cmd->arg);
+       pr_response_add_err(R_500, "Illegal PORT command");
+Index: src/netaddr.c
+===================================================================
+RCS file: /cvsroot/proftp/proftpd/src/netaddr.c,v
+retrieving revision 1.32
+diff -u -r1.32 netaddr.c
+--- src/netaddr.c	14 Oct 2003 18:22:16 -0000	1.32
++++ src/netaddr.c	17 Oct 2003 14:14:37 -0000
+@@ -631,7 +631,7 @@
+       void *inaddr = pr_netaddr_get_inaddr(na);
+     
+ #ifdef HAVE_GETHOSTBYNAME2
+-      if (pr_netaddr_is_v4mappedv6(na)) {
++      if (pr_netaddr_is_v4mappedv6(na) == TRUE) {
+         family = AF_INET;
+         inaddr = get_v4inaddr(na);
+       }
diff --git a/net-ftp/proftpd/proftpd-1.2.9_rc3.ebuild b/net-ftp/proftpd/proftpd-1.2.9_rc3.ebuild
index 7ff03e8fcf59..492ab6573209 100644
--- a/net-ftp/proftpd/proftpd-1.2.9_rc3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.2.9_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.9_rc3.ebuild,v 1.1 2003/10/16 06:05:13 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.9_rc3.ebuild,v 1.2 2003/10/21 09:57:42 raker Exp $
 
 inherit flag-o-matic
 
@@ -25,6 +25,12 @@ DEPEND="net-libs/libpcap
 	ssl? ( >=dev-libs/openssl-0.9.6f )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/1.2.9_rc3-reversedns.diff
+}
+
 src_compile() {
 	local modules myconf