Update ap-ssl to version 2.8.24.

- Fix a security issue (CAN-2005-2700) where "SSLVerifyClient require"
  was not enforced in per-location context if "SSLVerifyClient optional"
  was configured in the global virtual host configuration.

Sync apache with the latest ap-ssl.

4 files changed, 15 insertions, 15 deletions

diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index 8dbce000227..19653fc34e4 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.90 2005/08/19 18:12:39 jlam Exp $
+# $NetBSD: Makefile,v 1.91 2005/09/16 13:53:56 salo Exp $
 
-DISTNAME=		mod_ssl-2.8.23-1.3.33
-PKGNAME=		ap-ssl-2.8.23
+DISTNAME=		mod_ssl-2.8.24-1.3.33
+PKGNAME=		ap-ssl-2.8.24
 CATEGORIES=		www security
 MASTER_SITES=		http://www.modssl.org/source/ \
 			ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/source/ \
diff --git a/www/ap-ssl/distinfo b/www/ap-ssl/distinfo
index 9a90732f6ef..7ffe1ef4823 100644
--- a/www/ap-ssl/distinfo
+++ b/www/ap-ssl/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.28 2005/07/14 04:04:58 wiz Exp $
+$NetBSD: distinfo,v 1.29 2005/09/16 13:53:56 salo Exp $
 
-SHA1 (mod_ssl-2.8.23-1.3.33.tar.gz) = a2f676a948913e06c0bdc8f4700403a634dbfacf
-RMD160 (mod_ssl-2.8.23-1.3.33.tar.gz) = 3a1c380d2f1bd6cd4d5f190139af8ae239188a2f
-Size (mod_ssl-2.8.23-1.3.33.tar.gz) = 819631 bytes
+SHA1 (mod_ssl-2.8.24-1.3.33.tar.gz) = cb2e77efa0c7df3368b3be0d6bbdf13fa92090f1
+RMD160 (mod_ssl-2.8.24-1.3.33.tar.gz) = 1651dcd85abd37d6955f241c730e101df482d545
+Size (mod_ssl-2.8.24-1.3.33.tar.gz) = 820292 bytes
 SHA1 (patch-aa) = f2db042ff2e15ebfc9387b254467be78747cf947
 SHA1 (patch-ab) = 936bc956761559c51263cf7645d135abe40069cd
diff --git a/www/apache/Makefile b/www/apache/Makefile
index 6fe08c0c4a3..20cfeee6ae5 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.170 2005/08/23 11:48:51 rillig Exp $
+# $NetBSD: Makefile,v 1.171 2005/09/16 13:53:56 salo 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_1.3.33
 PKGNAME=		${DISTNAME:S/_/-/}
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
 			${MASTER_SITE_APACHE:=httpd/old/}
@@ -18,8 +18,8 @@ COMMENT=		Apache HTTP (Web) server
 NETBSD_LOGO=		sitedrivenby.gif
 SITES_${NETBSD_LOGO}=	http://www.NetBSD.org/images/logos/
 
-MODSSL_VERSION=		2.8.21
-MODSSL_DISTNAME=	mod_ssl-${MODSSL_VERSION}-1.3.32
+MODSSL_VERSION=		2.8.24
+MODSSL_DISTNAME=	mod_ssl-${MODSSL_VERSION}-1.3.33
 MODSSL_DIST=		${MODSSL_DISTNAME}.tar.gz
 MODSSL_SRC=		${WRKDIR}/${MODSSL_DISTNAME}
 SITES_${MODSSL_DIST}=	http://www.modssl.org/source/ \
diff --git a/www/apache/distinfo b/www/apache/distinfo
index a76e4c9881b..3dc5053dc6e 100644
--- a/www/apache/distinfo
+++ b/www/apache/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2005/08/22 16:19:01 reed Exp $
+$NetBSD: distinfo,v 1.46 2005/09/16 13:53:57 salo Exp $
 
 SHA1 (apache_1.3.33.tar.gz) = 4cd49534d1abd04c81ab215f2457122d85855b0d
 RMD160 (apache_1.3.33.tar.gz) = 80e9ea2c7c75f49454acfd83cead5506c5ffddea
@@ -6,9 +6,9 @@ Size (apache_1.3.33.tar.gz) = 2468567 bytes
 SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
 RMD160 (sitedrivenby.gif) = 2e350e6531a800da8796207509c12fb590d0affa
 Size (sitedrivenby.gif) = 8519 bytes
-SHA1 (mod_ssl-2.8.21-1.3.32.tar.gz) = 6bbf83d716254e157b2c6ba9fd13e6b3bfc43239
-RMD160 (mod_ssl-2.8.21-1.3.32.tar.gz) = 559124e89e51ebb362f2468103f4432439bf5a18
-Size (mod_ssl-2.8.21-1.3.32.tar.gz) = 754629 bytes
+SHA1 (mod_ssl-2.8.24-1.3.33.tar.gz) = cb2e77efa0c7df3368b3be0d6bbdf13fa92090f1
+RMD160 (mod_ssl-2.8.24-1.3.33.tar.gz) = 1651dcd85abd37d6955f241c730e101df482d545
+Size (mod_ssl-2.8.24-1.3.33.tar.gz) = 820292 bytes
 SHA1 (patch-aa) = ae280b14dc0102ecfbe3675ca0b5d2b74ee790ca
 SHA1 (patch-ab) = 084d52bb2afbacf18b9d0793293d8ae333c67802
 SHA1 (patch-ac) = b961c90a58a94f48daff417af146df98d5ec428c