1.27-r2 initial commit, fixes bug #6986

4 files changed, 116 insertions, 1 deletions

diff --git a/dev-perl/mod_perl/ChangeLog b/dev-perl/mod_perl/ChangeLog
index d1264f4244eb..d5052066e46e 100644
--- a/dev-perl/mod_perl/ChangeLog
+++ b/dev-perl/mod_perl/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-perl/mod_perl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/ChangeLog,v 1.15 2003/02/12 06:28:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/ChangeLog,v 1.16 2003/03/01 17:53:39 rac Exp $
+
+*mod_perl-1.27-r2 (01 Mar 2003)
+
+  01 Mar 2003; Robert Coie <rac@gentoo.org> mod_perl-1.27-r2.ebuild,
+  files/mod_perl-1.27-ipv6.patch:
+  Add patch originally from
+  http://pasky.ji.cz/~pasky/dev/apache/mod_perl-1.27+ipv6.patch, to
+  allow building against an IPv6-enabled Apache (bug #6986).  Changed
+  dependency on Apache to be >=1.3.27-r4, as that is the first version
+  in which the ipv6 USE variable is employed by the Apache ebuild, and
+  that is necessary for this patch to operate correctly.
 
   24 Jan 2003; <woodchip@gentoo.org> mod_perl-1.99.08 : version bump; #14503.
 
diff --git a/dev-perl/mod_perl/files/digest-mod_perl-1.27-r2 b/dev-perl/mod_perl/files/digest-mod_perl-1.27-r2
new file mode 100644
index 000000000000..100b74cf1c13
--- /dev/null
+++ b/dev-perl/mod_perl/files/digest-mod_perl-1.27-r2
@@ -0,0 +1 @@
+MD5 bd07f4f1065eb0d0a8d8004219357d8c mod_perl-1.27.tar.gz 372525
diff --git a/dev-perl/mod_perl/files/mod_perl-1.27-ipv6.patch b/dev-perl/mod_perl/files/mod_perl-1.27-ipv6.patch
new file mode 100644
index 000000000000..d11d61a6b7c8
--- /dev/null
+++ b/dev-perl/mod_perl/files/mod_perl-1.27-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:
diff --git a/dev-perl/mod_perl/mod_perl-1.27-r2.ebuild b/dev-perl/mod_perl/mod_perl-1.27-r2.ebuild
new file mode 100644
index 000000000000..6d818b2386d1
--- /dev/null
+++ b/dev-perl/mod_perl/mod_perl-1.27-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/mod_perl-1.27-r2.ebuild,v 1.1 2003/03/01 17:53:40 rac Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="A Perl Module for Apache"
+SRC_URI="http://perl.apache.org/dist/${P}.tar.gz"
+HOMEPAGE="http://perl.apache.org"
+
+SLOT="0"
+LICENSE="Apache-1.1 as-is"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+DEPEND="sys-devel/perl dev-perl/libwww-perl >=net-www/apache-1.3.27-r4"
+
+IUSE="ipv6"
+
+inherit eutils
+
+src_unpack() {
+	unpack ${A}
+
+	if [ "`use ipv6`" ]
+	then	
+		# This patch originally came from
+		# http://pasky.ji.cz/~pasky/dev/apache/mod_perl-1.27+ipv6.patch.
+		# It allows mod_perl to correctly build with an IPv6-enabled
+		# Apache (bug #6986).
+		# Robert Coie <rac@gentoo.org> 2002.02.19
+
+		cd ${S}; epatch ${FILESDIR}/${P}-ipv6.patch
+	fi
+}
+
+src_compile() {
+	perl Makefile.PL USE_APXS=1 \
+		PREFIX=${D}/usr	\
+		WITH_APXS=/usr/sbin/apxs EVERYTHING=1
+
+	cp Makefile Makefile.orig
+	sed -e "s:apxs_install doc_install:doc_install:" Makefile.orig > Makefile
+	emake || die
+}
+
+src_install () {
+	make \
+		PREFIX=${D}/usr	\
+		INSTALLMAN1DIR=${D}/usr/share/man/man1	\
+		INSTALLMAN3DIR=${D}/usr/share/man/man3	\
+		install || die
+
+	dodoc Changes CREDITS MANIFEST README SUPPORT ToDo
+	dohtml -r ./
+
+	cd apaci
+	exeinto /usr/lib/apache-extramodules
+	doexe libperl.so
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
+	einfo "to have your apache.conf auto-updated for use with this module."
+	einfo "You should then edit your /etc/conf.d/apache file to suit."
+	einfo
+}
+
+pkg_config() {
+	${ROOT}/usr/sbin/apacheaddmod \
+		${ROOT}/etc/apache/conf/apache.conf \
+		extramodules/libperl.so mod_perl.c perl_module \
+		define=PERL
+	:;
+}