summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-www/apache')
-rw-r--r--net-www/apache/ChangeLog9
-rw-r--r--net-www/apache/Manifest3
-rw-r--r--net-www/apache/apache-1.3.34-r10.ebuild (renamed from net-www/apache/apache-1.3.34.ebuild)8
-rw-r--r--net-www/apache/files/digest-apache-1.3.34-r10 (renamed from net-www/apache/files/digest-apache-1.3.34)2
4 files changed, 15 insertions, 7 deletions
diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index b0749d8c420d..3c55d2434415 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-www/apache
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.435 2005/12/12 20:32:01 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.436 2005/12/13 23:29:49 vericgar Exp $
+
+*apache-1.3.34-r10 (13 Dec 2005)
+
+ 13 Dec 2005; Michael Stewart <vericgar@gentoo.org> -apache-1.3.34.ebuild,
+ +apache-1.3.34-r10.ebuild:
+ Bump new-style 1.3.34 to -r10 to make room for supporting old-style security
+ bug
12 Dec 2005; Michael Hanselmann <hansmi@gentoo.org> apache-1.3.34.ebuild:
Stable on hppa, ppc.
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 72bcb11fd556..b6140d2ea6e9 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -17,7 +17,7 @@ MD5 2c34b40a3fe461014b19ca5e4763203e apache-1.3.33-r4.ebuild 8673
MD5 eb173dd548089cf594c543d29b48948c apache-1.3.33-r5.ebuild 7105
MD5 17e12318b6dd1cd8bb25cb987490c7fd apache-1.3.33-r6.ebuild 7108
MD5 ca6b47f0c2a0006b71fc1153937824e5 apache-1.3.33.ebuild 6927
-MD5 a4db1a3b301724da46a5be06ecce1441 apache-1.3.34.ebuild 8662
+MD5 0c7241fabe8addd370db0e683b21d12a apache-1.3.34-r10.ebuild 8669
MD5 8dfa3f0fbdc01264e754bd3ebf7b8a5a apache-2.0.54-r15.ebuild 12594
MD5 be59fbc220730a0212fbf6f34a1a6652 apache-2.0.54-r30.ebuild 12930
MD5 263979050e43b813bc0e092380262bb8 apache-2.0.54-r31.ebuild 13378
@@ -76,6 +76,7 @@ MD5 0282c9d20ad05b752812c62f655b50ce files/digest-apache-1.3.33-r4 286
MD5 b75d2bfc008916e050f1bafb8a04c944 files/digest-apache-1.3.33-r5 221
MD5 324e63ccba6d27b9d9b08209c9992fe4 files/digest-apache-1.3.33-r6 221
MD5 687e04ddfb3d4d3db36c7fac44c0899d files/digest-apache-1.3.34 283
+MD5 947bc1e2e4792fd492a8d90f7abe9e78 files/digest-apache-1.3.34-r10 287
MD5 282e8f0ae737d778a643251ad4f21122 files/digest-apache-2.0.54-r15 217
MD5 b9925be24e72acc1031f76a8bc0a07cb files/digest-apache-2.0.54-r30 151
MD5 f3ab77f6b13c80af68614aa80de7af2b files/digest-apache-2.0.54-r31 154
diff --git a/net-www/apache/apache-1.3.34.ebuild b/net-www/apache/apache-1.3.34-r10.ebuild
index 2334e09990b8..3b33060b5b7e 100644
--- a/net-www/apache/apache-1.3.34.ebuild
+++ b/net-www/apache/apache-1.3.34-r10.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.34.ebuild,v 1.3 2005/12/12 20:32:01 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.34-r10.ebuild,v 1.1 2005/12/13 23:29:50 vericgar Exp $
inherit eutils fixheadtails multilib
# latest gentoo apache files
GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20051210"
+GENTOO_PATCHSTAMP="20051213"
GENTOO_DEVSPACE="vericgar"
GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
@@ -24,7 +24,7 @@ SRC_URI="mirror://apache/httpd/apache_${PV}.tar.gz
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="doc ssl pam lingerd no-suexec static-modules selinux"
DEPEND="dev-lang/perl
@@ -38,7 +38,7 @@ DEPEND="dev-lang/perl
lingerd? ( =net-www/lingerd-${lingerd_ver} )"
# so leave it out until it's available
-PDEPEND="ssl? ( =net-www/mod_ssl-${mod_ssl_ver} )"
+PDEPEND="ssl? ( =net-www/mod_ssl-${mod_ssl_ver}-r10 )"
S=${WORKDIR}/${PN}_${PV}
diff --git a/net-www/apache/files/digest-apache-1.3.34 b/net-www/apache/files/digest-apache-1.3.34-r10
index 0fda2fa1b59b..3a41cae64964 100644
--- a/net-www/apache/files/digest-apache-1.3.34
+++ b/net-www/apache/files/digest-apache-1.3.34-r10
@@ -1,4 +1,4 @@
MD5 9978cc552b423f0015c1052d23ab619e apache_1.3.34.tar.gz 2468056
-MD5 286120beaf29099815403a59f3e4e43c gentoo-apache-1.3.34-20051210.tar.bz2 27549
+MD5 40a56660a65106c273af08ddb9d8a117 gentoo-apache-1.3.34-r10-20051213.tar.bz2 27570
MD5 6401015bafad4f44fdf8a9a1795d9258 lingerd-0.94.tar.gz 33938
MD5 1ef2a6cb47573444779b2fd10502514b mod_ssl-2.8.25-1.3.34.tar.gz 820352