summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonny Davies <woodchip@gentoo.org>2003-07-27 00:20:09 +0000
committerDonny Davies <woodchip@gentoo.org>2003-07-27 00:20:09 +0000
commit03b42333ad8cf6dc272291875988270ad35f6c42 (patch)
tree13290c612db0abb70b0922045fee63c5b8032b39 /net-www/apache
parentFix #25212. Mark x86 stable. (diff)
downloadgentoo-2-03b42333ad8cf6dc272291875988270ad35f6c42.tar.gz
gentoo-2-03b42333ad8cf6dc272291875988270ad35f6c42.tar.bz2
gentoo-2-03b42333ad8cf6dc272291875988270ad35f6c42.zip
Fix #25212. Mark x86 stable.
Diffstat (limited to 'net-www/apache')
-rw-r--r--net-www/apache/ChangeLog5
-rw-r--r--net-www/apache/Manifest4
-rw-r--r--net-www/apache/apache-1.3.28.ebuild10
3 files changed, 14 insertions, 5 deletions
diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index a9ce44301dba..2e95dd821397 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,9 @@
# 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.64 2003/07/24 23:15:16 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.65 2003/07/27 00:20:00 woodchip Exp $
+
+ 26 Jul 2003; Donny Davies <woodchip@gentoo.org> apache-1.3.28.ebuild:
+ Fix #25212. Mark x86 stable.
*apache-1.3.28 (23 Jul 2003)
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 40d2f1ae0ec0..e520594a75c7 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,9 +1,9 @@
-MD5 d0dd99d7134249f1046b957cf6f170ba ChangeLog 12727
+MD5 68577ecb33c3e19d018ccef5e00eba3e ChangeLog 12729
MD5 e4c89cfcf1223c75beeacec2e0746c29 apache-1.3.27-r3.ebuild 7684
MD5 bc346584eda108f19ef85b2d37116c28 apache-1.3.27-r4.ebuild 8450
MD5 a7458ed5767fc5c98da4ee652d7574be apache-2.0.46.ebuild 10474
MD5 f004dfa02e11d0e18d27d9e67136b333 apache-2.0.47.ebuild 10895
-MD5 332279f4afecc884166811999b8f34f3 apache-1.3.28.ebuild 8669
+MD5 ec89371a5fb3d4fd6e3884740fee8e7d apache-1.3.28.ebuild 8671
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
diff --git a/net-www/apache/apache-1.3.28.ebuild b/net-www/apache/apache-1.3.28.ebuild
index c7d91b6378b6..716ba5e0ad72 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.2 2003/07/24 23:15:16 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.28.ebuild,v 1.3 2003/07/27 00:20:00 woodchip Exp $
#IUSE="ipv6 pam"
IUSE="pam"
@@ -10,7 +10,7 @@ mod_ssl_ver=2.8.15
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"
+KEYWORDS="x86 ~ppc ~sparc ~alpha hppa ~arm"
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"
@@ -31,6 +31,12 @@ src_unpack() {
cd ${S} || die
patch -p1 <${WORKDIR}/${P}-gentoo.diff || die
+ #Obsolete 'head -1' and 'tail -1' calls.
+ perl -pi -e 's|tail -1|tail -n 1|;' \
+ src/Configure src/helpers/getuid.sh
+ perl -pi -e 's|head -1|head -n 1|;' \
+ src/Configure src/helpers/buildinfo.sh src/helpers/fmn.sh
+
#Make apachectl read /etc/conf.d/apache
patch -p1 <${FILESDIR}/apache-1.3.27-apachectl.patch || die