apache 1.3.29-r1 moved to stable on all arches irt GLSA 200310-03 (bug 32361)

3 files changed, 48 insertions, 45 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 565daf55e210..653555744296 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,7 +1,10 @@
 # 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.82 2003/11/16 23:29:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.83 2003/11/20 00:48:29 drobbins Exp $
 
+  19 Nov 2003; Daniel Robbins <drobbins@gentoo.org> apache-1.3.29-r1.ebuild:
+  unmasking on all arches so we can get out the much-delayed GLSA 200310-03.
+  
   16 Nov 2003; Aron Griffis <agriffis@gentoo.org> apache-2.0.48-r1.ebuild:
   Stable on alpha
 
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index b62e8d42f445..216aacb4b276 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,65 +1,65 @@
-MD5 f6403adbd29189323d077c5f99061d71 ChangeLog 16273
+MD5 bfe3bdf50a9328e0e90060cbbaf4b624 apache-2.0.48.ebuild 11153
 MD5 246f3d374581e892615e2e5c8cb59e2a apache-1.3.27-r3.ebuild 7884
-MD5 d4bfc120696457a6084e949b99d045ac apache-1.3.27-r4.ebuild 8913
-MD5 09fa626c00f029bdfb266b1e5d16193e apache-1.3.28-r1.ebuild 7905
-MD5 c8e565da1b91536d92e4e2a3001400a5 apache-1.3.28.ebuild 9135
-MD5 b120a9200fe6b38b82e23e27ece40a12 apache-1.3.29-r1.ebuild 7545
+MD5 03c997dee35fcd0c56d77294ef557ab0 apache-2.0.47.ebuild 11434
 MD5 18cb8436ab1b04381c78c9f9b5b6fc48 apache-1.3.29.ebuild 7503
-MD5 2785b7e11adc2c240c5fca3d2d4cfb67 apache-2.0.46.ebuild 11012
+MD5 1d026a5b169ff5418ed28e8f246c5546 apache-1.3.29-r1.ebuild 7538
+MD5 eb6a93a16e6012996203adf494b76b52 apache-2.0.48-r1.ebuild 11163
+MD5 82a59ee615648e462df7b24267df8a06 ChangeLog 16430
+MD5 09fa626c00f029bdfb266b1e5d16193e apache-1.3.28-r1.ebuild 7905
 MD5 bd80c41f0d8d92374c3712c4cac4d2ff metadata.xml 503
 MD5 235d2261cabdf2fbf72bee4b0ddd519f apache-2.0.47-r1.ebuild 10711
-MD5 03c997dee35fcd0c56d77294ef557ab0 apache-2.0.47.ebuild 11434
-MD5 eb6a93a16e6012996203adf494b76b52 apache-2.0.48-r1.ebuild 11163
-MD5 bfe3bdf50a9328e0e90060cbbaf4b624 apache-2.0.48.ebuild 11153
+MD5 d4bfc120696457a6084e949b99d045ac apache-1.3.27-r4.ebuild 8913
+MD5 2785b7e11adc2c240c5fca3d2d4cfb67 apache-2.0.46.ebuild 11012
+MD5 c8e565da1b91536d92e4e2a3001400a5 apache-1.3.28.ebuild 9135
+MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
+MD5 399e3c15e2afa45a732faed0df6b1a30 files/apache-1.3.28-zombie-cgi.patch 940
+MD5 86dc760b13645d25565a874a6d3b890e files/apache-2.0.47-gentoo.diff 3609
 MD5 97c7a2efed7a3fd05614167426c495d9 files/apache-builtin-mods 2465
-MD5 df1290566bb25603dbe5a649daec5185 files/apache.confd 1012
+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-r1 211
+MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r1 211
+MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
+MD5 78ec0e944bbdb4246ed75478e6d8e52a files/digest-apache-2.0.47-r1 65
+MD5 4cc91d25cf4117b8db0fec344bebec4d files/digest-apache-2.0.48-r1 65
+MD5 5dbbb01b1f4e39ff052a49389caa76ed files/apache-1.3.27_db4_gentoo.patch 956
+MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905
+MD5 f2c60b199c12729b25716ed451a24e38 files/apache-2.0.44-gentoo.diff 4895
 MD5 eb130dcb9d5f084be37ba0e7e2089e51 files/apache.rc6 1057
+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 8d790bf68c47c08951c761815cd66a1c files/apachelogserverstatus 4763
+MD5 9dc40e1918a2d30a578ebf1653f7182c files/apache-2.0.45-gentoo.diff 5448
+MD5 f11a5046372c128afa033b7fbc787dd9 files/digest-apache-1.3.28 211
+MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29 211
 MD5 a90bef6fb0fb6d05f74c36eaf26285d6 files/apachesplitlogfile 4959
+MD5 b1b73cd67ed116ce0f9c973eeff9fbdf files/digest-apache-2.0.46 65
 MD5 78ec0e944bbdb4246ed75478e6d8e52a files/digest-apache-2.0.47 65
-MD5 f11a5046372c128afa033b7fbc787dd9 files/digest-apache-1.3.28 211
-MD5 df54361aa8754197cf3bafe99d32c7ec files/robots.txt 340
-MD5 78ec0e944bbdb4246ed75478e6d8e52a files/digest-apache-2.0.47-r1 65
-MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
-MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
-MD5 f2c60b199c12729b25716ed451a24e38 files/apache-2.0.44-gentoo.diff 4895
 MD5 4cc91d25cf4117b8db0fec344bebec4d files/digest-apache-2.0.48 65
-MD5 10be9409287dd5848fd675c1d96d0f7c files/digest-apache-1.3.27-r3 211
-MD5 21c6ed7e53ea9fc80f4634cbf37b2bc6 files/digest-apache-1.3.27-r4 303
-MD5 9dc40e1918a2d30a578ebf1653f7182c files/apache-2.0.45-gentoo.diff 5448
-MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29 211
 MD5 c8c70224d0f41de7f02387f13911e539 files/apache-2.0.46-gentoo.diff 3963
-MD5 b1b73cd67ed116ce0f9c973eeff9fbdf files/digest-apache-2.0.46 65
-MD5 5dbbb01b1f4e39ff052a49389caa76ed files/apache-1.3.27_db4_gentoo.patch 956
-MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
-MD5 86dc760b13645d25565a874a6d3b890e files/apache-2.0.47-gentoo.diff 3609
-MD5 399e3c15e2afa45a732faed0df6b1a30 files/apache-1.3.28-zombie-cgi.patch 940
-MD5 f11a5046372c128afa033b7fbc787dd9 files/digest-apache-1.3.28-r1 211
-MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905
-MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r1 211
-MD5 4cc91d25cf4117b8db0fec344bebec4d files/digest-apache-2.0.48-r1 65
+MD5 df1290566bb25603dbe5a649daec5185 files/apache.confd 1012
+MD5 df3796825b36f68131a9ab673297f692 files/conf/apache.conf 7238
+MD5 7f443a9cfecdb060ed53ddd8cb572316 files/conf/commonapache.conf 22169
+MD5 c774e0c7ddc6d55bddc164a9b5af0cb6 files/conf/VirtualHomePages.conf 907
+MD5 f820076adb31912c060052154d08eecb files/conf/Vhosts.conf 1909
+MD5 fd9b211c5078739d4aadbe6b3e53aead files/conf/DynamicVhosts.conf 963
 MD5 869ec17a0417518aa1d9d9566a958fb5 files/2.0.40/40_mod_ssl.conf 3185
-MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.40/41_mod_ssl.default-vhost.conf 8053
 MD5 819ee444395cf42ccc8009529a94af37 files/2.0.40/45_mod_dav.conf 583
 MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.40/46_mod_ldap.conf 902
-MD5 3dfd53805dfe77a12507c3af371dbeae files/2.0.40/apache2-builtin-mods 2213
-MD5 66bf65c4f0a2072d612b781599515807 files/2.0.40/apache2.conf 7649
-MD5 7648aa0e65d9bfd6ee5dc7109bc94fbc files/2.0.40/apache2.confd 784
-MD5 4df3a9c91545a3db51ebfa176484214a files/2.0.40/apache2.initd 1158
 MD5 b610d37fd521de1f8fc782069e165969 files/2.0.40/apache2logserverstatus 4652
 MD5 a14d8565fd5ca2b5753799477a85b1af files/2.0.40/apache2splitlogfile 4844
-MD5 9a54f9faa53622b7db4b7e119016c549 files/2.0.40/commonapache2.conf 31777
-MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.40/dynamic-vhosts.conf 840
+MD5 3dfd53805dfe77a12507c3af371dbeae files/2.0.40/apache2-builtin-mods 2213
 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 1d10cc98714a34ddc38525743c2989f9 files/2.0.40/41_mod_ssl.default-vhost.conf 8053
+MD5 9a54f9faa53622b7db4b7e119016c549 files/2.0.40/commonapache2.conf 31777
+MD5 7648aa0e65d9bfd6ee5dc7109bc94fbc files/2.0.40/apache2.confd 784
+MD5 4df3a9c91545a3db51ebfa176484214a files/2.0.40/apache2.initd 1158
+MD5 66bf65c4f0a2072d612b781599515807 files/2.0.40/apache2.conf 7649
 MD5 d9e0ecfbc1591486a698494a388b091c files/2.0.40/vhosts.conf 1695
 MD5 b69bf7c3126e471a2abff013e716367f files/2.0.40/virtual-homepages.conf 780
-MD5 fd9b211c5078739d4aadbe6b3e53aead files/conf/DynamicVhosts.conf 963
-MD5 f820076adb31912c060052154d08eecb files/conf/Vhosts.conf 1909
-MD5 c774e0c7ddc6d55bddc164a9b5af0cb6 files/conf/VirtualHomePages.conf 907
-MD5 df3796825b36f68131a9ab673297f692 files/conf/apache.conf 7238
-MD5 7f443a9cfecdb060ed53ddd8cb572316 files/conf/commonapache.conf 22169
+MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.40/dynamic-vhosts.conf 840
diff --git a/net-www/apache/apache-1.3.29-r1.ebuild b/net-www/apache/apache-1.3.29-r1.ebuild
index d337d27a8e5e..be15bc3b68b1 100644
--- a/net-www/apache/apache-1.3.29-r1.ebuild
+++ b/net-www/apache/apache-1.3.29-r1.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.29-r1.ebuild,v 1.1 2003/11/04 18:30:52 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.29-r1.ebuild,v 1.2 2003/11/20 00:48:29 drobbins Exp $
 
 #IUSE="ipv6 pam"
 IUSE="pam"
@@ -10,7 +10,7 @@ mod_ssl_ver=2.8.16
 S=${WORKDIR}/${PN}_${PV}
 DESCRIPTION="The Apache Web Server"
 HOMEPAGE="http://www.apache.org http://www.modssl.org"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm ~amd64"
+KEYWORDS="x86 ppc sparc alpha hppa arm amd64"
 SRC_URI="http://httpd.apache.org/dist/httpd/apache_${PV}.tar.gz
 	mirror://gentoo/${P}-gentoo.diff.bz2
 	ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}-${PV}.tar.gz"