apache-1.3.27-r[34].ebuild: changed mod_ssl_ver to 2.8.14 fixing bug #18172

5 files changed, 18 insertions, 14 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 615e1d763f3b..52117d654baf 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,12 +1,16 @@
 # 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.47 2003/03/15 21:36:52 tuxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.48 2003/03/26 09:56:41 lordvan Exp $
 
+*apache-1.3.27-r4 (23 Feb 2003)
+
+  26 Mar 2003; Thomas Raschbacher <lordvan@gentoo.org> apache-1.3.27-r[34].ebuild:
+  changed mod_ssl_ver to 2.8.14 fixing bug #18172
+  changed mod_ssl_ver in -r4 so that it doesn't contain apache version for ipv6 patch use
+	
   25 Feb 2003; Donny Davies <woodchip@gentoo.org> apache.rc6, apache2.initd :
   Send USR1 signal only to parent in reload(); #16326.
 
-*apache-1.3.27-r4 (23 Feb 2003)
-
   12 Mar 2003; Zach Welch <zwelch@gentoo.org> apache-1.3.27-r4.ebuild:
   add arm keyword
 
diff --git a/net-www/apache/apache-1.3.27-r3.ebuild b/net-www/apache/apache-1.3.27-r3.ebuild
index 44a621f6eba7..6cbf68359729 100644
--- a/net-www/apache/apache-1.3.27-r3.ebuild
+++ b/net-www/apache/apache-1.3.27-r3.ebuild
@@ -1,8 +1,8 @@
 # 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.3 2003/03/11 21:11:46 seemant Exp $
+# $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 $
 
-mod_ssl_ver=2.8.11-${PV}
+mod_ssl_ver=2.8.14-${PV}
 
 S=${WORKDIR}/${PN}_${PV}
 DESCRIPTION="The Apache Web Server"
diff --git a/net-www/apache/apache-1.3.27-r4.ebuild b/net-www/apache/apache-1.3.27-r4.ebuild
index 52eadb4bc493..c9dbf2bd5a79 100644
--- a/net-www/apache/apache-1.3.27-r4.ebuild
+++ b/net-www/apache/apache-1.3.27-r4.ebuild
@@ -1,10 +1,10 @@
 # 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.4 2003/03/12 19:27:00 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.27-r4.ebuild,v 1.5 2003/03/26 09:56:41 lordvan Exp $
 
 IUSE="ipv6 pam"
 
-mod_ssl_ver=2.8.11-${PV}
+mod_ssl_ver=2.8.14
 
 S=${WORKDIR}/${PN}_${PV}
 DESCRIPTION="The Apache Web Server"
@@ -12,8 +12,8 @@ HOMEPAGE="http://www.apache.org http://www.modssl.org"
 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}.tar.gz
-	ipv6? http://motoyuki.bsdclub.org/data/IPv6/apache-1.3.27-mod_ssl-2.8.11-v6-20021004.diff.gz"
+	ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}-${PV}.tar.gz
+	ipv6? http://motoyuki.bsdclub.org/data/IPv6/apache-${PV}-mod_ssl-${mod_ssl_ver}-v6-20021004.diff.gz"
 # The mod_ssl archive is only for providing the EAPI patch in here.
 # You should install the net-www/mod_ssl package for the actual DSO.
 
@@ -39,7 +39,7 @@ src_unpack() {
 	rm -f htdocs/manual/search/manual-index.cgi.orig
 
 	# setup eapi...
-	myssl=${WORKDIR}/mod_ssl-${mod_ssl_ver}
+	myssl=${WORKDIR}/mod_ssl-${mod_ssl_ver}-${PV}
 	cp ${myssl}/pkg.eapi/*.h src/include
 	cp ${myssl}/pkg.eapi/*.c src/ap
 	patch -p0 < ${myssl}/pkg.eapi/eapi.patch || die eapi
@@ -51,7 +51,7 @@ src_unpack() {
 
 	# thanks drey@rt.mipt.ru for these two ...
 	if use ipv6; then
-		zcat ${DISTDIR}/apache-1.3.27-mod_ssl-2.8.11-v6-20021004.diff.gz | patch -p0 || die
+		zcat ${DISTDIR}/apache-${PV}-mod_ssl-${mod_ssl_ver}-v6-20021004.diff.gz | patch -p0 || die
 	fi
 
 	if use pam; then
diff --git a/net-www/apache/files/digest-apache-1.3.27-r3 b/net-www/apache/files/digest-apache-1.3.27-r3
index c000a4d1da30..a753da721597 100644
--- a/net-www/apache/files/digest-apache-1.3.27-r3
+++ b/net-www/apache/files/digest-apache-1.3.27-r3
@@ -1,3 +1,3 @@
 MD5 65b89365a65dcad71d4402b4862beeaa apache_1.3.27.tar.gz 2306052
 MD5 312e00edcf29057235acca7c2f56e068 apache-1.3.27-gentoo.diff.bz2 6963
-MD5 f84bd971aa8db28f31ad6bab2e7acc2c mod_ssl-2.8.11-1.3.27.tar.gz 753416
+MD5 8ba44e6ad3701f445b0f86f17f24ff1c mod_ssl-2.8.14-1.3.27.tar.gz 754179
diff --git a/net-www/apache/files/digest-apache-1.3.27-r4 b/net-www/apache/files/digest-apache-1.3.27-r4
index 210483cef9d7..accf29e83aa6 100644
--- a/net-www/apache/files/digest-apache-1.3.27-r4
+++ b/net-www/apache/files/digest-apache-1.3.27-r4
@@ -1,4 +1,4 @@
 MD5 65b89365a65dcad71d4402b4862beeaa apache_1.3.27.tar.gz 2306052
 MD5 312e00edcf29057235acca7c2f56e068 apache-1.3.27-gentoo.diff.bz2 6963
-MD5 f84bd971aa8db28f31ad6bab2e7acc2c mod_ssl-2.8.11-1.3.27.tar.gz 753416
-MD5 0a2355c0e26c1bf7510c1af0ccc46209 apache-1.3.27-mod_ssl-2.8.11-v6-20021004.diff.gz 37016
+MD5 8ba44e6ad3701f445b0f86f17f24ff1c mod_ssl-2.8.14-1.3.27.tar.gz 754179
+MD5 0a2355c0e26c1bf7510c1af0ccc46209 apache-1.3.27-mod_ssl-2.8.14-v6-20021004.diff.gz 37016