Update apache to 1.3.14. Changes from version 1.3.12 are listed below.

   The security fixes are:
     * A problem with the Rewrite module, mod_rewrite, allowed access to
       any file on the web server under certain circumstances
     * The handling of Host: headers in mass virtual hosting
       configurations, mod_vhost_alias, could allow access to any file on
       the server
     * If a cgi-bin directory is under the document root, the source to
       the scripts inside it could be sent if using mass virtual hosting

   The main new features include:
     * Support for a directory-based configuration system. If any of the
       configuration directives point to directories instead of files,
       all files in that directory (and in subdirectories) will be also
       parsed as configuration files
     * Support name-based virtual hosting without needing to specify an
       IP address in the Apache configuration file. This enables sites
       that use dynamic IP addresses to support name-based virtual
       hosting as well as allowing identical machines to share a
       configuration file, say in a load-balanced cluster
     * The SetEnvIf and BrowserMatch range of directives are now able to
       be used in .htaccess files.
     * Administrators who are nervous about their full server version
       details being public can use the new keyword 'ProductOnly' in the
       ServerTokens directive. This keyword forces the server to only
       return the string "Apache" as the server version.
     * The new digest authentication module, mod_auth_digest has had a
       number of fixes and upgrades applied

1 files changed, 8 insertions, 7 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index 7b632c93667..80068b71842 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2000/09/20 05:14:12 jlam Exp $
+# $NetBSD: Makefile,v 1.52 2000/10/13 21:46:45 jlam Exp $
 #
 # The fourth number in the PKGNAME version indicates a NetBSD pkg revision
 # (to indicate changes in the shipped third party patches such as the mod_ssl
@@ -7,8 +7,8 @@
 # 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.12
-PKGNAME=		apache-1.3.12
+DISTNAME=		apache_1.3.14
+PKGNAME=		apache-1.3.14
 CATEGORIES=		www
 MASTER_SITES=		http://www.apache.org/dist/ \
 			ftp://ftp.modssl.org/source/ \
@@ -22,7 +22,7 @@ HOMEPAGE=		http://www.apache.org/
 
 CONFLICTS=		apache-*modssl-* apache6-*
 
-SSL_DISTNAME=		mod_ssl-2.6.6-1.3.12
+SSL_DISTNAME=		mod_ssl-2.7.0-1.3.14
 
 EXTRACT_ONLY=		${DISTFILES:N*.gif}
 HAS_CONFIGURE=		# defined
@@ -93,14 +93,15 @@ pre-patch:
 	cd ${WRKSRC} && ${TAIL} +148 \
 		${WRKDIR}/${SSL_DISTNAME}/pkg.ssldoc/ssldoc.patch \
 		| ${PATCH} ${PATCH_ARGS}
-
-post-patch:
-	${FIND} ${WRKSRC}/htdocs -name '*.orig' -exec ${RM} -f {} \;
+	${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} -f {} \;
 
 post-build:
 	${SED} -e "s,@PREFIX@,${PREFIX},g" \
 		< ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
 
+pre-install:
+	${FIND} ${WRKSRC}/htdocs -name '*.orig' -exec ${RM} -f {} \;
+
 post-install:
 .if !defined(NOPIC)
 	cd ${PREFIX}/lib/httpd; ${MV} libproxy.so mod_proxy.so