[pkgsrc/trunk]: pkgsrc Changes 2.0.54:

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f27c871debd7
branches:  trunk
changeset: 493004:f27c871debd7
user:      adam <adam%pkgsrc.org@localhost>
date:      Mon Apr 25 09:13:02 2005 +0000

description:
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.

diffstat:

 devel/apr/Makefile           |    7 +-
 devel/apr/distinfo           |   12 +-
 devel/apr/patches/patch-an   |    8 +-
 devel/apr/patches/patch-ao   |    8 +-
 www/apache2/Makefile         |   26 +-
 www/apache2/Makefile.common  |    7 +-
 www/apache2/PLIST            |  480 ++++++++++++++++++++++--------------------
 www/apache2/distinfo         |   20 +-
 www/apache2/patches/patch-ab |    6 +-
 www/apache2/patches/patch-ac |    6 +-
 www/apache2/patches/patch-ad |    8 +-
 www/apache2/patches/patch-ai |    6 +-
 www/apache2/patches/patch-al |   12 +-
 www/apache2/patches/patch-am |    6 +-
 14 files changed, 317 insertions(+), 295 deletions(-)

diffs (truncated from 937 to 300 lines):

diff -r f85417a6c72e -r f27c871debd7 devel/apr/Makefile
--- a/devel/apr/Makefile        Mon Apr 25 06:16:38 2005 +0000
+++ b/devel/apr/Makefile        Mon Apr 25 09:13:02 2005 +0000
@@ -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 @@
 
 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 -r f85417a6c72e -r f27c871debd7 devel/apr/distinfo
--- a/devel/apr/distinfo        Mon Apr 25 06:16:38 2005 +0000
+++ b/devel/apr/distinfo        Mon Apr 25 09:13:02 2005 +0000
@@ -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 -r f85417a6c72e -r f27c871debd7 devel/apr/patches/patch-an
--- a/devel/apr/patches/patch-an        Mon Apr 25 06:16:38 2005 +0000
+++ b/devel/apr/patches/patch-an        Mon Apr 25 09:13:02 2005 +0000
@@ -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 -r f85417a6c72e -r f27c871debd7 devel/apr/patches/patch-ao
--- a/devel/apr/patches/patch-ao        Mon Apr 25 06:16:38 2005 +0000
+++ b/devel/apr/patches/patch-ao        Mon Apr 25 09:13:02 2005 +0000
@@ -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).
diff -r f85417a6c72e -r f27c871debd7 www/apache2/Makefile
--- a/www/apache2/Makefile      Mon Apr 25 06:16:38 2005 +0000
+++ b/www/apache2/Makefile      Mon Apr 25 09:13:02 2005 +0000
@@ -1,22 +1,20 @@
-# $NetBSD: Makefile,v 1.70 2005/04/18 14:35:57 tron Exp $
+# $NetBSD: Makefile,v 1.71 2005/04/25 09:13:14 adam Exp $
 
 .include "Makefile.common"
 
-PKGNAME=               apache-${APACHE_VERSION}
-PKGREVISION=           2
-CATEGORIES=            www
+PKGNAME=       apache-${APACHE_VERSION}
+CATEGORIES=    www
 
-HOMEPAGE=              http://httpd.apache.org/
-COMMENT=               Apache HTTP (Web) server, version 2
+HOMEPAGE=      http://httpd.apache.org/
+COMMENT=       Apache HTTP (Web) server, version 2
 
-CONFLICTS=             apache-*ssl-[0-9]* apache-[0-9]* apache6-[0-9]*
+CONFLICTS=     apache-*ssl-[0-9]* apache-[0-9]* apache6-[0-9]*
 
-BUILD_DEFS+=           USE_INET6
+BUILD_DEFS+=   USE_INET6
 
-USE_PKGINSTALL=                YES
-USE_LIBTOOL=           YES
-
-GNU_CONFIGURE=         YES
+USE_LIBTOOL=           yes
+USE_PKGINSTALL=                yes
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-layout=NetBSD
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
@@ -89,7 +87,7 @@
 
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure
-SUBST_FILES.paths=     config.layout   
+SUBST_FILES.paths=     config.layout
 SUBST_SED.paths=       -e "s|@PREFIX@|${PREFIX}|g"
 SUBST_MESSAGE.paths=   "Fixing paths."
 
@@ -146,7 +144,7 @@
        ${TOUCH} ${WRKSRC}/libtool
 
 post-build:
-       ${SED} "s#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#g" \
+       ${SED} "s#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#g"                 \
                < ${FILESDIR}/mkcert.sh > ${WRKDIR}/mkcert
 
 pre-install:
diff -r f85417a6c72e -r f27c871debd7 www/apache2/Makefile.common
--- a/www/apache2/Makefile.common       Mon Apr 25 06:16:38 2005 +0000
+++ b/www/apache2/Makefile.common       Mon Apr 25 09:13:02 2005 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile.common,v 1.15 2005/04/18 13:20:40 wiz Exp $
+# $NetBSD: Makefile.common,v 1.16 2005/04/25 09:13:14 adam Exp $
 
 DISTNAME=              httpd-${APACHE_VERSION}
+EXTRACT_SUFX=          .tar.bz2
 # When updating this version be sure to update the checksum and remove
 # any PKGREVISION for devel/apr also.
-APACHE_VERSION=                2.0.53
-APR_VERSION=            0.9.6
+APACHE_VERSION=                2.0.54
+APR_VERSION=           0.9.6
 MASTER_SITES=          ${MASTER_SITE_APACHE:=httpd/} \
                        ${MASTER_SITE_APACHE:=httpd/old/} \
                        http://www.NetBSD.org/images/logos/
diff -r f85417a6c72e -r f27c871debd7 www/apache2/PLIST
--- a/www/apache2/PLIST Mon Apr 25 06:16:38 2005 +0000
+++ b/www/apache2/PLIST Mon Apr 25 09:13:02 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2005/04/11 18:56:05 martti Exp $
+@comment $NetBSD: PLIST,v 1.29 2005/04/25 09:13:14 adam Exp $
 include/httpd/ap_compat.h
 include/httpd/ap_config.h
 include/httpd/ap_config_auto.h
@@ -52,6 +52,8 @@
 include/httpd/util_time.h
 include/httpd/util_xml.h
 lib/httpd/httpd.exp
+libexec/cgi-bin/printenv
+libexec/cgi-bin/test-cgi
 man/man1/dbmmanage.1
 man/man1/htdigest.1
 man/man1/htpasswd.1
@@ -72,8 +74,8 @@
 sbin/htdigest
 sbin/htpasswd
 sbin/httpd
+sbin/logresolve
 sbin/mkcert
-sbin/logresolve
 sbin/rotatelogs
 ${SUEXEC_COMMENT}sbin/suexec
 share/examples/httpd/highperformance-std.conf
@@ -90,68 +92,194 @@
 share/httpd/build/program.mk
 share/httpd/build/rules.mk
 share/httpd/build/special.mk
+share/httpd/error/HTTP_BAD_GATEWAY.html.var
+share/httpd/error/HTTP_BAD_REQUEST.html.var
+share/httpd/error/HTTP_FORBIDDEN.html.var
+share/httpd/error/HTTP_GONE.html.var
+share/httpd/error/HTTP_INTERNAL_SERVER_ERROR.html.var
+share/httpd/error/HTTP_LENGTH_REQUIRED.html.var
+share/httpd/error/HTTP_METHOD_NOT_ALLOWED.html.var
+share/httpd/error/HTTP_NOT_ACCEPTABLE.html.var
+share/httpd/error/HTTP_NOT_FOUND.html.var
+share/httpd/error/HTTP_NOT_IMPLEMENTED.html.var
+share/httpd/error/HTTP_PRECONDITION_FAILED.html.var
+share/httpd/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
+share/httpd/error/HTTP_REQUEST_TIME_OUT.html.var
+share/httpd/error/HTTP_REQUEST_URI_TOO_LARGE.html.var
+share/httpd/error/HTTP_SERVICE_UNAVAILABLE.html.var
+share/httpd/error/HTTP_UNAUTHORIZED.html.var
+share/httpd/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
+share/httpd/error/HTTP_VARIANT_ALSO_VARIES.html.var
+share/httpd/error/README
+share/httpd/error/contact.html.var
 share/httpd/error/include/bottom.html
 share/httpd/error/include/spacer.html
 share/httpd/error/include/top.html
-share/httpd/error/contact.html.var
-share/httpd/error/README
-share/httpd/error/HTTP_VARIANT_ALSO_VARIES.html.var
-share/httpd/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
-share/httpd/error/HTTP_UNAUTHORIZED.html.var
-share/httpd/error/HTTP_SERVICE_UNAVAILABLE.html.var
-share/httpd/error/HTTP_REQUEST_URI_TOO_LARGE.html.var
-share/httpd/error/HTTP_REQUEST_TIME_OUT.html.var
-share/httpd/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
-share/httpd/error/HTTP_PRECONDITION_FAILED.html.var
-share/httpd/error/HTTP_NOT_IMPLEMENTED.html.var
-share/httpd/error/HTTP_NOT_FOUND.html.var
-share/httpd/error/HTTP_NOT_ACCEPTABLE.html.var
-share/httpd/error/HTTP_METHOD_NOT_ALLOWED.html.var
-share/httpd/error/HTTP_LENGTH_REQUIRED.html.var
-share/httpd/error/HTTP_INTERNAL_SERVER_ERROR.html.var
-share/httpd/error/HTTP_GONE.html.var
-share/httpd/error/HTTP_FORBIDDEN.html.var
-share/httpd/error/HTTP_BAD_REQUEST.html.var
-share/httpd/error/HTTP_BAD_GATEWAY.html.var
-libexec/cgi-bin/printenv
-libexec/cgi-bin/test-cgi
 share/httpd/htdocs/apache_pb.gif
-share/httpd/htdocs/index.html.zh-cn.gb2312
-share/httpd/htdocs/index.html.var
-share/httpd/htdocs/index.html.sv
-share/httpd/htdocs/index.html.ru.utf8
-share/httpd/htdocs/index.html.ru.koi8-r
-share/httpd/htdocs/index.html.ru.iso-ru
+share/httpd/htdocs/apache_pb.png
+share/httpd/htdocs/apache_pb2.gif
+share/httpd/htdocs/apache_pb2.png
+share/httpd/htdocs/apache_pb2_ani.gif
+share/httpd/htdocs/index.html.ca
+share/httpd/htdocs/index.html.cz.iso8859-2
+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.et
+share/httpd/htdocs/index.html.fr
+share/httpd/htdocs/index.html.he.iso8859-8
+share/httpd/htdocs/index.html.hr.iso8859-2
+share/httpd/htdocs/index.html.it
+share/httpd/htdocs/index.html.ja.iso2022-jp
+share/httpd/htdocs/index.html.ko.euc-kr
+share/httpd/htdocs/index.html.lb.utf8
+share/httpd/htdocs/index.html.nl
+share/httpd/htdocs/index.html.nn
+share/httpd/htdocs/index.html.no
+share/httpd/htdocs/index.html.po.iso8859-2
+share/httpd/htdocs/index.html.pt
+share/httpd/htdocs/index.html.pt-br
+share/httpd/htdocs/index.html.ru.cp-1251
 share/httpd/htdocs/index.html.ru.cp866
-share/httpd/htdocs/index.html.ru.cp-1251
-share/httpd/htdocs/index.html.pt-br
-share/httpd/htdocs/index.html.pt
-share/httpd/htdocs/index.html.po.iso8859-2
-share/httpd/htdocs/index.html.no
-share/httpd/htdocs/index.html.nn
-share/httpd/htdocs/index.html.nl
-share/httpd/htdocs/index.html.lb.utf8
-share/httpd/htdocs/index.html.ko.euc-kr
-share/httpd/htdocs/index.html.ja.iso2022-jp
-share/httpd/htdocs/index.html.it
-share/httpd/htdocs/index.html.hr.iso8859-2
-share/httpd/htdocs/index.html.he.iso8859-8
-share/httpd/htdocs/index.html.fr
-share/httpd/htdocs/index.html.et
-share/httpd/htdocs/index.html.es
-share/httpd/htdocs/index.html.en
-share/httpd/htdocs/index.html.el
-share/httpd/htdocs/index.html.ee
-share/httpd/htdocs/index.html.dk
-share/httpd/htdocs/index.html.de
-share/httpd/htdocs/index.html.cz.iso8859-2
-share/httpd/htdocs/index.html.ca
-share/httpd/htdocs/apache_pb2_ani.gif
-share/httpd/htdocs/apache_pb2.png
-share/httpd/htdocs/apache_pb2.gif
-share/httpd/htdocs/apache_pb.png
+share/httpd/htdocs/index.html.ru.iso-ru
+share/httpd/htdocs/index.html.ru.koi8-r
+share/httpd/htdocs/index.html.ru.utf8
+share/httpd/htdocs/index.html.sv
+share/httpd/htdocs/index.html.var
+share/httpd/htdocs/index.html.zh-cn.gb2312
 share/httpd/htdocs/index.html.zh-tw.big5
-share/httpd/icons/small/uu.png
+share/httpd/icons/README
+share/httpd/icons/a.gif
+share/httpd/icons/a.png
+share/httpd/icons/alert.black.gif
+share/httpd/icons/alert.black.png
+share/httpd/icons/alert.red.gif