bug 53094

3 files changed, 47 insertions, 13 deletions

diff --git a/dev-perl/mod_perl/ChangeLog b/dev-perl/mod_perl/ChangeLog
index 94ff09b440b9..dc8a06b66e59 100644
--- a/dev-perl/mod_perl/ChangeLog
+++ b/dev-perl/mod_perl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/mod_perl
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/ChangeLog,v 1.41 2004/09/03 19:49:21 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/ChangeLog,v 1.42 2004/09/21 13:44:28 mcummings Exp $
+
+  21 Sep 2004; Michael Cummings <mcummings@gentoo.org>
+  +files/mod_perl-1.29-ipv6.patch:
+  Added missing patch for 1.29. Still applies cleanly. Closes bug 53094.
 
   03 Sep 2004; Caleb Tennis <caleb@gentoo.org> -mod_perl-1.27-r3.ebuild:
   Removing package.masked version
diff --git a/dev-perl/mod_perl/Manifest b/dev-perl/mod_perl/Manifest
index a5fcfb5858f3..56efd4c367a4 100644
--- a/dev-perl/mod_perl/Manifest
+++ b/dev-perl/mod_perl/Manifest
@@ -1,24 +1,25 @@
-MD5 b101308b1017072f3d62def1ed834ab1 mod_perl-1.99.09.ebuild 3673
-MD5 c614eea076228afa05a30a7f0dbadf2a mod_perl-1.27.ebuild 1417
+MD5 7e95cdc34284282fd625dc07eb208111 ChangeLog 5473
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 bfb9cdc72acb74032ddf255b4d1a5a2e mod_perl-1.27-r1.ebuild 1423
 MD5 8a0d2f0c7b7d8c36e2ddb832c504ed9f mod_perl-1.27-r2.ebuild 1817
-MD5 a366c1cb1f861c8f0041d9ce4e210698 mod_perl-1.99.10.ebuild 3824
-MD5 e48765f4129ef6e27824df62a47fd14a mod_perl-1.29.ebuild 2470
 MD5 883e4913a359e585ff84d4f53f629035 mod_perl-1.27-r4.ebuild 2179
+MD5 c614eea076228afa05a30a7f0dbadf2a mod_perl-1.27.ebuild 1417
+MD5 e48765f4129ef6e27824df62a47fd14a mod_perl-1.29.ebuild 2470
 MD5 a1141c430c0b7356ce812dd1bfd8854a mod_perl-1.99.08.ebuild 1237
-MD5 bfb9cdc72acb74032ddf255b4d1a5a2e mod_perl-1.27-r1.ebuild 1423
-MD5 d457a0f05eca260a1ad16066bac7883f ChangeLog 5305
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 b101308b1017072f3d62def1ed834ab1 mod_perl-1.99.09.ebuild 3673
+MD5 a366c1cb1f861c8f0041d9ce4e210698 mod_perl-1.99.10.ebuild 3824
 MD5 0525b089ad91f31dffd83c0d1300ffc4 mod_perl-1.99.11.ebuild 3783
-MD5 e749acb150e339917257be38febb568e files/mod_perl-1.99.10-nonukes.patch 777
+MD5 2415e6be73ba155382b34b5e2fad4951 files/75_mod_perl.conf 247
+MD5 39a4d91d1d90d32f90dea3c00a1680d7 files/apache2-mod_perl-startup.pl 483
+MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27 65
 MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r1 65
 MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r2 65
 MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r4 65
+MD5 33270eaaa2c9bc9cef3a4a45afaeca34 files/digest-mod_perl-1.29 65
 MD5 4869c6ea8e02d871a03455d28b6f6cfb files/digest-mod_perl-1.99.08 68
 MD5 5fb9123a821e261a210c5fca0ff94976 files/digest-mod_perl-1.99.09 68
 MD5 5ff16293368688eefecc4a6066eb8914 files/digest-mod_perl-1.99.10 69
 MD5 278c6266498d8bef49b54f30774aa305 files/digest-mod_perl-1.99.11 69
-MD5 39a4d91d1d90d32f90dea3c00a1680d7 files/apache2-mod_perl-startup.pl 483
-MD5 2415e6be73ba155382b34b5e2fad4951 files/75_mod_perl.conf 247
-MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27 65
-MD5 33270eaaa2c9bc9cef3a4a45afaeca34 files/digest-mod_perl-1.29 65
 MD5 1e0341f9b7bd3c3f74c25e60eb3188c8 files/mod_perl-1.27-ipv6.patch 1207
+MD5 e749acb150e339917257be38febb568e files/mod_perl-1.99.10-nonukes.patch 777
+MD5 1e0341f9b7bd3c3f74c25e60eb3188c8 files/mod_perl-1.29-ipv6.patch 1207
diff --git a/dev-perl/mod_perl/files/mod_perl-1.29-ipv6.patch b/dev-perl/mod_perl/files/mod_perl-1.29-ipv6.patch
new file mode 100644
index 000000000000..d11d61a6b7c8
--- /dev/null
+++ b/dev-perl/mod_perl/files/mod_perl-1.29-ipv6.patch
@@ -0,0 +1,29 @@
+diff -ru mod_perl-1.27+ipv6/src/modules/perl/Connection.xs mod_perl-1.27/src/modules/perl/Connection.xs
+--- mod_perl-1.27/src/modules/perl/Connection.xs	Fri Sep 29 16:41:30 2000
++++ mod_perl-1.27+ipv6/src/modules/perl/Connection.xs	Sun Aug 25 23:02:42 2002
+@@ -78,13 +78,14 @@
+     RETVAL = newSVpv((char *)&conn->remote_addr,
+                       sizeof conn->remote_addr);
+     if(sv_addr) {
+-        struct sockaddr_in addr; 
++        struct sockaddr_storage addr; 
+         STRLEN sockaddrlen; 
+         char * new_addr = SvPV(sv_addr,sockaddrlen); 
+         if (sockaddrlen != sizeof(addr)) { 
+             croak("Bad arg length for remote_addr, length is %d, should be %d", 		  sockaddrlen, sizeof(addr)); 
+         } 
+-        Copy(new_addr, &addr, sizeof addr, char); 
++	memset(&addr, 0, sizeof addr);
++        Copy(new_addr, &addr, sizeof new_addr, char); 
+         conn->remote_addr = addr;
+     }
+ 
+@@ -106,7 +107,7 @@
+ #else
+         conn->remote_ip = pstrdup(conn->pool, (char *)SvPV(ST(1),na));
+ #endif
+-        conn->remote_addr.sin_addr.s_addr = inet_addr(conn->remote_ip);
++	((struct sockaddr_in *) &conn->remote_addr)->sin_addr.s_addr = inet_addr(conn->remote_ip);
+     }
+ 
+     OUTPUT: