Update apache to 1.3.17. Important changes from version 1.3.14 include:

-) Remove patch to avoid dlclose()ing on NetBSD.  The mod_perl vs. perl CGI
   mis-interaction seems to be gone and I wasn't able to reproduce it on my
   system.

*) Fix the declaration of the module structure in mod_example.
*) Fix the handling of variable expansion look-ahead in mod_rewrite,
   i.e. syntax like %{LA-U:REMOTE_USER}, and also fix the parsing of
   more complicated nested RewriteMap lookups.
*) mod_status now respects ?refresh=n of 1 or greater.  If the given
   refresh value is not a number, ?refresh is set to 1 second.
*) Accomodate an out-of-space condition in the piped logs and the
   rotatelogs.c code, and no longer churn log processes for this condition.
*) Make cgi-bin work as a regular directory when using mod_vhost_alias
   with no VirtualScriptAlias directives.
*) Move the check of the Expect request header field after the hook
   for ap_post_read_request, since that is the only opportunity for
   modules to handle Expect extensions.
*) Eliminate caching problems of mod_autoindex results, so the last
   modified date of the directory is returned as the Last-Modified
   and ETag HTTP header tags are sent if IndexOptions TrackModified
   directive/option is used.
*) Correct an issue with Alias and ScriptAlias directives that
   file path arguments were not normalized in canonical form.
   This correction makes no attempt to normalize regular expression
   forms of Alias or ScriptAlias.
*) Add a new LogFormat directive, %c, that will log connection
   status at the end of the response.
*) Update the mime.types file to the registered media types as of 2000-10-19.
*) Restore functionality broken by the mod_rewrite security fix:
   rewrite map lookup keys and default values are now expanded
   so that the lookup can depend on the requested URI etc.

15 files changed, 197 insertions, 164 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index b154e244885..4351428adb5 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2001/01/13 15:25:04 tv Exp $
+# $NetBSD: Makefile,v 1.57 2001/02/02 16:39:56 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,38 +7,42 @@
 # 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.14
-PKGNAME=		apache-1.3.14nb1
+DISTNAME=		apache_1.3.17
+PKGNAME=		apache-1.3.17
 CATEGORIES=		www
-MASTER_SITES=		http://www.apache.org/dist/ \
-			ftp://ftp.modssl.org/source/ \
+MASTER_SITES=		http://httpd.apache.org/dist/ \
+			http://www.modssl.org/source/ \
 			http://www.netbsd.org/images/logos/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 			${SSL_DISTNAME}${EXTRACT_SUFX} \
 			sitedrivenby.gif
 
 MAINTAINER=		jlam@netbsd.org
-HOMEPAGE=		http://www.apache.org/
+HOMEPAGE=		http://httpd.apache.org/
 
 CONFLICTS=		apache-*modssl-* apache6-*
 
-SSL_DISTNAME=		mod_ssl-2.7.1-1.3.14
+SSL_DISTNAME=		mod_ssl-2.8.0-1.3.17
 
 EXTRACT_ONLY=		${DISTFILES:N*.gif}
 HAS_CONFIGURE=		# defined
-CONFIGURE_ARGS+=	--prefix=${PREFIX} --libexecdir=${PREFIX}/lib/httpd \
-			--runtimedir=/var/run --datadir=${PREFIX}/share/httpd \
-			--cgidir=${PREFIX}/libexec/cgi-bin \
-			--logfiledir=/var/log/httpd \
-			--sysconfdir=${PREFIX}/etc/httpd \
-			--proxycachedir=/var/spool/httpd/proxy \
-			--includedir=${PREFIX}/include/httpd \
-			--sbindir=${PREFIX}/sbin
-CONFIGURE_ARGS+=	--enable-rule=EAPI --enable-module=most \
-			--disable-module=ssl --enable-module=auth_db \
+CONFIGURE_ARGS+=	--prefix=${PREFIX}				\
+			--sbindir=${PREFIX}/sbin			\
+			--libexecdir=${PREFIX}/lib/httpd		\
+			--sysconfdir=${PREFIX}/etc/httpd		\
+			--datadir=${PREFIX}/share/httpd			\
+			--cgidir=${PREFIX}/libexec/cgi-bin		\
+			--includedir=${PREFIX}/include/httpd		\
+			--runtimedir=/var/run				\
+			--logfiledir=/var/log/httpd			\
+			--proxycachedir=/var/spool/httpd/proxy
+CONFIGURE_ARGS+=	--enable-rule=EAPI				\
+			--enable-module=most				\
+			--disable-module=ssl				\
+			--enable-module=auth_db				\
 			--disable-module=auth_dbm
-CONFIGURE_ARGS+=	--with-port=80
 CONFIGURE_ARGS+=	--with-perl=${PERL5}
+CONFIGURE_ARGS+=	--with-port=80
 CONFIGURE_ENV+=		OPTIM="${OPTIM}"
 
 .include "../../mk/bsd.prefs.mk"
@@ -46,7 +50,8 @@ CONFIGURE_ENV+=		OPTIM="${OPTIM}"
 .if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES
 APACHE_USER?=		www
 SUEXEC_PATH=		/bin:/usr/bin:${PREFIX}/bin:/usr/local/bin
-CONFIGURE_ARGS+=	--enable-suexec --suexec-caller=${APACHE_USER} \
+CONFIGURE_ARGS+=	--enable-suexec 				\
+			--suexec-caller=${APACHE_USER}			\
 			--suexec-safepath='${SUEXEC_PATH}'
 PLIST_SRC=		${PKGDIR}/PLIST.suexec
 BUILD_DEFS+=		APACHE_USER
@@ -69,7 +74,8 @@ CFLAGS+=		-O6 -fomit-frame-pointer -fexpensive-optimizations
 
 .if (${OPSYS} == "SunOS")
 DEPENDS+=		db-2.7.7:../../databases/db
-LDFLAGS+=		-Wl,-R/usr/ucblib -L/usr/ucblib -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
+LDFLAGS+=		-Wl,-R/usr/ucblib -L/usr/ucblib			\
+			-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
 CONFIGURE_ENV+=		INCLUDES="-I${LOCALBASE}/include/db2"
 CONFIGURE_ENV+=		LIBS="-ldbm -ldb2"
 .endif
@@ -89,33 +95,34 @@ post-extract:
 	${CP} ${WRKDIR}/${SSL_DISTNAME}/pkg.eapi/*.h ${WRKSRC}/src/include
 
 pre-patch:
-	cd ${WRKSRC} && ${CAT} \
-		${WRKDIR}/${SSL_DISTNAME}/pkg.eapi/eapi.patch \
-		${WRKDIR}/${SSL_DISTNAME}/pkg.sslcfg/sslcfg.patch \
-		${WRKDIR}/${SSL_DISTNAME}/pkg.sslmod/sslmod.patch \
-		${WRKDIR}/${SSL_DISTNAME}/pkg.sslsup/sslsup.patch \
+	cd ${WRKSRC} && ${CAT}						\
+		${WRKDIR}/${SSL_DISTNAME}/pkg.eapi/eapi.patch		\
+		${WRKDIR}/${SSL_DISTNAME}/pkg.sslcfg/sslcfg.patch	\
+		${WRKDIR}/${SSL_DISTNAME}/pkg.sslmod/sslmod.patch	\
+		${WRKDIR}/${SSL_DISTNAME}/pkg.sslsup/sslsup.patch	\
 		| ${PATCH} ${PATCH_ARGS}
-	cd ${WRKSRC} && ${TAIL} +148 \
-		${WRKDIR}/${SSL_DISTNAME}/pkg.ssldoc/ssldoc.patch \
+	cd ${WRKSRC} && ${TAIL} +154					\
+		${WRKDIR}/${SSL_DISTNAME}/pkg.ssldoc/ssldoc.patch	\
 		| ${PATCH} ${PATCH_ARGS}
 	${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} -f {} \;
 
 post-build:
-	${SED} -e "s,@PREFIX@,${PREFIX},g" \
-		< ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
+	${SED}	-e "s,@PREFIX@,${PREFIX},g"				\
+		${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
 
 pre-install:
 	${FIND} ${WRKSRC}/htdocs -name '*.orig' -exec ${RM} -f {} \;
-	${SED}	-e "s,@CAT@,${CAT},g" \
-		-e "s,@RM@,${RM},g" \
-		-e "s,@RMDIR@,${RMDIR},g" \
-		-e "s,@TRUE@,${TRUE},g" \
-		< ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-	${SED}	-e "s,@CAT@,${CAT},g" \
-		-e "s,@CHMOD@,${CHMOD},g" \
-		-e "s,@CP@,${CP},g" \
-		-e "s,@MKDIR@,${MKDIR},g" \
-		< ${PKGDIR}/INSTALL > ${INSTALL_FILE}
+	${SED}	-e "s|@CAT@|${CAT}|g"					\
+		-e "s|@RM@|${RM}|g"					\
+		-e "s|@RMDIR@|${RMDIR}|g"				\
+		-e "s|@TRUE@|${TRUE}|g"					\
+		${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
+	${SED}	-e "s|@CAT@|${CAT}|g"					\
+		-e "s|@CHMOD@|${CHMOD}|g"				\
+		-e "s|@CHOWN@|${CHOWN}|g"				\
+		-e "s|@CP@|${CP}|g"					\
+		-e "s|@MKDIR@|${MKDIR}|g"				\
+		${PKGDIR}/INSTALL > ${INSTALL_FILE}
 
 post-install:
 .if !defined(NOPIC)
diff --git a/www/apache/files/apache.sh b/www/apache/files/apache.sh
index 57ff96a0a58..80f9eee3270 100644
--- a/www/apache/files/apache.sh
+++ b/www/apache/files/apache.sh
@@ -1,47 +1,56 @@
 #! /bin/sh
 #
-# $NetBSD: apache.sh,v 1.8 2000/10/13 21:46:32 jlam Exp $
+# $NetBSD: apache.sh,v 1.9 2001/02/02 16:39:57 jlam Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
 
 name="apache"
-command="@PREFIX@/sbin/apachectl"
+ctl_command="@PREFIX@/sbin/apachectl"
+command="@PREFIX@/sbin/httpd"
 pidfile="/var/run/httpd.pid"
 conffile="@PREFIX@/etc/httpd/httpd.conf"
 
 apache_start="start"
 
-if [ -f @PREFIX@/etc/httpd/mod_ssl.conf ]
+if [ -f @PREFIX@/etc/httpd/apache_start.conf ]
 then
 	# This file can reset apache_start to "startssl"
-	. @PREFIX@/etc/httpd/mod_ssl.conf
+	. @PREFIX@/etc/httpd/apache_start.conf
 fi
 
 cmd=${1:-start}
 
-case ${cmd} in
-start)
-	if [ -x ${command} -a -f ${conffile} ]; then
+if [ -x ${ctl_command} -a -x ${command} ]
+then
+	case ${cmd} in
+	start)
 		echo "Starting ${name}."
-		${command} ${apache_start} > /dev/null
-	fi
-	;;
-stop)
-	if [ -x ${command} -a -f ${pidfile} ]; then
-		echo "Stopping ${name}."
-		${command} stop > /dev/null
-	fi
-	;;
-restart)
-	( $0 stop )
-	sleep 5
-	$0 start
-	;;
-*)
-	if [ -x ${command} ]; then
-		${command} ${cmd}
-	fi
-	;;
-esac
+		${ctl_command} ${apache_start} > /dev/null
+		;;
+
+	stop)
+		if [ -a -f ${pidfile} ]
+		then
+			echo "Stopping ${name}."
+			${ctl_command} ${cmd} > /dev/null
+		fi
+		;;
+
+	restart)
+		( $0 stop )
+		sleep 5
+		$0 start
+		;;
+
+	status)
+		${ctl_command} ${cmd}
+		;;
+
+	*)
+		echo 1>&2 "Usage: $0 [restart|start|stop|status]"
+		exit 1
+		;;
+	esac
+fi
 exit 0
diff --git a/www/apache/files/md5 b/www/apache/files/md5
index ccb2e58abe1..345f4542f8c 100644
--- a/www/apache/files/md5
+++ b/www/apache/files/md5
@@ -1,5 +1,5 @@
-$NetBSD: md5,v 1.17 2000/10/17 18:14:16 jlam Exp $
+$NetBSD: md5,v 1.18 2001/02/02 16:39:57 jlam Exp $
 
-MD5 (apache_1.3.14.tar.gz) = 34803e3d83a0a9ed981b571657b33109
-MD5 (mod_ssl-2.7.1-1.3.14.tar.gz) = 99e05bd4ab7bd5c72fbb70bd8cfbf283
+MD5 (apache_1.3.17.tar.gz) = bcb3c0db956709ad8f04655fd75621e6
+MD5 (mod_ssl-2.8.0-1.3.17.tar.gz) = 3a158f3b5442cb8b7bee4a55851c3794
 MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1
diff --git a/www/apache/files/patch-sum b/www/apache/files/patch-sum
index ee4f8b6bd8a..e297aa417be 100644
--- a/www/apache/files/patch-sum
+++ b/www/apache/files/patch-sum
@@ -1,11 +1,10 @@
-$NetBSD: patch-sum,v 1.11 2001/01/14 05:58:01 jlam Exp $
+$NetBSD: patch-sum,v 1.12 2001/02/02 16:39:57 jlam Exp $
 
-MD5 (patch-aa) = 5f9d7e7c99dc689a32a3c3a151760144
+MD5 (patch-aa) = 1f5ddd83cedeaff72df8c6428a8878ba
 MD5 (patch-ab) = 86886e1e816bcc5527072c4027586cd3
-MD5 (patch-ac) = 7b43e8d3467d6a13480991fcaba44350
+MD5 (patch-ac) = ebee02f9d9f26ab4c200b252ded95d73
 MD5 (patch-ad) = 40f2b9c12d7ef36bbc842480af61b833
-MD5 (patch-ae) = b76129eb2aa925e8531cbc73593191c1
-MD5 (patch-af) = 40600e577259ca9afc36f1ff2aa1a9f9
-MD5 (patch-ag) = 6c7b5fd3185385e0b5309cb707516d18
+MD5 (patch-ae) = c260133920eebada06030552c3306c3d
+MD5 (patch-af) = 197a9b91da502834ec5d4cab2c99b2c1
 MD5 (patch-ah) = e27e529142e5ee6fc1be0f965e5510e0
-MD5 (patch-ai) = 650417c389d59a1e5b9aa4fcf611093d
+MD5 (patch-ai) = 57b95d04f0ed35252b8ead041017feac
diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa
index d3dd97ff72e..b713d3afe69 100644
--- a/www/apache/patches/patch-aa
+++ b/www/apache/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2001/01/14 05:58:01 jlam Exp $
+$NetBSD: patch-aa,v 1.14 2001/02/02 16:39:57 jlam Exp $
 
---- Makefile.tmpl.orig	Sun Jan 14 00:43:01 2001
-+++ Makefile.tmpl	Sun Jan 14 00:48:35 2001
-@@ -382,34 +382,6 @@
+--- Makefile.tmpl.orig	Fri Feb  2 00:42:14 2001
++++ Makefile.tmpl
+@@ -385,34 +385,6 @@
  			file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
  			echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
  			$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \
@@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.13 2001/01/14 05:58:01 jlam Exp $
  		done; \
  	fi
  	@echo "<=== [programs]"
-@@ -535,15 +507,16 @@
+@@ -538,15 +510,16 @@
  		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
  		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
  	fi
@@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.13 2001/01/14 05:58:01 jlam Exp $
  		done; \
  	fi
  	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
-@@ -557,7 +530,7 @@
+@@ -560,7 +533,7 @@
  #   and initial config files while preserving existing ones.
  install-config:
  	@echo "===> [config: Installing Apache configuration files]"
diff --git a/www/apache/patches/patch-ac b/www/apache/patches/patch-ac
index f5fb2124ff4..93f959dc3b7 100644
--- a/www/apache/patches/patch-ac
+++ b/www/apache/patches/patch-ac
@@ -1,30 +1,27 @@
-$NetBSD: patch-ac,v 1.4 2000/10/13 21:46:46 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2001/02/02 16:39:57 jlam Exp $
 
---- htdocs/index.html.en.orig	Sat Nov 20 16:29:40 1999
+--- htdocs/index.html.en.orig	Fri Jan 19 14:39:47 2001
 +++ htdocs/index.html.en
-@@ -28,11 +28,29 @@
+@@ -33,12 +33,26 @@
+ <HR WIDTH="50%" SIZE="8">
  
+ <p>The Apache <A HREF="manual/">documentation</A> has been included with
+-this distribution.</p>
++this distribution.  If the <STRONG>mod_ssl</STRONG> SSL extension has
++been installed, then please carefully read the
++<A HREF="manual/mod/mod_ssl/index.html">SSL documentation</A>.</p>
  
- <P>
--The Apache <A HREF="manual/index.html">documentation</A> has been included with this distribution.
-+The Apache <A HREF="manual/index.html">documentation</A> has been included with this distribution.<BR>
-+If the <STRONG>mod_ssl</STRONG> SSL extension has been installed, read the
-+<A HREF="manual/mod/mod_ssl/index.html">SSL documentation</A> carefully.
-+</P>
-+<P>
-+Information on the NetBSD multiplatform operating system can be found at
-+<A HREF="http://www.netbsd.org/">NetBSD's homepage</A> on the net.
-+</P>
- 
- <P>
--You are free to use the image below on an Apache-powered web server.  Thanks for using Apache!
-+The Webmaster of this site is free to use the images below on an
-+Apache/NetBSD-powered Web server.  Thanks for using
-+<A HREF="http://www.apache.org/">Apache</A> on
-+<A HREF="http://www.netbsd.org/">NetBSD</A>!
-+</P>
+-<p>You are free to use the image below on an Apache-powered web server. 
+-Thanks for using Apache!</p>
++<p>Information on the NetBSD multi-platform operating system can be found at
++<A HREF="http://www.netbsd.org/">The NetBSD Project homepage</A></p>
  
 -<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT=""></DIV>
++<p>Please feel free to use the images below on an Apache/NetBSD-powered web
++server.  Thanks for using
++<A HREF="http://www.apache.org/"Apache</A> on
++<A HREF="http://www.netbsd.org/"NetBSD</A>!</p>
++
 +<DIV ALIGN="CENTER">
 + <A HREF="http://www.apache.org/">
 +  <IMG SRC="apache_pb.gif" BORDER=0 ALT="Powered by Apache">
@@ -33,5 +30,6 @@ $NetBSD: patch-ac,v 1.4 2000/10/13 21:46:46 jlam Exp $
 +  <IMG SRC="sitedrivenby.gif" BORDER=0 ALT="Site driven by NetBSD">
 + </A>
 +</DIV>
+ 
  </BODY>
  </HTML>
diff --git a/www/apache/patches/patch-ae b/www/apache/patches/patch-ae
index 2d934d81f95..defd7cbcd99 100644
--- a/www/apache/patches/patch-ae
+++ b/www/apache/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2000/10/13 21:46:46 jlam Exp $
+$NetBSD: patch-ae,v 1.4 2001/02/02 16:39:57 jlam Exp $
 
---- src/modules/standard/mod_include.c.orig	Fri Sep 22 14:26:32 2000
+--- src/modules/standard/mod_include.c.orig	Mon Jan 15 12:05:42 2001
 +++ src/modules/standard/mod_include.c
-@@ -92,7 +92,11 @@
+@@ -93,7 +93,11 @@
  #include "http_log.h"
  #include "http_main.h"
  #include "util_script.h"
@@ -14,7 +14,7 @@ $NetBSD: patch-ae,v 1.3 2000/10/13 21:46:46 jlam Exp $
  
  #define STARTING_SEQUENCE "<!--#"
  #define ENDING_SEQUENCE "-->"
-@@ -351,7 +355,8 @@
+@@ -352,7 +356,8 @@
   * the tag value is html decoded if dodecode is non-zero
   */
  
@@ -24,7 +24,7 @@ $NetBSD: patch-ae,v 1.3 2000/10/13 21:46:46 jlam Exp $
  {
      char *t = tag, *tag_val, c, term;
  
-@@ -470,7 +475,8 @@
+@@ -471,7 +476,8 @@
  /*
   * Do variable substitution on strings
   */
@@ -34,7 +34,7 @@ $NetBSD: patch-ae,v 1.3 2000/10/13 21:46:46 jlam Exp $
  			size_t length, int leave_name)
  {
      char ch;
-@@ -668,7 +674,8 @@
+@@ -669,7 +675,8 @@
              parse_string(r, tag_val, parsed_string, sizeof(parsed_string), 0);
              if (tag[0] == 'f') {
                  /* be safe; only files in this directory or below allowed */
@@ -44,7 +44,7 @@ $NetBSD: patch-ae,v 1.3 2000/10/13 21:46:46 jlam Exp $
                      error_fmt = "unable to include file \"%s\" "
                          "in parsed file %s";
                  }
-@@ -1080,7 +1087,8 @@
+@@ -1081,7 +1088,8 @@
                          "in parsed file %s";
          }
          else {
@@ -54,7 +54,7 @@ $NetBSD: patch-ae,v 1.3 2000/10/13 21:46:46 jlam Exp $
              rr = ap_sub_req_lookup_file(tag_val, r);
  
              if (rr->status == HTTP_OK && rr->finfo.st_mode != 0) {
-@@ -2159,6 +2167,16 @@
+@@ -2160,6 +2168,16 @@
      }
  }
  
@@ -71,7 +71,7 @@ $NetBSD: patch-ae,v 1.3 2000/10/13 21:46:46 jlam Exp $
  
  
  /* -------------------------- The main function --------------------------- */
-@@ -2283,6 +2301,13 @@
+@@ -2284,6 +2302,13 @@
              }
  #endif
              else {
diff --git a/www/apache/patches/patch-af b/www/apache/patches/patch-af
index a9ac584adb2..7668e264fbf 100644
--- a/www/apache/patches/patch-af
+++ b/www/apache/patches/patch-af
@@ -1,15 +1,15 @@
-$NetBSD: patch-af,v 1.6 2000/09/12 14:17:32 jlam Exp $
+$NetBSD: patch-af,v 1.7 2001/02/02 16:39:57 jlam Exp $
 
---- src/modules/standard/mod_so.c.orig	Thu Sep  7 01:28:46 2000
+--- src/modules/standard/mod_so.c.orig	Fri Feb  2 00:42:13 2001
 +++ src/modules/standard/mod_so.c
-@@ -307,7 +307,15 @@
-     ap_os_dso_handle_t handle;
-     char *file;
- 
+@@ -318,7 +318,15 @@
+         return err;
+     }
+     
 -    file = ap_server_root_relative(cmd->pool, filename);
 +    /*
-+     * XXX Hack: If the filename starts with '!', then just as dlopen()
-+     * XXX without translating to a pathname relative to ServerRoot.
++     * If the filename starts with '!', then just dlopen() it without
++     * translating it to a pathname relative to ServerRoot.
 +     */
 +    if (filename[0] == '!') {
 +	file = filename + 1;
diff --git a/www/apache/patches/patch-ag b/www/apache/patches/patch-ag
deleted file mode 100644
index aae9bc10a41..00000000000
--- a/www/apache/patches/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2000/09/12 14:17:32 jlam Exp $
-
---- src/os/unix/os.c.orig	Sat Jan 15 11:01:09 2000
-+++ src/os/unix/os.c
-@@ -129,7 +129,12 @@
- #elif defined(HAVE_DYLD)
-     NSUnLinkModule(handle,FALSE);
- 
--#else
-+/*
-+ * Work around Apache dlclose() bug, where shared objects may be
-+ * dlclose()d before their cleanup procedures are called.
-+ * Fixes mod_perl vs. CGI interaction bug.
-+ */
-+#elif 0
-     dlclose(handle);
- #endif
- 
diff --git a/www/apache/patches/patch-ai b/www/apache/patches/patch-ai
index eb7417cb769..1789c5a0751 100644
--- a/www/apache/patches/patch-ai
+++ b/www/apache/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.3 2000/09/12 14:17:33 jlam Exp $
+$NetBSD: patch-ai,v 1.4 2001/02/02 16:39:58 jlam Exp $
 
---- src/support/apxs.pl.orig	Thu Sep  7 01:19:50 2000
+--- src/support/apxs.pl.orig	Fri Feb  2 00:42:14 2001
 +++ src/support/apxs.pl
-@@ -424,8 +424,7 @@
+@@ -427,8 +427,7 @@
          my $t = $f;
          $t =~ s|^.+/([^/]+)$|$1|;
          if ($opt_i) {
diff --git a/www/apache/pkg/COMMENT b/www/apache/pkg/COMMENT
index ba3bcc3a11c..3dc7a6b0651 100644
--- a/www/apache/pkg/COMMENT
+++ b/www/apache/pkg/COMMENT
@@ -1 +1 @@
-The Apache web server (http://www.apache.org/)
+HTTP (Web) server
diff --git a/www/apache/pkg/DEINSTALL b/www/apache/pkg/DEINSTALL
index 630c9822650..3235f808ba9 100644
--- a/www/apache/pkg/DEINSTALL
+++ b/www/apache/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.4 2000/12/22 19:41:53 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.5 2001/02/02 16:39:58 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -11,6 +11,8 @@ RMDIR="@RMDIR@"
 TRUE="@TRUE@"
 
 SERVERROOT=${PKG_PREFIX}/etc/httpd
+CGIBINDIR=${PKG_PREFIX}/libexec/cgi-bin
+DATADIR=${PKG_PREFIX}/share/httpd
 LOGDIR=/var/log/httpd
 SPOOLDIR=/var/spool/httpd
 SAMPLECONFDIR=${SERVERROOT}
@@ -48,6 +50,9 @@ POST-DEINSTALL)
 	${RMDIR} ${SPOOLDIR}/proxy 2>/dev/null || ${TRUE}
 	${RMDIR} ${SPOOLDIR} 2>/dev/null || ${TRUE}
 	${RMDIR} ${LOGDIR} 2>/dev/null || ${TRUE}
+	${RMDIR} ${DATADIR}/htdocs 2>/dev/null || ${TRUE}
+	${RMDIR} ${DATADIR} 2>/dev/null || ${TRUE}
+	${RMDIR} ${CGIBINDIR} 2>/dev/null || ${TRUE}
 	${RMDIR} ${SERVERROOT}/ssl.prm 2>/dev/null || ${TRUE}
 	${RMDIR} ${SERVERROOT}/ssl.key 2>/dev/null || ${TRUE}
 	${RMDIR} ${SERVERROOT}/ssl.csr 2>/dev/null || ${TRUE}
@@ -56,7 +61,7 @@ POST-DEINSTALL)
 	${RMDIR} ${SERVERROOT} 2>/dev/null || ${TRUE}
 
 	existing_dirs=''
-	for dir in ${CONFDIR} ${LOGDIR} ${REQUESTDIR}
+	for dir in ${CONFDIR} ${LOGDIR} ${REQUESTDIR} ${DATADIR}
 	do
 		if [ -d ${dir} ]
 		then
@@ -69,7 +74,6 @@ POST-DEINSTALL)
         	${CAT} << EOF
 ===========================================================================
 If you won't be using ${PKGNAME} any longer, you may want to remove:
-
 EOF
 		if [ -n "${modified_files}" ]
 		then
@@ -99,7 +103,6 @@ EOF
 ===========================================================================
 EOF
 	fi
-
 	;;
 
 *)
diff --git a/www/apache/pkg/DESCR b/www/apache/pkg/DESCR
index d877454ba56..cd2fdaa4cf7 100644
--- a/www/apache/pkg/DESCR
+++ b/www/apache/pkg/DESCR
@@ -1,3 +1,3 @@
-The latest version of the most popular web server on the 'net.
-This compile includes proxy server support, as well as the ability
-to add modules that add many other features.
+The Apache HTTP Server Project is a collaborative software development
+effort aimed at creating a robust, commercial-grade, featureful, and
+freely-available source code implementation of an HTTP (Web) server.
diff --git a/www/apache/pkg/INSTALL b/www/apache/pkg/INSTALL
index ff9c0f01988..34ca76ad245 100644
--- a/www/apache/pkg/INSTALL
+++ b/www/apache/pkg/INSTALL
@@ -1,12 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.3 2000/12/22 19:41:53 jlam Exp $
+# $NetBSD: INSTALL,v 1.4 2001/02/02 16:39:58 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
 
 CAT="@CAT@"
 CHMOD="@CHMOD@"
+CHOWN="@CHOWN@"
 CP="@CP@"
 MKDIR="@MKDIR@"
 
@@ -32,6 +33,7 @@ POST-INSTALL)
 	${MKDIR} ${LOGDIR}
 	${MKDIR} ${SPOOLDIR}
 	${MKDIR} ${SPOOLDIR}/proxy
+	${CHOWN} nobody:nobody ${SPOOLDIR}/proxy
 
 	echo "Installing configuration files:"
 	for file in ${CONFFILES} ${NONCONFFILES}
diff --git a/www/apache/pkg/PLIST b/www/apache/pkg/PLIST
index a4c2dd025e9..174fe9a2077 100644
--- a/www/apache/pkg/PLIST
+++ b/www/apache/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2000/10/13 21:46:46 jlam Exp $
+@comment $NetBSD: PLIST,v 1.18 2001/02/02 16:39:58 jlam Exp $
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
@@ -78,6 +78,7 @@ share/httpd/htdocs/index.html.cz
 share/httpd/htdocs/index.html.de
 share/httpd/htdocs/index.html.dk
 share/httpd/htdocs/index.html.ee
+share/httpd/htdocs/index.html.el
 share/httpd/htdocs/index.html.en
 share/httpd/htdocs/index.html.es
 share/httpd/htdocs/index.html.fr
@@ -103,16 +104,25 @@ share/httpd/htdocs/index.html.tw.Big5
 share/httpd/htdocs/manual/LICENSE
 share/httpd/htdocs/manual/bind.html
 share/httpd/htdocs/manual/cgi_path.html
-share/httpd/htdocs/manual/configuring.html
+share/httpd/htdocs/manual/configuring.html.en
+share/httpd/htdocs/manual/configuring.html.ja.jis
 share/httpd/htdocs/manual/content-negotiation.html
-share/httpd/htdocs/manual/custom-error.html
+share/httpd/htdocs/manual/custom-error.html.en
+share/httpd/htdocs/manual/custom-error.html.ja.jis
 share/httpd/htdocs/manual/dns-caveats.html
 share/httpd/htdocs/manual/dso.html
 share/httpd/htdocs/manual/ebcdic.html
 share/httpd/htdocs/manual/env.html
 share/httpd/htdocs/manual/footer.html
-share/httpd/htdocs/manual/handler.html
+share/httpd/htdocs/manual/handler.html.en
+share/httpd/htdocs/manual/handler.html.ja.jis
 share/httpd/htdocs/manual/header.html
+share/httpd/htdocs/manual/howto/cgi.html.en
+share/httpd/htdocs/manual/howto/cgi.html.ja.jis
+share/httpd/htdocs/manual/howto/footer.html
+share/httpd/htdocs/manual/howto/header.html
+share/httpd/htdocs/manual/howto/ssi.html
+share/httpd/htdocs/manual/images/apache_header.gif
 share/httpd/htdocs/manual/images/custom_errordocs.gif
 share/httpd/htdocs/manual/images/home.gif
 share/httpd/htdocs/manual/images/index.gif
@@ -120,10 +130,13 @@ share/httpd/htdocs/manual/images/mod_rewrite_fig1.fig
 share/httpd/htdocs/manual/images/mod_rewrite_fig1.gif
 share/httpd/htdocs/manual/images/mod_rewrite_fig2.fig
 share/httpd/htdocs/manual/images/mod_rewrite_fig2.gif
+share/httpd/htdocs/manual/images/pixel.gif
 share/httpd/htdocs/manual/images/sub.gif
-share/httpd/htdocs/manual/index.html
+share/httpd/htdocs/manual/index.html.en
+share/httpd/htdocs/manual/index.html.ja.jis
 share/httpd/htdocs/manual/install-tpf.html
-share/httpd/htdocs/manual/install.html
+share/httpd/htdocs/manual/install.html.en
+share/httpd/htdocs/manual/install.html.ja.jis
 share/httpd/htdocs/manual/invoking.html
 share/httpd/htdocs/manual/keepalive.html
 share/httpd/htdocs/manual/location.html
@@ -153,7 +166,8 @@ share/httpd/htdocs/manual/misc/tutorials.html
 share/httpd/htdocs/manual/misc/vif-info.html
 share/httpd/htdocs/manual/misc/windoz_keepalive.html
 share/httpd/htdocs/manual/mod/core.html
-share/httpd/htdocs/manual/mod/directive-dict.html
+share/httpd/htdocs/manual/mod/directive-dict.html.en
+share/httpd/htdocs/manual/mod/directive-dict.html.ja.jis
 share/httpd/htdocs/manual/mod/directives.html
 share/httpd/htdocs/manual/mod/footer.html
 share/httpd/htdocs/manual/mod/header.html
@@ -176,7 +190,6 @@ share/httpd/htdocs/manual/mod/mod_cookies.html
 share/httpd/htdocs/manual/mod/mod_digest.html
 share/httpd/htdocs/manual/mod/mod_dir.html
 share/httpd/htdocs/manual/mod/mod_dld.html
-share/httpd/htdocs/manual/mod/mod_dll.html
 share/httpd/htdocs/manual/mod/mod_env.html
 share/httpd/htdocs/manual/mod/mod_example.html
 share/httpd/htdocs/manual/mod/mod_expires.html
@@ -192,7 +205,8 @@ share/httpd/htdocs/manual/mod/mod_log_referer.html
 share/httpd/htdocs/manual/mod/mod_mime.html
 share/httpd/htdocs/manual/mod/mod_mime_magic.html
 share/httpd/htdocs/manual/mod/mod_mmap_static.html
-share/httpd/htdocs/manual/mod/mod_negotiation.html
+share/httpd/htdocs/manual/mod/mod_negotiation.html.en
+share/httpd/htdocs/manual/mod/mod_negotiation.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_proxy.html
 share/httpd/htdocs/manual/mod/mod_rewrite.html
 share/httpd/htdocs/manual/mod/mod_setenvif.html
@@ -203,19 +217,37 @@ share/httpd/htdocs/manual/mod/mod_unique_id.html
 share/httpd/htdocs/manual/mod/mod_userdir.html
 share/httpd/htdocs/manual/mod/mod_usertrack.html
 share/httpd/htdocs/manual/mod/mod_vhost_alias.html
-share/httpd/htdocs/manual/mod/module-dict.html
+share/httpd/htdocs/manual/mod/module-dict.html.en
+share/httpd/htdocs/manual/mod/module-dict.html.ja.jis
 share/httpd/htdocs/manual/mpeix.html
 share/httpd/htdocs/manual/multilogs.html
 share/httpd/htdocs/manual/netware.html
 share/httpd/htdocs/manual/new_features_1_0.html
 share/httpd/htdocs/manual/new_features_1_1.html
 share/httpd/htdocs/manual/new_features_1_2.html
-share/httpd/htdocs/manual/new_features_1_3.html
+share/httpd/htdocs/manual/new_features_1_3.html.en
+share/httpd/htdocs/manual/new_features_1_3.html.ja.jis
 share/httpd/htdocs/manual/new_features_2_0.html
 share/httpd/htdocs/manual/process-model.html
+share/httpd/htdocs/manual/programs/ab.html
+share/httpd/htdocs/manual/programs/apachectl.html
+share/httpd/htdocs/manual/programs/apxs.html
+share/httpd/htdocs/manual/programs/dbmmanage.html
+share/httpd/htdocs/manual/programs/footer.html
+share/httpd/htdocs/manual/programs/header.html
+share/httpd/htdocs/manual/programs/htdigest.html
+share/httpd/htdocs/manual/programs/htpasswd.html
+share/httpd/htdocs/manual/programs/httpd.html
+share/httpd/htdocs/manual/programs/index.html
+share/httpd/htdocs/manual/programs/logresolve.html
+share/httpd/htdocs/manual/programs/other.html
+share/httpd/htdocs/manual/programs/rotatelogs.html
+share/httpd/htdocs/manual/programs/suexec.html
 share/httpd/htdocs/manual/readme-tpf.html
 share/httpd/htdocs/manual/search/manual-index.cgi
 share/httpd/htdocs/manual/sections.html
+share/httpd/htdocs/manual/server-wide.html.en
+share/httpd/htdocs/manual/server-wide.html.ja.jis
 share/httpd/htdocs/manual/sourcereorg.html
 share/httpd/htdocs/manual/stopping.html
 share/httpd/htdocs/manual/suexec.html
@@ -229,7 +261,8 @@ share/httpd/htdocs/manual/vhosts/fd-limits.html
 share/httpd/htdocs/manual/vhosts/footer.html
 share/httpd/htdocs/manual/vhosts/header.html
 share/httpd/htdocs/manual/vhosts/host.html
-share/httpd/htdocs/manual/vhosts/index.html
+share/httpd/htdocs/manual/vhosts/index.html.en
+share/httpd/htdocs/manual/vhosts/index.html.ja.jis
 share/httpd/htdocs/manual/vhosts/ip-based.html
 share/httpd/htdocs/manual/vhosts/mass.html
 share/httpd/htdocs/manual/vhosts/name-based.html
@@ -352,12 +385,12 @@ share/httpd/icons/world2.gif
 @dirrm share/httpd/icons
 @dirrm share/httpd/htdocs/manual/vhosts
 @dirrm share/httpd/htdocs/manual/search
+@dirrm share/httpd/htdocs/manual/programs
 @dirrm share/httpd/htdocs/manual/mod
 @dirrm share/httpd/htdocs/manual/misc
 @dirrm share/httpd/htdocs/manual/images
+@dirrm share/httpd/htdocs/manual/howto
 @dirrm share/httpd/htdocs/manual
-@dirrm share/httpd/htdocs
-@dirrm share/httpd
 @dirrm include/httpd/xml
 @dirrm include/httpd
 @unexec rmdir %D/libexec/cgi-bin 2>/dev/null || true