[pkgsrc/trunk]: pkgsrc/www/apache Compile with version 2.8.18 of "mod_ssl" in...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a2e8998e3532
branches:  trunk
changeset: 475951:a2e8998e3532
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun May 30 12:37:15 2004 +0000

description:
Compile with version 2.8.18 of "mod_ssl" instead with the (reported to
be vulnerable) version 2.8.17. Bump package revision because of this.

diffstat:

 www/apache/Makefile |  10 +++++-----
 www/apache/distinfo |   6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (46 lines):

diff -r 072302466b34 -r a2e8998e3532 www/apache/Makefile
--- a/www/apache/Makefile       Sun May 30 10:40:02 2004 +0000
+++ b/www/apache/Makefile       Sun May 30 12:37:15 2004 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.145 2004/05/13 11:39:09 taca Exp $
+# $NetBSD: Makefile,v 1.146 2004/05/30 12:37:15 tron Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
 
-DISTNAME=              apache_${APACHE_VERSION}
-PKGNAME=               apache-${APACHE_VERSION}
-APACHE_VERSION=                1.3.31
+DISTNAME=              apache_1.3.31
+PKGNAME=               ${DISTNAME:S/_/-/}
+PKGREVISION=           1
 CATEGORIES=            www
 MASTER_SITES=          ${MASTER_SITE_APACHE:=httpd/} \
                        ${MASTER_SITE_APACHE:=httpd/old/}
@@ -18,7 +18,7 @@
 NETBSD_LOGO=           sitedrivenby.gif
 SITES_${NETBSD_LOGO}=  http://www.NetBSD.org/images/logos/
 
-MODSSL_VERSION=                2.8.17
+MODSSL_VERSION=                2.8.18
 MODSSL_DISTNAME=       mod_ssl-${MODSSL_VERSION}-1.3.31
 MODSSL_DIST=           ${MODSSL_DISTNAME}.tar.gz
 MODSSL_SRC=            ${WRKDIR}/${MODSSL_DISTNAME}
diff -r 072302466b34 -r a2e8998e3532 www/apache/distinfo
--- a/www/apache/distinfo       Sun May 30 10:40:02 2004 +0000
+++ b/www/apache/distinfo       Sun May 30 12:37:15 2004 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.34 2004/05/13 21:21:27 abs Exp $
+$NetBSD: distinfo,v 1.35 2004/05/30 12:37:15 tron Exp $
 
 SHA1 (apache_1.3.31.tar.gz) = a5d4298e8f99cae220ba65b5ef128d5742c7298d
 Size (apache_1.3.31.tar.gz) = 2467371 bytes
 SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
 Size (sitedrivenby.gif) = 8519 bytes
-SHA1 (mod_ssl-2.8.17-1.3.31.tar.gz) = 942ca41a95f1e671ecabf90a8704b85de42d5d42
-Size (mod_ssl-2.8.17-1.3.31.tar.gz) = 754472 bytes
+SHA1 (mod_ssl-2.8.18-1.3.31.tar.gz) = d40151ce3647d2054cfa7edb0e668fa4d3355cee
+Size (mod_ssl-2.8.18-1.3.31.tar.gz) = 754214 bytes
 SHA1 (patch-aa) = 3a655678f5e99769f27fca06a8279b14a8e8e8be
 SHA1 (patch-ab) = 71ea1f3a59e0f7bc37175b0eefd462a1f7ca4fb6
 SHA1 (patch-ac) = 12347c7a306d3e898b032c2b4b3b01670b62d4fd