Added AcceptMutex fixes for sparcs for bug #7172.

7 files changed, 85 insertions, 36 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 2e95dd821397..90bc04542079 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.65 2003/07/27 00:20:00 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.66 2003/08/25 19:16:35 weeve Exp $
+
+  25 Aug 2003; Jason Wever <weeve@gentoo.org> apache-1.3.27-r3.ebuild,
+  apache-1.3.27-r4.ebuild, apache-1.3.28.ebuild, apache-2.0.46.ebuild,
+  apache-2.0.47.ebuild:
+  Added AcceptMutex fixes for sparcs for bug #7172.
 
   26 Jul 2003; Donny Davies <woodchip@gentoo.org> apache-1.3.28.ebuild:
   Fix #25212.  Mark x86 stable.
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 5ff6858d9ac1..0252fd9c2e94 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,49 +1,49 @@
-MD5 e4c89cfcf1223c75beeacec2e0746c29 apache-1.3.27-r3.ebuild 7684
-MD5 8afcec2a5befb8e3acecbb8c331609fd apache-2.0.47.ebuild 10901
-MD5 68577ecb33c3e19d018ccef5e00eba3e ChangeLog 12729
-MD5 bc346584eda108f19ef85b2d37116c28 apache-1.3.27-r4.ebuild 8450
-MD5 a7458ed5767fc5c98da4ee652d7574be apache-2.0.46.ebuild 10474
-MD5 ec89371a5fb3d4fd6e3884740fee8e7d apache-1.3.28.ebuild 8671
-MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
-MD5 97c7a2efed7a3fd05614167426c495d9 files/apache-builtin-mods 2465
-MD5 10be9409287dd5848fd675c1d96d0f7c files/digest-apache-1.3.27-r3 211
-MD5 21c6ed7e53ea9fc80f4634cbf37b2bc6 files/digest-apache-1.3.27-r4 303
-MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
+MD5 4ae22b17d15b2875b593e660b938f4ab ChangeLog 12945
+MD5 85bf196b2f8f56f3719d6bfb33cf5824 apache-1.3.27-r3.ebuild 7957
+MD5 e336220612be98e8f5a45890cf89ae33 apache-1.3.27-r4.ebuild 8720
+MD5 19e4f731c957155e698f06b0470414fe apache-1.3.28.ebuild 8892
+MD5 9fc6f21b176feeea4b7d29abdf641605 apache-2.0.46.ebuild 10750
+MD5 2a601e3e6540e7d8ab1238cb6af8e912 apache-2.0.47.ebuild 11175
+MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
 MD5 3f87dcb9d5abca78bc68a3825f331087 files/apache-1.3.27_db4_gentoo.patch 812
 MD5 f2c60b199c12729b25716ed451a24e38 files/apache-2.0.44-gentoo.diff 4895
+MD5 9dc40e1918a2d30a578ebf1653f7182c files/apache-2.0.45-gentoo.diff 5448
+MD5 c8c70224d0f41de7f02387f13911e539 files/apache-2.0.46-gentoo.diff 3963
+MD5 97c7a2efed7a3fd05614167426c495d9 files/apache-builtin-mods 2465
+MD5 df1290566bb25603dbe5a649daec5185 files/apache.confd 1012
 MD5 b521110a970b3b41c1499596a59713fb files/apache.rc6 1020
-MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
-MD5 8d790bf68c47c08951c761815cd66a1c files/apachelogserverstatus 4763
-MD5 df54361aa8754197cf3bafe99d32c7ec files/robots.txt 340
 MD5 02db12f0d91e1f89e0b173fea6c5151d files/apacheaddmod 5977
 MD5 bae4b9d941cd38a32943533e958aa1b3 files/apachedelmod 3185
-MD5 9dc40e1918a2d30a578ebf1653f7182c files/apache-2.0.45-gentoo.diff 5448
-MD5 f11a5046372c128afa033b7fbc787dd9 files/digest-apache-1.3.28 211
+MD5 8d790bf68c47c08951c761815cd66a1c files/apachelogserverstatus 4763
 MD5 a90bef6fb0fb6d05f74c36eaf26285d6 files/apachesplitlogfile 4959
+MD5 10be9409287dd5848fd675c1d96d0f7c files/digest-apache-1.3.27-r3 211
+MD5 21c6ed7e53ea9fc80f4634cbf37b2bc6 files/digest-apache-1.3.27-r4 303
+MD5 f11a5046372c128afa033b7fbc787dd9 files/digest-apache-1.3.28 211
 MD5 b1b73cd67ed116ce0f9c973eeff9fbdf files/digest-apache-2.0.46 65
 MD5 78ec0e944bbdb4246ed75478e6d8e52a files/digest-apache-2.0.47 65
-MD5 c8c70224d0f41de7f02387f13911e539 files/apache-2.0.46-gentoo.diff 3963
-MD5 df1290566bb25603dbe5a649daec5185 files/apache.confd 1012
-MD5 f440f0a32308bc9dc9d9acd041c8b6c5 files/conf/apache.conf 7247
-MD5 e68da4777c0641e3bc5b284ee7f6fcf2 files/conf/commonapache.conf 22140
-MD5 c774e0c7ddc6d55bddc164a9b5af0cb6 files/conf/VirtualHomePages.conf 907
-MD5 f820076adb31912c060052154d08eecb files/conf/Vhosts.conf 1909
-MD5 fd9b211c5078739d4aadbe6b3e53aead files/conf/DynamicVhosts.conf 963
+MD5 df54361aa8754197cf3bafe99d32c7ec files/robots.txt 340
+MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
+MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
 MD5 14aebf386646fe7ab2623dad993a32fa files/2.0.40/40_mod_ssl.conf 3420
+MD5 8ce666f3b8ad3ed00c081dc29e19fe90 files/2.0.40/41_mod_ssl.default-vhost.conf 8039
 MD5 819ee444395cf42ccc8009529a94af37 files/2.0.40/45_mod_dav.conf 583
 MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.40/46_mod_ldap.conf 902
+MD5 e14a1f0add1f5400e97cc6df5ad84429 files/2.0.40/apache2-builtin-mods 2230
+MD5 8203712c2d827475922d031ffb4061d4 files/2.0.40/apache2.conf 7643
+MD5 97cdfe2abbfdc3fa55671c54e726123b files/2.0.40/apache2.confd 775
+MD5 a50cd3bc27ab7007fc5730f916fc969d files/2.0.40/apache2.initd 1120
 MD5 b610d37fd521de1f8fc782069e165969 files/2.0.40/apache2logserverstatus 4652
 MD5 a14d8565fd5ca2b5753799477a85b1af files/2.0.40/apache2splitlogfile 4844
-MD5 e14a1f0add1f5400e97cc6df5ad84429 files/2.0.40/apache2-builtin-mods 2230
+MD5 3c758c167d3aad7ed29b65e9ee565126 files/2.0.40/commonapache2.conf 30925
+MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.40/dynamic-vhosts.conf 840
 MD5 b335411e582a8fd58aacf2f35e75291f files/2.0.40/gentestcrt.sh 8805
 MD5 9375735d739344987fe4b2a3990de273 files/2.0.40/highperformance.conf 1959
 MD5 5c47dec8c730edf1cb755b581327bd49 files/2.0.40/httpd.conf 35481
 MD5 0055923f696c9ba3be7eeb5518603d40 files/2.0.40/ssl.conf 11082
-MD5 8ce666f3b8ad3ed00c081dc29e19fe90 files/2.0.40/41_mod_ssl.default-vhost.conf 8039
-MD5 3c758c167d3aad7ed29b65e9ee565126 files/2.0.40/commonapache2.conf 30925
-MD5 97cdfe2abbfdc3fa55671c54e726123b files/2.0.40/apache2.confd 775
-MD5 a50cd3bc27ab7007fc5730f916fc969d files/2.0.40/apache2.initd 1120
-MD5 8203712c2d827475922d031ffb4061d4 files/2.0.40/apache2.conf 7643
 MD5 548304216950e0192bf40ae0f5ace370 files/2.0.40/vhosts.conf 1683
 MD5 b69bf7c3126e471a2abff013e716367f files/2.0.40/virtual-homepages.conf 780
-MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.40/dynamic-vhosts.conf 840
+MD5 fd9b211c5078739d4aadbe6b3e53aead files/conf/DynamicVhosts.conf 963
+MD5 f820076adb31912c060052154d08eecb files/conf/Vhosts.conf 1909
+MD5 c774e0c7ddc6d55bddc164a9b5af0cb6 files/conf/VirtualHomePages.conf 907
+MD5 f440f0a32308bc9dc9d9acd041c8b6c5 files/conf/apache.conf 7247
+MD5 e68da4777c0641e3bc5b284ee7f6fcf2 files/conf/commonapache.conf 22140
diff --git a/net-www/apache/apache-1.3.27-r3.ebuild b/net-www/apache/apache-1.3.27-r3.ebuild
index 6cbf68359729..ae3586ca26bd 100644
--- a/net-www/apache/apache-1.3.27-r3.ebuild
+++ b/net-www/apache/apache-1.3.27-r3.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-www/apache/apache-1.3.27-r3.ebuild,v 1.4 2003/03/26 09:56:41 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.27-r3.ebuild,v 1.5 2003/08/25 19:16:35 weeve Exp $
 
 mod_ssl_ver=2.8.14-${PV}
 
@@ -172,6 +172,15 @@ src_install() {
 	insinto /etc/apache/conf
 	doins ${FILESDIR}/conf/commonapache.conf
 	doins ${FILESDIR}/conf/apache.conf
+	
+        # Added by Jason Wever <weeve@gentoo.org>
+        # A little sedfu to fix bug #7172 for sparc64s
+        if [ ${ARCH} = "sparc" ]
+        then
+                sed -i -e '15a\AcceptMutex fcntl' \
+                        ${D}/etc/apache/conf/apache.conf
+        fi
+	
 			
 	insinto /etc/apache/conf/vhosts
 	doins ${FILESDIR}/conf/VirtualHomePages.conf
diff --git a/net-www/apache/apache-1.3.27-r4.ebuild b/net-www/apache/apache-1.3.27-r4.ebuild
index 72d2af6a2664..804943194c5b 100644
--- a/net-www/apache/apache-1.3.27-r4.ebuild
+++ b/net-www/apache/apache-1.3.27-r4.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-www/apache/apache-1.3.27-r4.ebuild,v 1.9 2003/07/16 14:32:22 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.27-r4.ebuild,v 1.10 2003/08/25 19:16:35 weeve Exp $
 
 IUSE="ipv6 pam"
 
@@ -190,6 +190,14 @@ src_install() {
 	doins ${FILESDIR}/conf/commonapache.conf
 	doins ${FILESDIR}/conf/apache.conf
 
+        # Added by Jason Wever <weeve@gentoo.org>
+        # A little sedfu to fix bug #7172 for sparc64s
+        if [ ${ARCH} = "sparc" ]
+        then
+                sed -i -e '15a\AcceptMutex fcntl' \
+                        ${D}/etc/apache/conf/apache.conf
+        fi
+
 	insinto /etc/apache/conf/vhosts
 	doins ${FILESDIR}/conf/VirtualHomePages.conf
 	doins ${FILESDIR}/conf/DynamicVhosts.conf
diff --git a/net-www/apache/apache-1.3.28.ebuild b/net-www/apache/apache-1.3.28.ebuild
index 716ba5e0ad72..9a92767097b7 100644
--- a/net-www/apache/apache-1.3.28.ebuild
+++ b/net-www/apache/apache-1.3.28.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-www/apache/apache-1.3.28.ebuild,v 1.3 2003/07/27 00:20:00 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.28.ebuild,v 1.4 2003/08/25 19:16:35 weeve Exp $
 
 #IUSE="ipv6 pam"
 IUSE="pam"
@@ -197,6 +197,15 @@ src_install() {
 	doins ${FILESDIR}/conf/commonapache.conf
 	doins ${FILESDIR}/conf/apache.conf
 
+        # Added by Jason Wever <weeve@gentoo.org>
+        # A little sedfu to fix bug #7172 for sparc64s
+	if [ ${ARCH} = "sparc" ]
+	then
+        	sed -i -e '15a\AcceptMutex fcntl' \
+			${D}/etc/apache/conf/apache.conf
+	fi
+
+
 	insinto /etc/apache/conf/vhosts
 	doins ${FILESDIR}/conf/VirtualHomePages.conf
 	doins ${FILESDIR}/conf/DynamicVhosts.conf
diff --git a/net-www/apache/apache-2.0.46.ebuild b/net-www/apache/apache-2.0.46.ebuild
index 51a87ca3b631..1c94951f65d7 100644
--- a/net-www/apache/apache-2.0.46.ebuild
+++ b/net-www/apache/apache-2.0.46.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-www/apache/apache-2.0.46.ebuild,v 1.4 2003/07/13 21:44:10 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.46.ebuild,v 1.5 2003/08/25 19:16:35 weeve Exp $
 
 inherit eutils
 
@@ -280,6 +280,15 @@ src_install () {
 	doins ${FILESDIR}/2.0.40/virtual-homepages.conf
 	doins ${FILESDIR}/2.0.40/dynamic-vhosts.conf
 	doins ${FILESDIR}/2.0.40/vhosts.conf
+
+        # Added by Jason Wever <weeve@gentoo.org>
+        # A little sedfu to fix bug #7172 for sparc64s
+        if [ ${ARCH} = "sparc" ]
+        then
+                sed -i -e '13a\AcceptMutex fcntl' \
+                        ${D}/etc/apache2/conf/apache2.conf
+        fi
+
 }
 
 parse_modules_config() {
diff --git a/net-www/apache/apache-2.0.47.ebuild b/net-www/apache/apache-2.0.47.ebuild
index 574085a5b75c..2cb725d19d99 100644
--- a/net-www/apache/apache-2.0.47.ebuild
+++ b/net-www/apache/apache-2.0.47.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-www/apache/apache-2.0.47.ebuild,v 1.6 2003/08/14 19:21:49 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.47.ebuild,v 1.7 2003/08/25 19:16:35 weeve Exp $
 
 inherit flag-o-matic
 has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -281,6 +281,15 @@ src_install () {
 	doins ${FILESDIR}/2.0.40/virtual-homepages.conf
 	doins ${FILESDIR}/2.0.40/dynamic-vhosts.conf
 	doins ${FILESDIR}/2.0.40/vhosts.conf
+
+        # Added by Jason Wever <weeve@gentoo.org>
+        # A little sedfu to fix bug #7172 for sparc64s
+        if [ ${ARCH} = "sparc" ]
+        then
+                sed -i -e '13a\AcceptMutex fcntl' \
+                        ${D}/etc/apache2/conf/apache2.conf
+        fi
+
 }
 
 parse_modules_config() {