Fixed ipv6 error on listen,closes #32389.

8 files changed, 70 insertions, 12 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 7e8c4a36c324..46150de11b9d 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.117 2004/04/04 22:15:53 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.118 2004/04/06 01:02:27 zul Exp $
+
+  05 Apr 2004; Chuck Short <zul@gentoo.org> apache-2.0.48-r1.ebuild,
+  apache-2.0.48-r2.ebuild, apache-2.0.48-r3.ebuild, apache-2.0.48-r4.ebuild,
+  apache-2.0.48.ebuild, files/httpd-2.0.48-ipv6.patch:
+  Fixed IPV6 start error. IPV6 works as expected under 2.0.48. Closes #32389.
 
   04 Apr 2004; Chuck Short <zul@gentoo.org> files/apache.confd,
   files/apache.rc6:
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 8e2ad3c7451b..541c725aea4f 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,14 +1,14 @@
-MD5 7bab5c5e1d35878f5ece30ce8e091292 apache-2.0.48.ebuild 11293
-MD5 a26d7272e8bb71a11b039b26bc453e14 apache-2.0.48-r2.ebuild 12009
+MD5 cd47b51b7979fa0b46c01578219ba76c apache-2.0.48.ebuild 11370
+MD5 5ad01b8344f0137bc2e5e6f87e1109af apache-2.0.48-r2.ebuild 12128
 MD5 550ad9c89cc83883b979d5064f7a04f0 apache-1.3.27-r3.ebuild 7653
-MD5 0356ad3c8c8f98aab312d3c45226f9a0 apache-2.0.48-r4.ebuild 12284
+MD5 10e4a9049e606b4014c2873749420ddf apache-2.0.48-r4.ebuild 12358
 MD5 19e2b87577db3ad3bfa74c554f3a27a9 apache-2.0.47.ebuild 11473
 MD5 c9b77db193d034968ab8287d4b625a80 apache-1.3.29.ebuild 7382
 MD5 bab1a33028c74eb9d3f71294e8816126 apache-1.3.29-r1.ebuild 7413
-MD5 dcd66758c6c1536d6b0ad001be8d98de apache-2.0.48-r1.ebuild 11663
+MD5 483eea3ec70ffb7c4a68c3e26ba4314e apache-2.0.48-r1.ebuild 11783
 MD5 316637e1a71f080e0f027db9ddf1683f apache-2.0.49.ebuild 12677
-MD5 0c605a3397eed2626b9170fa2d3c0662 apache-2.0.48-r3.ebuild 12061
-MD5 aff1a3c5c202b5cf79db39605ae19a43 ChangeLog 22162
+MD5 3c4fe9c2702e37b9397769d6b7d4fb56 apache-2.0.48-r3.ebuild 12181
+MD5 c7c96e73b07a891af20c11373fd61385 ChangeLog 22442
 MD5 ec841d27e5613d0aae57ddf2083a7597 apache-1.3.28-r1.ebuild 7671
 MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
 MD5 b4580094775cde0d53605e4c036ec191 apache-2.0.47-r1.ebuild 10759
@@ -51,6 +51,7 @@ MD5 78ec0e944bbdb4246ed75478e6d8e52a files/digest-apache-2.0.47 65
 MD5 4cc91d25cf4117b8db0fec344bebec4d files/digest-apache-2.0.48 65
 MD5 3a7818b24f0952694c7b878ba3d8e79a files/digest-apache-2.0.49 65
 MD5 c8c70224d0f41de7f02387f13911e539 files/apache-2.0.46-gentoo.diff 3963
+MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
 MD5 17aee0f7a9de0f390fa046bc82436309 files/apache.confd 998
 MD5 a7f15bdba3786353deb7bfaf8de0efb9 files/conf/apache.conf 8115
 MD5 75e88ab5a3193fe8ff31c09f5bae2c09 files/conf/commonapache.conf 22175
diff --git a/net-www/apache/apache-2.0.48-r1.ebuild b/net-www/apache/apache-2.0.48-r1.ebuild
index 10759bb6f9e1..41759348fc73 100644
--- a/net-www/apache/apache-2.0.48-r1.ebuild
+++ b/net-www/apache/apache-2.0.48-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48-r1.ebuild,v 1.7 2004/01/15 03:55:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48-r1.ebuild,v 1.8 2004/04/06 01:02:27 zul Exp $
 
 inherit flag-o-matic
 has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -32,6 +32,13 @@ src_unpack() {
 	cd ${S} || die
 	patch -p1 <${FILESDIR}/apache-2.0.48-gentoo.diff || die
 
+
+	# Fixes ipv6 error message when apache starts
+	if use ipv6
+	then
+		epatch ${FILESDIR}/httpd-2.0.48-ipv6.patch || die
+	fi
+
 	#avoid utf-8 charset problems
 	export LC_CTYPE=C
 
diff --git a/net-www/apache/apache-2.0.48-r2.ebuild b/net-www/apache/apache-2.0.48-r2.ebuild
index 1bfdfa505a57..0447ffffd97a 100644
--- a/net-www/apache/apache-2.0.48-r2.ebuild
+++ b/net-www/apache/apache-2.0.48-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48-r2.ebuild,v 1.2 2004/01/15 03:55:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48-r2.ebuild,v 1.3 2004/04/06 01:02:27 zul Exp $
 
 inherit flag-o-matic
 has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -32,6 +32,12 @@ src_unpack() {
 	cd ${S} || die
 	patch -p1 <${FILESDIR}/apache-2.0.48-gentoo.diff || die
 
+	# Fixes ipv6 error message when apache starts
+	if use ipv6
+	then
+		epatch ${FILESDIR}/httpd-2.0.48-ipv6.patch || die
+	fi
+
 	#avoid utf-8 charset problems
 	export LC_CTYPE=C
 
diff --git a/net-www/apache/apache-2.0.48-r3.ebuild b/net-www/apache/apache-2.0.48-r3.ebuild
index c92900d6b8ba..31a1cc934d5f 100644
--- a/net-www/apache/apache-2.0.48-r3.ebuild
+++ b/net-www/apache/apache-2.0.48-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48-r3.ebuild,v 1.2 2004/01/29 08:04:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48-r3.ebuild,v 1.3 2004/04/06 01:02:27 zul Exp $
 
 inherit flag-o-matic eutils
 has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -33,6 +33,12 @@ src_unpack() {
 	patch -p1 <${FILESDIR}/apache-2.0.48-gentoo.diff || die
 	epatch ${FILESDIR}/apache-2.0.48-export.diff
 
+	# Fixes ipv6 error message when apache starts
+	if use ipv6
+	then
+		epatch ${FILESDIR}/httpd-2.0.48-ipv6.patch || die
+	fi
+
 	#avoid utf-8 charset problems
 	export LC_CTYPE=C
 
diff --git a/net-www/apache/apache-2.0.48-r4.ebuild b/net-www/apache/apache-2.0.48-r4.ebuild
index 7d934a12fa0c..4cbe0cb206ef 100644
--- a/net-www/apache/apache-2.0.48-r4.ebuild
+++ b/net-www/apache/apache-2.0.48-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48-r4.ebuild,v 1.4 2004/03/28 22:38:30 randy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48-r4.ebuild,v 1.5 2004/04/06 01:02:27 zul Exp $
 
 inherit flag-o-matic eutils
 has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -33,6 +33,11 @@ src_unpack() {
 	patch -p1 <${FILESDIR}/apache-2.0.48-gentoo.diff || die
 	epatch ${FILESDIR}/apache-2.0.48-export.diff
 
+	if use ipv6
+	then
+		epatch ${FILESDIR}/httpd-2.0.48-ipv6.patch || die
+	fi
+
 	#avoid utf-8 charset problems
 	export LC_CTYPE=C
 
diff --git a/net-www/apache/apache-2.0.48.ebuild b/net-www/apache/apache-2.0.48.ebuild
index 7904130a37df..20c8cb4c8dd1 100644
--- a/net-www/apache/apache-2.0.48.ebuild
+++ b/net-www/apache/apache-2.0.48.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48.ebuild,v 1.5 2004/04/04 01:52:12 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48.ebuild,v 1.6 2004/04/06 01:02:27 zul Exp $
 
 inherit flag-o-matic
 has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -32,6 +32,11 @@ src_unpack() {
 	cd ${S} || die
 	patch -p1 <${FILESDIR}/apache-2.0.48-gentoo.diff || die
 
+	if use ipv6
+	then
+	  epatch ${FILESDIR}/httpd-2.0.48-ipv6.patch || die
+	fi
+
 	#avoid utf-8 charset problems
 	export LC_CTYPE=C
 
diff --git a/net-www/apache/files/httpd-2.0.48-ipv6.patch b/net-www/apache/files/httpd-2.0.48-ipv6.patch
new file mode 100644
index 000000000000..1e7b3dedd8c6
--- /dev/null
+++ b/net-www/apache/files/httpd-2.0.48-ipv6.patch
@@ -0,0 +1,23 @@
+--- httpd-2.0.48/server/.orig/listen.c	2003-12-10 11:40:28.000000000 -0600
++++ httpd-2.0.48/server/listen.c	2003-12-10 11:41:26.000000000 -0600
+@@ -117,20 +117,6 @@
+         return stat;
+     }
+ 
+-#if APR_HAVE_IPV6
+-    if (server->bind_addr->family == APR_INET6) {
+-        stat = apr_socket_opt_set(s, APR_IPV6_V6ONLY, v6only_setting);
+-        if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
+-            ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p,
+-                          "make_sock: for address %pI, apr_socket_opt_set: "
+-                          "(IPV6_V6ONLY)",
+-                          server->bind_addr);
+-            apr_socket_close(s);
+-            return stat;
+-        }
+-    }
+-#endif
+-
+     /*
+      * To send data over high bandwidth-delay connections at full
+      * speed we must force the TCP window to open wide enough to keep the