Bump new-style 1.3.34 to -r10 to make room for supporting old-style security bug

(Portage version: 2.0.53)

8 files changed, 27 insertions, 11 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
diff --git a/net-www/mod_ssl/ChangeLog b/net-www/mod_ssl/ChangeLog
index f17fc0d5af82..d32d496dfdc3 100644
--- a/net-www/mod_ssl/ChangeLog
+++ b/net-www/mod_ssl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/mod_ssl
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/ChangeLog,v 1.97 2005/12/12 20:31:16 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/ChangeLog,v 1.98 2005/12/13 23:28:33 vericgar Exp $
+
+*mod_ssl-2.8.25-r10 (13 Dec 2005)
+
+  13 Dec 2005; Michael Stewart <vericgar@gentoo.org> -mod_ssl-2.8.25.ebuild,
+  +mod_ssl-2.8.25-r10.ebuild:
+  Bump new-style 2.8.25 to -r10 to make room for supporting old-style security
+  bug
 
   12 Dec 2005; Michael Hanselmann <hansmi@gentoo.org> mod_ssl-2.8.25.ebuild:
   Stable on hppa, ppc. See bug #109895.
diff --git a/net-www/mod_ssl/Manifest b/net-www/mod_ssl/Manifest
index 2b2655148785..d60c5de5dfd4 100644
--- a/net-www/mod_ssl/Manifest
+++ b/net-www/mod_ssl/Manifest
@@ -11,6 +11,7 @@ MD5 54cbf53816f2c9c80600ea9f37ab02ba files/digest-mod_ssl-2.8.22-r1 73
 MD5 a68a0b56a629886ec3ebd08bfb0f638c files/digest-mod_ssl-2.8.24 73
 MD5 a68a0b56a629886ec3ebd08bfb0f638c files/digest-mod_ssl-2.8.24-r1 73
 MD5 df803a8e5ad1a29ae5a6996fbfdde70c files/digest-mod_ssl-2.8.25 73
+MD5 df803a8e5ad1a29ae5a6996fbfdde70c files/digest-mod_ssl-2.8.25-r10 73
 MD5 dd92adba34e6b36ef6fd2750869e1a18 files/gentestcrt.sh 8801
 MD5 71ac46d211c8aa42c7a5e51c6165862a files/mod_ssl.conf 2460
 MD5 8270779f233bc311118f53ebce7338e7 files/ssl.default-vhost.conf 6985
@@ -24,4 +25,4 @@ MD5 aa8f74dc6a49b8646a307d4844fd0dfb mod_ssl-2.8.22-r1.ebuild 1782
 MD5 d20c6eee687d0fca4397f828e34092dc mod_ssl-2.8.22.ebuild 2316
 MD5 e3e145c5f8c0c0b2d3e63a0528100b4d mod_ssl-2.8.24-r1.ebuild 1779
 MD5 a4d234acd0fdfc01177ded213518dced mod_ssl-2.8.24.ebuild 2315
-MD5 c096acb32d50da15653552585c3c2069 mod_ssl-2.8.25.ebuild 1782
+MD5 3c505ae97482a8f0cfbe5ce9d3e29b22 mod_ssl-2.8.25-r10.ebuild 1785
diff --git a/net-www/mod_ssl/files/digest-mod_ssl-2.8.25 b/net-www/mod_ssl/files/digest-mod_ssl-2.8.25-r10
index f646305b8db6..f646305b8db6 100644
--- a/net-www/mod_ssl/files/digest-mod_ssl-2.8.25
+++ b/net-www/mod_ssl/files/digest-mod_ssl-2.8.25-r10
diff --git a/net-www/mod_ssl/mod_ssl-2.8.25.ebuild b/net-www/mod_ssl/mod_ssl-2.8.25-r10.ebuild
index 1d01394cc7c1..c2981395d5d1 100644
--- a/net-www/mod_ssl/mod_ssl-2.8.25.ebuild
+++ b/net-www/mod_ssl/mod_ssl-2.8.25-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/mod_ssl-2.8.25.ebuild,v 1.3 2005/12/12 20:31:16 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/mod_ssl-2.8.25-r10.ebuild,v 1.1 2005/12/13 23:28:33 vericgar Exp $
 
 inherit apache-module
 
@@ -10,7 +10,7 @@ DESCRIPTION="An SSL module for the Apache 1.3 Web server"
 HOMEPAGE="http://www.modssl.org/"
 SRC_URI="http://www.modssl.org/source/${MY_P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 LICENSE="as-is"
 SLOT="0"
 IUSE=""