Changes 2.0.54:

  *) mod_cache: Add CacheIgnoreHeaders directive.
  *) mod_ldap: Added the directive LDAPConnectionTimeout to configure
     the ldap socket connection timeout value.
  *) Correctly export all mod_dav public functions.
  *) Add a build script to create a solaris package.
  *) worker MPM: Fix a problem which could cause httpd processes to
     remain active after shutdown.
  *) Unix MPMs: Shut down the server more quickly when child processes are
     slow to exit.
  *) Remove formatting characters from ap_log_error() calls.  These
     were escaped as fallout from CAN-2003-0020.
  *) mod_ssl: If SSLUsername is used, set r->user earlier.
  *) htdigest: Fix permissions of created files.
  *) core_input_filter: Move buckets to a persistent brigade instead of
     creating a new brigade. This stop a memory leak when proxying a
     Streaming Media Server.
  *) mod_win32: Ignore both PATH_INFO as well as PATH_TRANSLATED to avoid
     hiccups from additional path information passed in non-utf-8 format.

4 files changed, 17 insertions, 18 deletions

diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 31e3b0b219f..caa3d9912e6 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/04/11 21:45:17 tv Exp $
+# $NetBSD: Makefile,v 1.34 2005/04/25 09:13:02 adam Exp $
 
 .include "../../www/apache2/Makefile.common"
 
@@ -14,12 +14,11 @@ CONFLICTS=		apache2<=2.0.45
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_LIBTOOL=		YES
-
 WRKSRC=			${WRKDIR}/${DISTNAME}/srclib
 BUILD_DIRS=		${WRKSRC}/apr ${WRKSRC}/apr-util
 
-GNU_CONFIGURE=		YES
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		LIBS="${LIBS}"
 LIBS.SunOS+=		-lnsl
 
diff --git a/devel/apr/distinfo b/devel/apr/distinfo
index e37c813d1ac..a34a4cec6cf 100644
--- a/devel/apr/distinfo
+++ b/devel/apr/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2005/02/23 22:24:09 agc Exp $
+$NetBSD: distinfo,v 1.13 2005/04/25 09:13:02 adam Exp $
 
-SHA1 (httpd-2.0.53.tar.gz) = e58a84887f1cd727d0091b185c0bd3e641f75df9
-RMD160 (httpd-2.0.53.tar.gz) = 91a5cd2f35cf4db5915fe621ec237f63474368cd
-Size (httpd-2.0.53.tar.gz) = 6946727 bytes
-SHA1 (patch-an) = 64006f0f1b5c3f20df6f47624e56aac0d99ae056
-SHA1 (patch-ao) = 25d44b0028772535da908895444d2bfe56f44120
+SHA1 (httpd-2.0.54.tar.bz2) = 15b4fc3024cceea6562fb03383fd624e84e5e35a
+RMD160 (httpd-2.0.54.tar.bz2) = c511cb2fa396ba04caf77bfc6ca03413df48ea08
+Size (httpd-2.0.54.tar.bz2) = 5566979 bytes
+SHA1 (patch-an) = 76d9ac0cdddec7c0f41535baee63bf0aa26ed596
+SHA1 (patch-ao) = d04d37445b7e8a50a74caa9bda3e6b10924e8322
 SHA1 (patch-ap) = 357776c7208407936e09891ae87d23b112a12756
 SHA1 (patch-aq) = 6cc1fb879fb5d9280f543ebe068a441e2e6560f3
diff --git a/devel/apr/patches/patch-an b/devel/apr/patches/patch-an
index 4c165831d98..600e57de029 100644
--- a/devel/apr/patches/patch-an
+++ b/devel/apr/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.1.1.1 2003/05/25 08:55:19 epg Exp $
+$NetBSD: patch-an,v 1.2 2005/04/25 09:13:02 adam Exp $
 
---- apr/configure.in.orig	2003-01-06 21:04:08.000000000 +0200
-+++ apr/configure.in	2003-01-28 16:11:24.000000000 +0200
-@@ -1635,7 +1635,7 @@
+--- apr/configure.in.orig	2005-02-04 16:58:13.000000000 +0000
++++ apr/configure.in
+@@ -1679,7 +1679,7 @@ if test "$rand" != "1"; then
    if test "$apr_devrandom" = "yes"; then
      # /dev/random on OpenBSD doesn't provide random data, so
      # prefer /dev/arandom, which does; see random(4).
diff --git a/devel/apr/patches/patch-ao b/devel/apr/patches/patch-ao
index 51e0a691042..5cc8d7ef76a 100644
--- a/devel/apr/patches/patch-ao
+++ b/devel/apr/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.1.1.1 2003/05/25 08:55:19 epg Exp $
+$NetBSD: patch-ao,v 1.2 2005/04/25 09:13:02 adam Exp $
 
---- apr/configure.orig	2003-01-18 17:20:31.000000000 +0200
-+++ apr/configure	2003-01-28 16:13:11.000000000 +0200
-@@ -24713,7 +24713,7 @@
+--- apr/configure.orig	2005-04-11 21:04:37.000000000 +0000
++++ apr/configure
+@@ -40289,7 +40289,7 @@ fi;
    if test "$apr_devrandom" = "yes"; then
      # /dev/random on OpenBSD doesn't provide random data, so
      # prefer /dev/arandom, which does; see random(4).