Apache 2.2.3 - latest stable version.

Please see http://httpd.apache.org/docs/2.2/new_features_2_2.html
for the list of changes.

9 files changed, 333 insertions, 0 deletions

diff --git a/www/apache22/patches/patch-aa b/www/apache22/patches/patch-aa
new file mode 100644
index 00000000000..8559f4c9173
--- /dev/null
+++ b/www/apache22/patches/patch-aa
@@ -0,0 +1,145 @@
+$NetBSD: patch-aa,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $
+
+--- Makefile.in.orig	2005-11-13 07:33:15.000000000 +0100
++++ Makefile.in	2006-12-08 20:32:36.000000000 +0100
+@@ -4,7 +4,7 @@
+ 
+ PROGRAM_NAME         = $(progname)
+ PROGRAM_SOURCES      = modules.c
+-PROGRAM_LDADD        = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
++PROGRAM_LDADD        = buildmark.o $(HTTPD_LDFLAGS) $(DL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS) $(DL_LIBS)
+ PROGRAM_PRELINK      = $(COMPILE) -c $(top_srcdir)/server/buildmark.c
+ PROGRAM_DEPENDENCIES = \
+   server/libmain.la \
+@@ -14,7 +14,7 @@
+ 
+ PROGRAMS        = $(PROGRAM_NAME)
+ TARGETS         = $(PROGRAMS) $(shared_build) $(other_targets)
+-INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \
++INSTALL_TARGETS = install-htdocs install-error install-icons \
+ 	install-other install-cgi install-include install-suexec install-build \
+ 	install-man
+ 
+@@ -30,8 +30,8 @@
+ 
+ install-conf:
+ 	@echo Installing configuration files
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/extra
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original/extra
++	@$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)
++	@$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/extra
+ 	@cd $(top_srcdir)/docs/conf; \
+ 	for i in mime.types magic; do \
+ 	    if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
+@@ -66,7 +66,8 @@
+ 	    				-e 's#@@Port@@#$(PORT)#g' \
+ 	    				< $$i; \
+ 	    		fi \
+-	    	) > $(DESTDIR)$(sysconfdir)/original/$$i; \
++	    	) > $(DESTDIR)$(sysconfdir)/$$i; \
++		if false; then \
+ 	    	chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \
+ 	    	file=$$i; \
+ 	    	if [ "$$i" = "httpd.conf" ]; then \
+@@ -76,13 +77,16 @@
+ 	    		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \
+ 	    	fi; \
+ 	    	fi; \
++		fi; \
+ 	    done ; \
+ 	done ; \
+ 	if test -f "$(builddir)/envvars-std"; then \
+ 	    cp -p envvars-std $(DESTDIR)$(sbindir); \
++	    if false; then \
+ 	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+ 	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+ 	    fi ; \
++	    fi ; \
+ 	fi
+ 
+ # Create a sanitized config_vars.mk
+@@ -100,7 +104,7 @@
+ 		  $(top_srcdir)/build/instdso.sh; do \
+ 	 $(INSTALL_PROGRAM) $$f $(DESTDIR)$(installbuilddir); \
+ 	done
+-	@$(INSTALL_DATA) build/config_vars.out $(DESTDIR)$(installbuilddir)/config_vars.mk
++	#@$(INSTALL_DATA) build/config_vars.out $(DESTDIR)$(installbuilddir)/config_vars.mk
+ 	@rm build/config_vars.out
+ 
+ htdocs-srcdir = $(top_srcdir)/docs/docroot
+@@ -117,48 +121,27 @@
+ 	doxygen $(top_srcdir)/docs/doxygen.conf
+ 
+ install-htdocs:
+-	-@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
+-           echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
+-        else \
+ 	    echo Installing HTML documents ; \
+-	    $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
+-	    if test -d $(htdocs-srcdir) && test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
+-		$(RSYNC) --exclude .svn -rlpt --numeric-ids $(htdocs-srcdir)/ $(DESTDIR)$(htdocsdir)/; \
+-	    else \
+-		test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
+-		cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
+-	    fi; \
+-	fi
++		test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && \
++		@PAX@ -rwppm . $(DESTDIR)$(htdocsdir))
+ 
+ install-error:
+-	-@if [ -d $(DESTDIR)$(errordir) ]; then \
+-           echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
+-        else \
+ 	    echo Installing error documents ; \
+ 	    $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
+-	    cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
+-	    test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
+-	fi
++	cd $(top_srcdir)/docs/error && \
++		@PAX@ -rwppm . $(DESTDIR)$(errordir)
+ 
+ install-icons:
+-	-@if [ -d $(DESTDIR)$(iconsdir) ]; then \
+-           echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
+-        else \
+ 	    echo Installing icons ; \
+ 	    $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
+-	    cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
+-	    test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
+-	fi
++	cd $(top_srcdir)/docs/icons && \
++		@PAX@ -rwppm . $(DESTDIR)$(iconsdir)
+ 
+ install-cgi:
+-	-@if [ -d $(DESTDIR)$(cgidir) ];then \
+-	    echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
+-	else \
+ 	   echo Installing CGIs ; \
+ 	   $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
+-	   cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
+-	   test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
+-	fi
++	cd $(top_srcdir)/docs/cgi-examples && \
++		@PAX@ -rwppm . $(DESTDIR)$(cgidir)
+ 
+ install-other:
+ 	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
+@@ -204,14 +187,10 @@
+ 	@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
+ 	@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
+ 	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
+-	@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
+-	@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
+-	@if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
+-	  $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \
+-	else \
+-	  cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \
+-	  cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null; \
+-	fi
++	$(BSD_INSTALL_MAN) $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
++	$(BSD_INSTALL_MAN) $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
++	cd $(top_srcdir)/docs/manual && \
++		@PAX@ -rwppm . $(DESTDIR)$(manualdir)
+ 
+ install-suexec:
+ 	@if test -f $(builddir)/support/suexec; then \
diff --git a/www/apache22/patches/patch-ab b/www/apache22/patches/patch-ab
new file mode 100644
index 00000000000..93c91dbc77f
--- /dev/null
+++ b/www/apache22/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $
+
+--- server/mpm_common.c.orig	2005-03-30 09:42:15.000000000 +0000
++++ server/mpm_common.c
+@@ -420,7 +420,7 @@ AP_DECLARE(gid_t) ap_gname2id(const char
+ #ifndef HAVE_INITGROUPS
+ int initgroups(const char *name, gid_t basegid)
+ {
+-#if defined(QNX) || defined(MPE) || defined(BEOS) || defined(_OSD_POSIX) || defined(TPF) || defined(__TANDEM) || defined(OS2) || defined(WIN32) || defined(NETWARE)
++#if defined(QNX) || defined(MPE) || defined(BEOS) || defined(_OSD_POSIX) || defined(TPF) || defined(__TANDEM) || defined(OS2) || defined(WIN32) || defined(NETWARE) || defined(__INTERIX)
+ /* QNX, MPE and BeOS do not appear to support supplementary groups. */
+     return 0;
+ #else /* ndef QNX */
diff --git a/www/apache22/patches/patch-ac b/www/apache22/patches/patch-ac
new file mode 100644
index 00000000000..a1d721dffea
--- /dev/null
+++ b/www/apache22/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $
+
+--- configure.orig	2005-10-09 18:34:38.000000000 -0700
++++ configure
+@@ -17086,7 +17086,6 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ 
+ 
+-perlbin=`$ac_aux_dir/PrintPath perl`
+ if test "x$perlbin" = "x"; then
+     perlbin="/replace/with/path/to/perl/interpreter"
+ fi
diff --git a/www/apache22/patches/patch-ad b/www/apache22/patches/patch-ad
new file mode 100644
index 00000000000..f573dd271b9
--- /dev/null
+++ b/www/apache22/patches/patch-ad
@@ -0,0 +1,31 @@
+$NetBSD: patch-ad,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $
+
+--- 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
+ </Layout>
++
++#   NetBSD (pkgsrc) layout
++<Layout NetBSD>
++    prefix:        @PREFIX@
++    exec_prefix:   ${prefix}
++    bindir:        ${exec_prefix}/bin
++    sbindir:       ${exec_prefix}/sbin
++    libexecdir:    ${exec_prefix}/lib/httpd
++    mandir:        ${prefix}/man
++    sysconfdir:    @SYSCONFDIR@
++    datadir:       ${prefix}/share/httpd
++    installbuilddir: ${datadir}/build
++    errordir:      ${datadir}/error
++    iconsdir:      ${datadir}/icons
++    htdocsdir:     ${datadir}/htdocs
++    manualdir:     ${datadir}/manual
++    cgidir:        ${exec_prefix}/libexec/cgi-bin
++    includedir:    ${prefix}/include/httpd
++    localstatedir: @VARBASE@
++    runtimedir:    ${localstatedir}/run
++    logfiledir:    ${localstatedir}/log/httpd
++    proxycachedir: ${localstatedir}/db/httpd/proxy
++</Layout>
diff --git a/www/apache22/patches/patch-ae b/www/apache22/patches/patch-ae
new file mode 100644
index 00000000000..21ead882512
--- /dev/null
+++ b/www/apache22/patches/patch-ae
@@ -0,0 +1,53 @@
+$NetBSD: patch-ae,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $
+
+--- docs/conf/httpd.conf.in.orig	2006-12-08 21:49:32.000000000 +0100
++++ docs/conf/httpd.conf.in	2006-12-08 22:18:42.000000000 +0100
+@@ -365,37 +365,37 @@
+ # necessary.
+ 
+ # Server-pool management (MPM specific)
+-#Include @rel_sysconfdir@/extra/httpd-mpm.conf
++#Include @rel_sysconfdir@/httpd-mpm.conf
+ 
+ # Multi-language error messages
+-#Include @rel_sysconfdir@/extra/httpd-multilang-errordoc.conf
++#Include @rel_sysconfdir@/httpd-multilang-errordoc.conf
+ 
+ # Fancy directory listings
+-#Include @rel_sysconfdir@/extra/httpd-autoindex.conf
++#Include @rel_sysconfdir@/httpd-autoindex.conf
+ 
+ # Language settings
+-#Include @rel_sysconfdir@/extra/httpd-languages.conf
++#Include @rel_sysconfdir@/httpd-languages.conf
+ 
+ # User home directories
+-#Include @rel_sysconfdir@/extra/httpd-userdir.conf
++#Include @rel_sysconfdir@/httpd-userdir.conf
+ 
+ # Real-time info on requests and configuration
+-#Include @rel_sysconfdir@/extra/httpd-info.conf
++#Include @rel_sysconfdir@/httpd-info.conf
+ 
+ # Virtual hosts
+-#Include @rel_sysconfdir@/extra/httpd-vhosts.conf
++#Include @rel_sysconfdir@/httpd-vhosts.conf
+ 
+ # Local access to the Apache HTTP Server Manual
+-#Include @rel_sysconfdir@/extra/httpd-manual.conf
++#Include @rel_sysconfdir@/httpd-manual.conf
+ 
+ # Distributed authoring and versioning (WebDAV)
+-#Include @rel_sysconfdir@/extra/httpd-dav.conf
++#Include @rel_sysconfdir@/httpd-dav.conf
+ 
+ # Various default settings
+-#Include @rel_sysconfdir@/extra/httpd-default.conf
++#Include @rel_sysconfdir@/httpd-default.conf
+ 
+ # Secure (SSL/TLS) connections
+-#Include @rel_sysconfdir@/extra/httpd-ssl.conf
++#Include @rel_sysconfdir@/httpd-ssl.conf
+ #
+ # Note: The following must must be present to support
+ #       starting without SSL on platforms with no /dev/random equivalent
diff --git a/www/apache22/patches/patch-ag b/www/apache22/patches/patch-ag
new file mode 100644
index 00000000000..ed842d30630
--- /dev/null
+++ b/www/apache22/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $
+
+--- support/Makefile.in.orig	2002-08-29 22:25:40.000000000 +0300
++++ support/Makefile.in	2003-01-28 16:09:07.000000000 +0200
+@@ -24,9 +24,11 @@
+ 	done
+ 	@if test -f "$(builddir)/envvars-std"; then \
+ 	    cp -p envvars-std $(DESTDIR)$(sbindir); \
++	    if false; then \
+ 	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+ 	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+ 	    fi ; \
++	    fi ; \
+ 	fi
+ 
+ htpasswd_OBJECTS = htpasswd.lo
diff --git a/www/apache22/patches/patch-ai b/www/apache22/patches/patch-ai
new file mode 100644
index 00000000000..03d6efabf99
--- /dev/null
+++ b/www/apache22/patches/patch-ai
@@ -0,0 +1,19 @@
+$NetBSD: patch-ai,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $
+
+--- support/apxs.in.orig	2006-12-08 18:41:57.000000000 +0100
++++ support/apxs.in	2006-12-08 18:43:44.000000000 +0100
+@@ -338,8 +338,12 @@
+     exit(1);
+ }
+ 
+-my $libtool = `$apr_config --apr-libtool`;
+-chomp($libtool);
++my $libtool = $ENV{'APR_LIBTOOL'};
++unless ($libtool) {
++	$libtool = `@LOCALBASE@/apr-config --installbuilddir`;
++	chomp($libtool);
++	$libtool = "$libtool/libtool";
++}
+ 
+ my $apr_includedir = `$apr_config --includes`;
+ chomp($apr_includedir);
diff --git a/www/apache22/patches/patch-al b/www/apache22/patches/patch-al
new file mode 100644
index 00000000000..e51fcd074cd
--- /dev/null
+++ b/www/apache22/patches/patch-al
@@ -0,0 +1,31 @@
+$NetBSD: patch-al,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $
+
+--- include/httpd.h.orig	2006-12-08 18:47:07.000000000 +0100
++++ include/httpd.h	2006-12-08 18:48:21.000000000 +0100
+@@ -129,7 +129,7 @@
+ #if defined(OS2) || defined(WIN32)
+ #define DEFAULT_ERRORLOG "logs/error.log"
+ #else
+-#define DEFAULT_ERRORLOG "logs/error_log"
++#define DEFAULT_ERRORLOG DEFAULT_REL_LOGFILEDIR "/error.log"
+ #endif
+ #endif /* DEFAULT_ERRORLOG */
+ 
+@@ -145,7 +145,7 @@
+ 
+ /** The name of the server config file */
+ #ifndef SERVER_CONFIG_FILE
+-#define SERVER_CONFIG_FILE "conf/httpd.conf"
++#define SERVER_CONFIG_FILE DEFAULT_REL_SYSCONFDIR "/httpd.conf"
+ #endif
+ 
+ /** The default path for CGI scripts if none is currently set */
+@@ -235,7 +235,7 @@
+ 
+ /** The name of the MIME types file */
+ #ifndef AP_TYPES_CONFIG_FILE
+-#define AP_TYPES_CONFIG_FILE "conf/mime.types"
++#define AP_TYPES_CONFIG_FILE DEFAULT_REL_SYSCONFDIR "/mime.types"
+ #endif
+ 
+ /*
diff --git a/www/apache22/patches/patch-am b/www/apache22/patches/patch-am
new file mode 100644
index 00000000000..27bac00fae0
--- /dev/null
+++ b/www/apache22/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $
+
+--- include/scoreboard.h.orig	2005-02-04 20:21:18.000000000 +0000
++++ include/scoreboard.h
+@@ -36,7 +36,7 @@ extern "C" {
+ 
+ /* Scoreboard file, if there is one */
+ #ifndef DEFAULT_SCOREBOARD
+-#define DEFAULT_SCOREBOARD "logs/apache_runtime_status"
++#define DEFAULT_SCOREBOARD DEFAULT_REL_RUNTIMEDIR "/apache_runtime_status"
+ #endif
+ 
+ /* Scoreboard info on a process is, for now, kept very brief ---