use 2.0.16.

Changes with Apache 2.0.16

  *) Change the default installation directory to /usr/local/apache2,
     as now defined by the "Apache" layout in config.layout. [Marc Slemko]

  *) OS/2: Added support for building loadable modules as OS/2 DLLs.
     [Brian Havard]

  *) Get MaxRequestsPerChild working with the Windows MPM.
     [Bill Stoddard]

  *) Make generic hooks to work, with mod_generic_hook_import/export
     experimental modules.  [Ben Laurie, Will Rowe]

  *) Fix segfaults for configuration file syntax errors such as
     "<Directory>" followed by "</Directory" and
     "<Directory>" followed by "</Directoryz>".  [Jeff Trawick]

  *) Cleanup the --enable-layout option of configure.  This makes
     us use a consistent location for the config.layout file, and it
     makes configure more portable.
     [jun-ichiro hagino <itojun@iijlab.net>]

  *) Changes to 'ab'; fixed int overrun's, added statistics, output in
     csv/gnuplot format, rudimentary ssl support and various other tweaks
     to make results more true to what is measured. The upshot of this it
     turns out that 'ab' has often underreported the true performance of
     apache. Often by a order of magnitude :-) See talk/paper of Sander
     Temme <sctemme@covalent.net> at April ApacheCon 2001 for details.
     [Dirk-Willem van Gulik]

  *) Clean up mod_cgid's temporary request pool.  Besides fixing a
     storage leak this ensures that some unnecessary pipes are closed.
     [Jeff Trawick]

  *) Performance: Add quick_handler hook. This hook is called at the
     very beginning of the request processing before location_walk,
     translate_name, etc.  This hook is useful for URI keyed content
     caches like Mike Abbott's Quick Shortcut Cache.
     [Bill Stoddard]

  *) top_module global variable renamed to ap_top_module [Perl]

  *) Move ap_set_last_modified to the core.  This is a potentially
     controversial change, because this is kind of HTTP specific.  However
     many protocols should be able to take advantage of this kind of
     information.  I expect that headers will need one more layer of
     indirection for multi-protocol work, but this is a small step in
     the right direction.  [Ryan Bloom]

  *) Enable mod_status by default.  This matches what Apache 1.3 does.
     [Ed Korthof]

  *) Add a ScriptSock directive to the default config file.  This is
     only enabled when mod_cgid is used.
     [Taketo Kabe <kabe@sra-tohoku.co.jp>]

7 files changed, 28 insertions, 53 deletions

diff --git a/www/apache-current/Makefile b/www/apache-current/Makefile
index add2a7c9efd..d197c436f69 100644
--- a/www/apache-current/Makefile
+++ b/www/apache-current/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2001/04/02 15:15:27 agc Exp $
+# $NetBSD: Makefile,v 1.5 2001/04/08 10:55:21 itojun Exp $
 
-DISTNAME=		httpd-2_0_15-alpha
-PKGNAME=		apache-2.0.15
+DISTNAME=		httpd-2_0_16-beta
+PKGNAME=		apache-2.0.16
 CATEGORIES=		www
 MASTER_SITES=		http://httpd.apache.org/dist/httpd/ \
 			http://www.netbsd.org/images/logos/
@@ -28,6 +28,7 @@ CONFIGURE_ARGS+=	--with-ssl=/usr/include --enable-tls
 .endif
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--enable-shared
+CONFIGURE_ARGS+=	--enable-rewrite
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/srclib/pcre/ltconfig \
 			${WRKSRC}/srclib/apr/build/ltconfig \
@@ -36,7 +37,7 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/srclib/pcre/ltconfig \
 			${WRKSRC}/srclib/apr-util/xml/expat/conftools/ltconfig \
 			${WRKSRC}/ltconfig
 
-WRKSRC=			${WRKDIR}/httpd-2_0_15
+WRKSRC=			${WRKDIR}/httpd-2_0_16
 
 LIBS=	srclib/apr/shmem/unix/mm/libmm.la \
 	srclib/apr/libapr.la \
@@ -45,6 +46,7 @@ LIBS=	srclib/apr/shmem/unix/mm/libmm.la \
 
 post-patch:
 	${RM} ${WRKSRC}/docs/conf/*.orig
+	(cd ${WRKSRC}; ${LN} -s ${LOCALBASE}/bin/libtool)
 
 pre-install:
 	for i in ${LIBS}; do \
diff --git a/www/apache-current/files/md5 b/www/apache-current/files/md5
index a0ef4244661..54607dd4e48 100644
--- a/www/apache-current/files/md5
+++ b/www/apache-current/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2001/03/30 22:06:00 itojun Exp $
+$NetBSD: md5,v 1.2 2001/04/08 10:55:21 itojun Exp $
 
-SHA1 (httpd-2_0_15-alpha.tar.Z) = d5d61ed5a48f93e64aaeed52c540d56cccb64e1c
+SHA1 (httpd-2_0_16-beta.tar.Z) = 388ba6e11f9dbb39f52512a2354ec20706049c2a
diff --git a/www/apache-current/files/patch-sum b/www/apache-current/files/patch-sum
index 69a5699c674..af25007175b 100644
--- a/www/apache-current/files/patch-sum
+++ b/www/apache-current/files/patch-sum
@@ -1,9 +1,8 @@
-$NetBSD: patch-sum,v 1.1.1.1 2001/03/30 22:06:00 itojun Exp $
+$NetBSD: patch-sum,v 1.2 2001/04/08 10:55:21 itojun Exp $
 
 SHA1 (patch-aa) = b43cd6a31b5c0f318b0cd9e9fbe08938dd7cfda0
-SHA1 (patch-ab) = 587342cb4c3d628b236ae6f2727ce76d0ce1bcf1
 SHA1 (patch-ac) = bf100d182752ad94fbb3d1fb3c9d59edef0425f0
 SHA1 (patch-ad) = 56d3bc6023cd3457cbd96268f43fe2ce505caaa6
-SHA1 (patch-ae) = ba6f3a16f94b52c4d4a5b2f9e1a79b20590e79e9
-SHA1 (patch-af) = 7dce7242d78ca6b2e182521a71ddbc790c13bd7a
-SHA1 (patch-ag) = 6aeb531f4ebc9444c27c71682f891eb08f47a72b
+SHA1 (patch-ae) = 5747317d24d8fa09bbd99b170983e59ff38647a4
+SHA1 (patch-af) = fed6d9e6eabeb10bf8d5f9b60c5f8d61306f6b10
+SHA1 (patch-ag) = a6b3e8dc948a90c03dabe4b8b2dc8f43d90f66e2
diff --git a/www/apache-current/patches/patch-ab b/www/apache-current/patches/patch-ab
deleted file mode 100644
index d910286d7c1..00000000000
--- a/www/apache-current/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/03/30 22:06:01 itojun Exp $
-
---- configure-	Fri Mar 30 20:38:49 2001
-+++ configure	Fri Mar 30 20:43:23 2001
-@@ -3434,18 +3434,18 @@
- else  
-   
-   if test ! -f $srcdir/config.layout; then
--    echo "** Error: Layout file $srcdir/../config.layout not found"
-+    echo "** Error: Layout file $srcdir/config.layout not found"
-     echo "** Error: Cannot use undefined layout '$LAYOUT'"
-     exit 1
-   fi
--  pldconf=config.pld
-+  pldconf=./config.pld
-   
-   sed -e "1,/[ 	]*<[lL]ayout[ 	]*$LAYOUT[ 	]*>[ 	]*/d" \
-       -e '/[ 	]*<\/Layout>[ 	]*/,$d' \
-       -e "s/^[ 	]*//g" \
-       -e "s/:[ 	]*/=\'/g" \
-       -e "s/[ 	]*$/'/g" \
--      $srcdir/../config.layout > $pldconf
-+      $srcdir/config.layout > $pldconf
-   layout_name=$LAYOUT
-   . $pldconf
-   rm $pldconf
diff --git a/www/apache-current/patches/patch-ae b/www/apache-current/patches/patch-ae
index d0aced53600..0d5eb3e707f 100644
--- a/www/apache-current/patches/patch-ae
+++ b/www/apache-current/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/03/30 22:06:01 itojun Exp $
+$NetBSD: patch-ae,v 1.2 2001/04/08 10:55:22 itojun Exp $
 
---- docs/conf/httpd-std.conf.orig	Fri Feb 23 03:54:49 2001
-+++ docs/conf/httpd-std.conf	Fri Mar 30 23:10:10 2001
+--- docs/conf/httpd-std.conf.orig	Mon Mar 26 01:54:48 2001
++++ docs/conf/httpd-std.conf	Sun Apr  8 12:05:13 2001
 @@ -58,13 +58,13 @@
  # DISK. The PID of the main server process is automatically appended to
  # the filename. 
@@ -89,7 +89,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2001/03/30 22:06:01 itojun Exp $
  
  #
  # Optionally add a line containing the server version and virtual host
-@@ -936,6 +939,6 @@
+@@ -944,6 +947,6 @@
  #    ServerAdmin webmaster@dummy-host.example.com
  #    DocumentRoot /www/docs/dummy-host.example.com
  #    ServerName dummy-host.example.com
diff --git a/www/apache-current/patches/patch-af b/www/apache-current/patches/patch-af
index bf6c3944d44..dc51937997f 100644
--- a/www/apache-current/patches/patch-af
+++ b/www/apache-current/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/03/30 22:06:02 itojun Exp $
+$NetBSD: patch-af,v 1.2 2001/04/08 10:55:22 itojun Exp $
 
---- Makefile.in.orig	Sun Mar 11 23:54:12 2001
-+++ Makefile.in	Fri Mar 30 23:18:34 2001
-@@ -24,6 +24,8 @@
+--- Makefile.in.orig	Wed Apr  4 02:03:35 2001
++++ Makefile.in	Sun Apr  8 12:05:30 2001
+@@ -25,6 +25,8 @@
  include $(top_srcdir)/build/rules.mk
  include $(top_srcdir)/build/program.mk
  
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/03/30 22:06:02 itojun Exp $
  install-conf:
  	@echo Installing configuration files
  	@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
-@@ -32,7 +34,7 @@
+@@ -33,7 +35,7 @@
  		$(INSTALL_DATA) $$i $(sysconfdir); \
  	done; \
  	for i in *-std*; do \
@@ -20,7 +20,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/03/30 22:06:02 itojun Exp $
  		    -e 's#@@Port@@#$(PORT)#g' \
  			< $$i > $(sysconfdir)/$$i; \
  		chmod 0644 $(sysconfdir)/$$i; \
-@@ -41,7 +43,7 @@
+@@ -42,7 +44,7 @@
  			file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
  		fi; \
  		if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \
@@ -29,7 +29,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/03/30 22:06:02 itojun Exp $
  		fi; \
  	done
  
-@@ -78,10 +80,10 @@
+@@ -79,10 +81,10 @@
  	@echo Installing Support Binaries
  	@test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
  	@cp -p $(srcdir)/support/httpd.exp $(bindir)
diff --git a/www/apache-current/patches/patch-ag b/www/apache-current/patches/patch-ag
index 3282dd9d407..78b4de27955 100644
--- a/www/apache-current/patches/patch-ag
+++ b/www/apache-current/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/03/30 22:06:02 itojun Exp $
+$NetBSD: patch-ag,v 1.2 2001/04/08 10:55:22 itojun Exp $
 
---- build/rules.mk-	Fri Mar 30 22:23:57 2001
-+++ build/rules.mk	Fri Mar 30 22:35:49 2001
-@@ -80,9 +80,9 @@
+--- build/rules.mk.orig	Tue Apr  3 09:29:42 2001
++++ build/rules.mk	Sun Apr  8 12:05:48 2001
+@@ -79,9 +79,9 @@
+ # Helper programs
  
- SH_LIBTOOL = $(SHELL) $(top_builddir)/shlibtool --silent
  MKINSTALLDIRS = $(abs_srcdir)/build/mkdir.sh
 -INSTALL = $(abs_srcdir)/build/install.sh -c
 -INSTALL_DATA = $(INSTALL) -m 644