From bba3dab699758a305a807047c9eb887da005f158 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 25 Apr 2005 09:13:02 +0000 Subject: 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. --- 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 +- 10 files changed, 300 insertions(+), 277 deletions(-) (limited to 'www') diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 5b69d58027f..421926b6b4e 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -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 @@ FIX_PERMS= apachectl apxs dbmmanage envvars-std mkcert 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 @@ post-extract: ${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 --git a/www/apache2/Makefile.common b/www/apache2/Makefile.common index b65501f84cf..3484f2e6694 100644 --- a/www/apache2/Makefile.common +++ b/www/apache2/Makefile.common @@ -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 --git a/www/apache2/PLIST b/www/apache2/PLIST index 209fca10fa9..15c70ad8034 100644 --- a/www/apache2/PLIST +++ b/www/apache2/PLIST @@ -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_script.h 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/htdbm sbin/htdigest sbin/htpasswd sbin/httpd -sbin/mkcert sbin/logresolve +sbin/mkcert sbin/rotatelogs ${SUEXEC_COMMENT}sbin/suexec share/examples/httpd/highperformance-std.conf @@ -90,68 +92,194 @@ share/httpd/build/ltlib.mk 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/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/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.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 +share/httpd/icons/alert.red.png +share/httpd/icons/apache_pb.gif +share/httpd/icons/apache_pb.png +share/httpd/icons/apache_pb2.gif +share/httpd/icons/apache_pb2.png +share/httpd/icons/apache_pb2_ani.gif +share/httpd/icons/back.gif +share/httpd/icons/back.png +share/httpd/icons/ball.gray.gif +share/httpd/icons/ball.gray.png +share/httpd/icons/ball.red.gif +share/httpd/icons/ball.red.png +share/httpd/icons/binary.gif +share/httpd/icons/binary.png +share/httpd/icons/binhex.gif +share/httpd/icons/binhex.png +share/httpd/icons/blank.gif +share/httpd/icons/blank.png +share/httpd/icons/bomb.gif +share/httpd/icons/bomb.png +share/httpd/icons/box1.gif +share/httpd/icons/box1.png +share/httpd/icons/box2.gif +share/httpd/icons/box2.png +share/httpd/icons/broken.gif +share/httpd/icons/broken.png +share/httpd/icons/burst.gif +share/httpd/icons/burst.png +share/httpd/icons/c.gif +share/httpd/icons/c.png +share/httpd/icons/comp.blue.gif +share/httpd/icons/comp.blue.png +share/httpd/icons/comp.gray.gif +share/httpd/icons/comp.gray.png +share/httpd/icons/compressed.gif +share/httpd/icons/compressed.png +share/httpd/icons/continued.gif +share/httpd/icons/continued.png +share/httpd/icons/dir.gif +share/httpd/icons/dir.png +share/httpd/icons/diskimg.gif +share/httpd/icons/diskimg.png +share/httpd/icons/down.gif +share/httpd/icons/down.png +share/httpd/icons/dvi.gif +share/httpd/icons/dvi.png +share/httpd/icons/f.gif +share/httpd/icons/f.png +share/httpd/icons/folder.gif +share/httpd/icons/folder.open.gif +share/httpd/icons/folder.open.png +share/httpd/icons/folder.png +share/httpd/icons/folder.sec.gif +share/httpd/icons/folder.sec.png +share/httpd/icons/forward.gif +share/httpd/icons/forward.png +share/httpd/icons/generic.gif +share/httpd/icons/generic.png +share/httpd/icons/generic.red.gif +share/httpd/icons/generic.red.png +share/httpd/icons/generic.sec.gif +share/httpd/icons/generic.sec.png +share/httpd/icons/hand.right.gif +share/httpd/icons/hand.right.png +share/httpd/icons/hand.up.gif +share/httpd/icons/hand.up.png +share/httpd/icons/icon.sheet.gif +share/httpd/icons/icon.sheet.png +share/httpd/icons/image1.gif +share/httpd/icons/image1.png +share/httpd/icons/image2.gif +share/httpd/icons/image2.png +share/httpd/icons/image3.gif +share/httpd/icons/image3.png +share/httpd/icons/index.gif +share/httpd/icons/index.png +share/httpd/icons/layout.gif +share/httpd/icons/layout.png +share/httpd/icons/left.gif +share/httpd/icons/left.png +share/httpd/icons/link.gif +share/httpd/icons/link.png +share/httpd/icons/movie.gif +share/httpd/icons/movie.png +share/httpd/icons/p.gif +share/httpd/icons/p.png +share/httpd/icons/patch.gif +share/httpd/icons/patch.png +share/httpd/icons/pdf.gif +share/httpd/icons/pdf.png +share/httpd/icons/pie0.gif +share/httpd/icons/pie0.png +share/httpd/icons/pie1.gif +share/httpd/icons/pie1.png +share/httpd/icons/pie2.gif +share/httpd/icons/pie2.png +share/httpd/icons/pie3.gif +share/httpd/icons/pie3.png +share/httpd/icons/pie4.gif +share/httpd/icons/pie4.png +share/httpd/icons/pie5.gif +share/httpd/icons/pie5.png +share/httpd/icons/pie6.gif +share/httpd/icons/pie6.png +share/httpd/icons/pie7.gif +share/httpd/icons/pie7.png +share/httpd/icons/pie8.gif +share/httpd/icons/pie8.png +share/httpd/icons/portal.gif +share/httpd/icons/portal.png +share/httpd/icons/ps.gif +share/httpd/icons/ps.png +share/httpd/icons/quill.gif +share/httpd/icons/quill.png +share/httpd/icons/right.gif +share/httpd/icons/right.png +share/httpd/icons/screw1.gif +share/httpd/icons/screw1.png +share/httpd/icons/screw2.gif +share/httpd/icons/screw2.png +share/httpd/icons/script.gif +share/httpd/icons/script.png +share/httpd/icons/small/README.txt share/httpd/icons/small/back.gif share/httpd/icons/small/back.png share/httpd/icons/small/binary.gif @@ -215,199 +343,79 @@ share/httpd/icons/small/transfer.png share/httpd/icons/small/unknown.gif share/httpd/icons/small/unknown.png share/httpd/icons/small/uu.gif -share/httpd/icons/small/README.txt -share/httpd/icons/world2.gif -share/httpd/icons/world1.png -share/httpd/icons/world1.gif -share/httpd/icons/uuencoded.png -share/httpd/icons/uuencoded.gif -share/httpd/icons/uu.png -share/httpd/icons/uu.gif -share/httpd/icons/up.png -share/httpd/icons/up.gif -share/httpd/icons/unknown.png -share/httpd/icons/unknown.gif -share/httpd/icons/transfer.png -share/httpd/icons/transfer.gif -share/httpd/icons/text.png -share/httpd/icons/text.gif -share/httpd/icons/tex.png -share/httpd/icons/tex.gif -share/httpd/icons/tar.png -share/httpd/icons/tar.gif -share/httpd/icons/sphere2.png -share/httpd/icons/sphere2.gif -share/httpd/icons/sphere1.png -share/httpd/icons/sphere1.gif -share/httpd/icons/sound2.png -share/httpd/icons/sound2.gif -share/httpd/icons/sound1.png +share/httpd/icons/small/uu.png share/httpd/icons/sound1.gif -share/httpd/icons/script.png -share/httpd/icons/script.gif -share/httpd/icons/screw2.png -share/httpd/icons/screw2.gif -share/httpd/icons/screw1.png -share/httpd/icons/screw1.gif -share/httpd/icons/right.png -share/httpd/icons/right.gif -share/httpd/icons/quill.png -share/httpd/icons/quill.gif -share/httpd/icons/ps.png -share/httpd/icons/ps.gif -share/httpd/icons/portal.png -share/httpd/icons/portal.gif -share/httpd/icons/pie8.png -share/httpd/icons/pie8.gif -share/httpd/icons/pie7.png -share/httpd/icons/pie7.gif -share/httpd/icons/pie6.png -share/httpd/icons/pie6.gif -share/httpd/icons/pie5.png -share/httpd/icons/pie5.gif -share/httpd/icons/pie4.png -share/httpd/icons/pie4.gif -share/httpd/icons/pie3.png -share/httpd/icons/pie3.gif -share/httpd/icons/pie2.png -share/httpd/icons/pie2.gif -share/httpd/icons/pie1.png -share/httpd/icons/pie1.gif -share/httpd/icons/pie0.png -share/httpd/icons/pie0.gif -share/httpd/icons/pdf.png -share/httpd/icons/pdf.gif -share/httpd/icons/patch.png -share/httpd/icons/patch.gif -share/httpd/icons/p.png -share/httpd/icons/p.gif -share/httpd/icons/movie.png -share/httpd/icons/movie.gif -share/httpd/icons/link.png -share/httpd/icons/link.gif -share/httpd/icons/left.png -share/httpd/icons/left.gif -share/httpd/icons/layout.png -share/httpd/icons/layout.gif -share/httpd/icons/index.png -share/httpd/icons/index.gif -share/httpd/icons/image3.png -share/httpd/icons/image3.gif -share/httpd/icons/image2.png -share/httpd/icons/image2.gif -share/httpd/icons/image1.png -share/httpd/icons/image1.gif -share/httpd/icons/icon.sheet.png -share/httpd/icons/icon.sheet.gif -share/httpd/icons/hand.up.png -share/httpd/icons/hand.up.gif -share/httpd/icons/hand.right.png -share/httpd/icons/hand.right.gif -share/httpd/icons/generic.sec.png -share/httpd/icons/generic.sec.gif -share/httpd/icons/generic.red.png -share/httpd/icons/generic.red.gif -share/httpd/icons/generic.png -share/httpd/icons/generic.gif -share/httpd/icons/forward.png -share/httpd/icons/forward.gif -share/httpd/icons/folder.sec.png -share/httpd/icons/folder.sec.gif -share/httpd/icons/folder.png -share/httpd/icons/folder.open.png -share/httpd/icons/folder.open.gif -share/httpd/icons/folder.gif -share/httpd/icons/f.png -share/httpd/icons/f.gif -share/httpd/icons/dvi.png -share/httpd/icons/dvi.gif -share/httpd/icons/down.png -share/httpd/icons/down.gif -share/httpd/icons/diskimg.png -share/httpd/icons/diskimg.gif -share/httpd/icons/dir.png -share/httpd/icons/dir.gif -share/httpd/icons/continued.png -share/httpd/icons/continued.gif -share/httpd/icons/compressed.png -share/httpd/icons/compressed.gif -share/httpd/icons/comp.gray.png -share/httpd/icons/comp.gray.gif -share/httpd/icons/comp.blue.png -share/httpd/icons/comp.blue.gif -share/httpd/icons/c.png -share/httpd/icons/c.gif -share/httpd/icons/burst.png -share/httpd/icons/burst.gif -share/httpd/icons/broken.png -share/httpd/icons/broken.gif -share/httpd/icons/box2.png -share/httpd/icons/box2.gif -share/httpd/icons/box1.png -share/httpd/icons/box1.gif -share/httpd/icons/bomb.png -share/httpd/icons/bomb.gif -share/httpd/icons/blank.png -share/httpd/icons/blank.gif -share/httpd/icons/binhex.png -share/httpd/icons/binhex.gif -share/httpd/icons/binary.png -share/httpd/icons/binary.gif -share/httpd/icons/ball.red.png -share/httpd/icons/ball.red.gif -share/httpd/icons/ball.gray.png -share/httpd/icons/ball.gray.gif -share/httpd/icons/back.png -share/httpd/icons/back.gif -share/httpd/icons/apache_pb2_ani.gif -share/httpd/icons/apache_pb2.png -share/httpd/icons/apache_pb2.gif -share/httpd/icons/apache_pb.png -share/httpd/icons/a.png -share/httpd/icons/apache_pb.gif -share/httpd/icons/alert.red.png -share/httpd/icons/alert.red.gif -share/httpd/icons/alert.black.png -share/httpd/icons/alert.black.gif -share/httpd/icons/a.gif +share/httpd/icons/sound1.png +share/httpd/icons/sound2.gif +share/httpd/icons/sound2.png +share/httpd/icons/sphere1.gif +share/httpd/icons/sphere1.png +share/httpd/icons/sphere2.gif +share/httpd/icons/sphere2.png +share/httpd/icons/tar.gif +share/httpd/icons/tar.png +share/httpd/icons/tex.gif +share/httpd/icons/tex.png +share/httpd/icons/text.gif +share/httpd/icons/text.png +share/httpd/icons/transfer.gif +share/httpd/icons/transfer.png +share/httpd/icons/unknown.gif +share/httpd/icons/unknown.png +share/httpd/icons/up.gif +share/httpd/icons/up.png +share/httpd/icons/uu.gif +share/httpd/icons/uu.png +share/httpd/icons/uuencoded.gif +share/httpd/icons/uuencoded.png +share/httpd/icons/world1.gif +share/httpd/icons/world1.png +share/httpd/icons/world2.gif share/httpd/icons/world2.png -share/httpd/icons/README share/httpd/manual/LICENSE share/httpd/manual/bind.html share/httpd/manual/bind.html.en share/httpd/manual/bind.html.es +share/httpd/manual/bind.html.fr share/httpd/manual/bind.html.ja.euc-jp share/httpd/manual/bind.html.ko.euc-kr share/httpd/manual/bind.xml share/httpd/manual/bind.xml.es +share/httpd/manual/bind.xml.fr share/httpd/manual/bind.xml.ja share/httpd/manual/bind.xml.ko share/httpd/manual/bind.xml.meta share/httpd/manual/configuring.html share/httpd/manual/configuring.html.de share/httpd/manual/configuring.html.en +share/httpd/manual/configuring.html.fr share/httpd/manual/configuring.html.ja.euc-jp share/httpd/manual/configuring.html.ko.euc-kr share/httpd/manual/configuring.xml share/httpd/manual/configuring.xml.de +share/httpd/manual/configuring.xml.fr share/httpd/manual/configuring.xml.ja share/httpd/manual/configuring.xml.ko share/httpd/manual/configuring.xml.meta share/httpd/manual/content-negotiation.html share/httpd/manual/content-negotiation.html.en +share/httpd/manual/content-negotiation.html.fr share/httpd/manual/content-negotiation.html.ja.euc-jp share/httpd/manual/content-negotiation.html.ko.euc-kr share/httpd/manual/content-negotiation.xml +share/httpd/manual/content-negotiation.xml.fr share/httpd/manual/content-negotiation.xml.ja share/httpd/manual/content-negotiation.xml.ko share/httpd/manual/content-negotiation.xml.meta share/httpd/manual/custom-error.html share/httpd/manual/custom-error.html.en share/httpd/manual/custom-error.html.es +share/httpd/manual/custom-error.html.fr share/httpd/manual/custom-error.html.ja.euc-jp share/httpd/manual/custom-error.html.ko.euc-kr share/httpd/manual/custom-error.xml share/httpd/manual/custom-error.xml.es +share/httpd/manual/custom-error.xml.fr share/httpd/manual/custom-error.xml.ja share/httpd/manual/custom-error.xml.ko share/httpd/manual/custom-error.xml.meta @@ -451,25 +459,33 @@ share/httpd/manual/developer/thread_safety.xml share/httpd/manual/developer/thread_safety.xml.meta share/httpd/manual/dns-caveats.html share/httpd/manual/dns-caveats.html.en +share/httpd/manual/dns-caveats.html.fr share/httpd/manual/dns-caveats.html.ja.euc-jp share/httpd/manual/dns-caveats.html.ko.euc-kr share/httpd/manual/dns-caveats.xml +share/httpd/manual/dns-caveats.xml.fr share/httpd/manual/dns-caveats.xml.ja share/httpd/manual/dns-caveats.xml.ko share/httpd/manual/dns-caveats.xml.meta share/httpd/manual/dso.html share/httpd/manual/dso.html.en +share/httpd/manual/dso.html.es +share/httpd/manual/dso.html.fr share/httpd/manual/dso.html.ja.euc-jp share/httpd/manual/dso.html.ko.euc-kr share/httpd/manual/dso.xml +share/httpd/manual/dso.xml.es +share/httpd/manual/dso.xml.fr share/httpd/manual/dso.xml.ja share/httpd/manual/dso.xml.ko share/httpd/manual/dso.xml.meta share/httpd/manual/env.html share/httpd/manual/env.html.en +share/httpd/manual/env.html.fr share/httpd/manual/env.html.ja.euc-jp share/httpd/manual/env.html.ko.euc-kr share/httpd/manual/env.xml +share/httpd/manual/env.xml.fr share/httpd/manual/env.xml.ja share/httpd/manual/env.xml.ko share/httpd/manual/env.xml.meta @@ -502,11 +518,13 @@ share/httpd/manual/faq/support.xml.meta share/httpd/manual/filter.html share/httpd/manual/filter.html.en share/httpd/manual/filter.html.es +share/httpd/manual/filter.html.fr share/httpd/manual/filter.html.ja.euc-jp share/httpd/manual/filter.html.ko.euc-kr share/httpd/manual/filter.html.ru.koi8-r share/httpd/manual/filter.xml share/httpd/manual/filter.xml.es +share/httpd/manual/filter.xml.fr share/httpd/manual/filter.xml.ja share/httpd/manual/filter.xml.ko share/httpd/manual/filter.xml.meta @@ -524,11 +542,13 @@ share/httpd/manual/glossary.xml.meta share/httpd/manual/handler.html share/httpd/manual/handler.html.en share/httpd/manual/handler.html.es +share/httpd/manual/handler.html.fr share/httpd/manual/handler.html.ja.euc-jp share/httpd/manual/handler.html.ko.euc-kr share/httpd/manual/handler.html.ru.koi8-r share/httpd/manual/handler.xml share/httpd/manual/handler.xml.es +share/httpd/manual/handler.xml.fr share/httpd/manual/handler.xml.ja share/httpd/manual/handler.xml.ko share/httpd/manual/handler.xml.meta @@ -609,12 +629,14 @@ share/httpd/manual/index.html share/httpd/manual/index.html.de share/httpd/manual/index.html.en share/httpd/manual/index.html.es +share/httpd/manual/index.html.fr share/httpd/manual/index.html.ja.euc-jp share/httpd/manual/index.html.ko.euc-kr share/httpd/manual/index.html.ru.koi8-r share/httpd/manual/index.xml share/httpd/manual/index.xml.de share/httpd/manual/index.xml.es +share/httpd/manual/index.xml.fr share/httpd/manual/index.xml.ja share/httpd/manual/index.xml.ko share/httpd/manual/index.xml.meta @@ -1208,12 +1230,14 @@ share/httpd/manual/mod/worker.xml.es share/httpd/manual/mod/worker.xml.ja share/httpd/manual/mod/worker.xml.meta share/httpd/manual/mpm.html +share/httpd/manual/mpm.html.de share/httpd/manual/mpm.html.en share/httpd/manual/mpm.html.es share/httpd/manual/mpm.html.ja.euc-jp share/httpd/manual/mpm.html.ko.euc-kr share/httpd/manual/mpm.html.ru.koi8-r share/httpd/manual/mpm.xml +share/httpd/manual/mpm.xml.de share/httpd/manual/mpm.xml.es share/httpd/manual/mpm.xml.ja share/httpd/manual/mpm.xml.ko @@ -1592,23 +1616,24 @@ share/httpd/manual/vhosts/name-based.xml.es share/httpd/manual/vhosts/name-based.xml.ja share/httpd/manual/vhosts/name-based.xml.ko share/httpd/manual/vhosts/name-based.xml.meta -@dirrm share/httpd/manual/developer -@dirrm share/httpd/manual/faq -@dirrm share/httpd/manual/mod -@dirrm share/httpd/manual/ssl -@dirrm share/httpd/manual/howto -@dirrm share/httpd/manual/images -@dirrm share/httpd/manual/misc -@dirrm share/httpd/manual/platform -@dirrm share/httpd/manual/programs -@dirrm share/httpd/manual/rewrite -@dirrm share/httpd/manual/style/css -@dirrm share/httpd/manual/style/lang -@dirrm share/httpd/manual/style/latex +@unexec ${RMDIR} %D/libexec/cgi-bin 2>/dev/null || ${TRUE} +@dirrm share/httpd/manual/vhosts @dirrm share/httpd/manual/style/xsl/util @dirrm share/httpd/manual/style/xsl +@dirrm share/httpd/manual/style/latex +@dirrm share/httpd/manual/style/lang +@dirrm share/httpd/manual/style/css @dirrm share/httpd/manual/style -@dirrm share/httpd/manual/vhosts +@dirrm share/httpd/manual/ssl +@dirrm share/httpd/manual/rewrite +@dirrm share/httpd/manual/programs +@dirrm share/httpd/manual/platform +@dirrm share/httpd/manual/mod +@dirrm share/httpd/manual/misc +@dirrm share/httpd/manual/images +@dirrm share/httpd/manual/howto +@dirrm share/httpd/manual/faq +@dirrm share/httpd/manual/developer @dirrm share/httpd/manual @dirrm share/httpd/icons/small @dirrm share/httpd/icons @@ -1617,5 +1642,4 @@ share/httpd/manual/vhosts/name-based.xml.meta @dirrm share/httpd/build @dirrm share/examples/httpd @dirrm lib/httpd -@unexec ${RMDIR} %D/libexec/cgi-bin 2>/dev/null || ${TRUE} @dirrm include/httpd diff --git a/www/apache2/distinfo b/www/apache2/distinfo index 7155d6844ac..617e8d020ad 100644 --- a/www/apache2/distinfo +++ b/www/apache2/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.37 2005/02/24 14:08:28 wiz Exp $ +$NetBSD: distinfo,v 1.38 2005/04/25 09:13:14 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 (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-aa) = bff1ef591f5361e7169ff9005dcf86437b9dac23 -SHA1 (patch-ab) = 37e7faca9217122c24fbb7e5b8cd8e8f027ead5a -SHA1 (patch-ac) = f48d6622406b89a00ee3ba14fdcff356c5ef59e8 -SHA1 (patch-ad) = 27fa3655d6ba4840296e79fa6fd96cd9de79a33a +SHA1 (patch-ab) = 387892276efd49fd081a187c1123de26fb6486ba +SHA1 (patch-ac) = 02e0ff6a6b3308ca86c96857b8159ebd6a405537 +SHA1 (patch-ad) = 8c6f62346ffb5069de89a50516a3da2c6104e09b SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01 -SHA1 (patch-ai) = d728490b66032d8bb2aa8d4ccdeca3d45f7c2b08 +SHA1 (patch-ai) = 4dc88c15b0525a5aabc80d5c2a0720cd260629de SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215 -SHA1 (patch-al) = 29cc52616c50b7ec998339cca386112a8f1611cc -SHA1 (patch-am) = ff60a7b69ad949363ebec194141e9b95cb796426 +SHA1 (patch-al) = 9af7b6c56177d971e135f0a00b3ab9ded5d1b6dd +SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08 SHA1 (patch-ar) = c6769617cd9111f6d233d68883c71988a36fbbce diff --git a/www/apache2/patches/patch-ab b/www/apache2/patches/patch-ab index 6fecef4afae..c1ddd75544b 100644 --- a/www/apache2/patches/patch-ab +++ b/www/apache2/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.5 2005/01/03 06:59:32 minskim Exp $ +$NetBSD: patch-ab,v 1.6 2005/04/25 09:13:14 adam Exp $ ---- server/mpm_common.c.orig Thu Feb 26 14:32:21 2004 +--- server/mpm_common.c.orig 2005-03-30 09:42:15.000000000 +0000 +++ server/mpm_common.c -@@ -322,7 +322,7 @@ AP_DECLARE(gid_t) ap_gname2id(const char +@@ -420,7 +420,7 @@ AP_DECLARE(gid_t) ap_gname2id(const char #ifndef HAVE_INITGROUPS int initgroups(const char *name, gid_t basegid) { diff --git a/www/apache2/patches/patch-ac b/www/apache2/patches/patch-ac index 8bd37c9ca19..ba853c5e47e 100644 --- a/www/apache2/patches/patch-ac +++ b/www/apache2/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.4 2005/01/03 01:04:26 minskim Exp $ +$NetBSD: patch-ac,v 1.5 2005/04/25 09:13:14 adam Exp $ ---- configure.orig 2004-09-23 13:35:39.000000000 -0500 +--- configure.orig 2005-04-11 21:04:54.000000000 +0000 +++ configure -@@ -16511,7 +16511,6 @@ cat >>confdefs.h <<_ACEOF +@@ -17035,7 +17035,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF diff --git a/www/apache2/patches/patch-ad b/www/apache2/patches/patch-ad index 7968541555e..13cd338ef48 100644 --- a/www/apache2/patches/patch-ad +++ b/www/apache2/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.6 2003/07/02 17:58:43 jmmv Exp $ +$NetBSD: patch-ad,v 1.7 2005/04/25 09:13:14 adam Exp $ ---- config.layout.orig Fri May 17 23:49:30 2002 -+++ config.layout Wed Jun 19 07:39:33 2002 -@@ -298,3 +298,26 @@ +--- config.layout.orig 2004-11-24 19:31:09.000000000 +0000 ++++ config.layout +@@ -322,3 +322,26 @@ installbuilddir: ${prefix}/etc/apache2/build errordir: ${datadir}/error diff --git a/www/apache2/patches/patch-ai b/www/apache2/patches/patch-ai index 037ab26777b..2f05b63c5f8 100644 --- a/www/apache2/patches/patch-ai +++ b/www/apache2/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.6 2004/11/30 23:21:44 jlam Exp $ +$NetBSD: patch-ai,v 1.7 2005/04/25 09:13:14 adam Exp $ ---- support/apxs.in.orig 2004-02-09 15:59:49.000000000 -0500 +--- support/apxs.in.orig 2005-02-04 20:21:18.000000000 +0000 +++ support/apxs.in -@@ -337,9 +337,12 @@ if (! -x "$apu_bindir/apu-config") { +@@ -338,9 +338,12 @@ if (! -x "$apu_bindir/apu-config") { exit(1); } diff --git a/www/apache2/patches/patch-al b/www/apache2/patches/patch-al index 655bbb13867..8f7af571b85 100644 --- a/www/apache2/patches/patch-al +++ b/www/apache2/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.2 2002/08/29 14:12:29 martti Exp $ +$NetBSD: patch-al,v 1.3 2005/04/25 09:13:14 adam Exp $ ---- include/httpd.h.orig Mon Jul 1 19:49:53 2002 -+++ include/httpd.h Mon Aug 12 15:02:08 2002 -@@ -147,9 +147,9 @@ +--- include/httpd.h.orig 2005-02-26 09:04:10.000000000 +0000 ++++ include/httpd.h +@@ -105,9 +105,9 @@ extern "C" { /* The name of the log files */ #ifndef DEFAULT_ERRORLOG #if defined(OS2) || defined(WIN32) @@ -14,7 +14,7 @@ $NetBSD: patch-al,v 1.2 2002/08/29 14:12:29 martti Exp $ #endif #endif /* DEFAULT_ERRORLOG */ -@@ -165,7 +165,7 @@ +@@ -123,7 +123,7 @@ extern "C" { /* The name of the server config file */ #ifndef SERVER_CONFIG_FILE @@ -23,7 +23,7 @@ $NetBSD: patch-al,v 1.2 2002/08/29 14:12:29 martti Exp $ #endif /* Whether we should enable rfc1413 identity checking */ -@@ -256,7 +256,7 @@ +@@ -214,7 +214,7 @@ extern "C" { /** The name of the MIME types file */ #ifndef AP_TYPES_CONFIG_FILE diff --git a/www/apache2/patches/patch-am b/www/apache2/patches/patch-am index fed751ec3f2..6e8f2734940 100644 --- a/www/apache2/patches/patch-am +++ b/www/apache2/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.1 2002/04/13 21:35:54 jlam Exp $ +$NetBSD: patch-am,v 1.2 2005/04/25 09:13:14 adam Exp $ ---- include/scoreboard.h.orig Fri Mar 29 11:21:48 2002 +--- include/scoreboard.h.orig 2005-02-04 20:21:18.000000000 +0000 +++ include/scoreboard.h -@@ -78,7 +78,7 @@ +@@ -36,7 +36,7 @@ extern "C" { /* Scoreboard file, if there is one */ #ifndef DEFAULT_SCOREBOARD -- cgit v1.2.3