import pkgsrc/www/apache into pkgsrc/www/apache6,

to make a IPv6-ready version of apache package.

10 files changed, 318 insertions, 0 deletions

diff --git a/www/apache6/patches/patch-aa b/www/apache6/patches/patch-aa
new file mode 100644
index 00000000000..ef599868f6b
--- /dev/null
+++ b/www/apache6/patches/patch-aa
@@ -0,0 +1,72 @@
+$NetBSD: patch-aa,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+
+--- Makefile.tmpl.orig	Fri May  7 09:49:05 1999
++++ Makefile.tmpl	Fri May  7 09:52:16 1999
+@@ -114,7 +114,7 @@
+ datadir         = @datadir@
+ iconsdir        = $(datadir)/icons
+ htdocsdir       = $(datadir)/htdocs
+-cgidir          = $(datadir)/cgi-bin
++cgidir          = $(prefix)/libexec/cgi-bin
+ includedir      = @includedir@
+ localstatedir   = @localstatedir@
+ runtimedir      = @runtimedir@
+@@ -344,34 +344,6 @@
+ 			file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
+ 			echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
+ 			$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \
+-			name=`$(TOP)/$(AUX)/fmn.sh $(TOP)/$(SRC)/$${mod}`; \
+-			if [ ".$$name" = .ssl_module ]; then \
+-				echo "<IfDefine SSL>" >>$(SRC)/.apaci.install.conf; \
+-			fi; \
+-			echo dummy | awk '{ printf("LoadModule %-18s %s\n", modname, modpath); }' \
+-			modname="$${name}" modpath="$(libexecdir_relative)$${file}" >>$(SRC)/.apaci.install.conf; \
+-			if [ ".$$name" = .ssl_module ]; then \
+-				echo "</IfDefine>" >>$(SRC)/.apaci.install.conf; \
+-			fi; \
+-		done; \
+-		echo "" >>$(SRC)/.apaci.install.conf; \
+-		echo "#  Reconstruction of the complete module list from all available modules" >>$(SRC)/.apaci.install.conf; \
+-		echo "#  (static and shared ones) to achieve correct module execution order." >>$(SRC)/.apaci.install.conf; \
+-		echo "#  [WHENEVER YOU CHANGE THE LOADMODULE SECTION ABOVE UPDATE THIS, TOO]" >>$(SRC)/.apaci.install.conf; \
+-		echo "ClearModuleList" >>$(SRC)/.apaci.install.conf; \
+-		for mod in `egrep "^[ 	]*(Add|Shared)Module" $(SRC)/Configuration.apaci |\
+-		            sed	-e 's:[ 	]*SharedModule::' \
+-		                -e 's:[ 	]*AddModule::' \
+-		                -e 's:modules/[^/]*/::' \
+-		                -e 's:[ 	]lib: mod_:' \
+-		                -e 's:\.[soam]*$$:.c:'`; do \
+-			if [ ".$$mod" = .mod_ssl.c ]; then \
+-				echo "<IfDefine SSL>" >>$(SRC)/.apaci.install.conf; \
+-			fi; \
+-			echo "AddModule $$mod" >>$(SRC)/.apaci.install.conf; \
+-			if [ ".$$mod" = .mod_ssl.c ]; then \
+-				echo "</IfDefine>" >>$(SRC)/.apaci.install.conf; \
+-			fi; \
+ 		done; \
+ 	fi
+ 	@echo "<=== [programs]"
+@@ -453,12 +425,13 @@
+ 		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
+ 		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
+ 	fi
+-	-@if [ -f $(root)$(cgidir)/printenv ]; then \
++	-@if false; then \
+ 		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
+ 	else \
+ 		for script in printenv test-cgi; do \
+ 			cat $(TOP)/cgi-bin/$${script} |\
+ 			sed -e 's;^#!/.*perl;#!$(PERL);' \
++			-e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib:$(prefix)/lib:/usr/local/lib;' \
+ 			> $(TOP)/$(SRC)/.apaci.install.tmp; \
+ 			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
+ 			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
+@@ -475,7 +448,7 @@
+ #   and initial config files while preserving existing ones.
+ install-config:
+ 	@echo "===> [config: Installing Apache configuration files]"
+-	-@for conf in httpd.conf access.conf srm.conf; do \
++	-@for conf in httpd.conf; do \
+ 		if [ .$$conf = .httpd.conf ]; then \
+ 			target_conf="$(TARGET).conf"; \
+ 		else \
diff --git a/www/apache6/patches/patch-ab b/www/apache6/patches/patch-ab
new file mode 100644
index 00000000000..3aa29ae1745
--- /dev/null
+++ b/www/apache6/patches/patch-ab
@@ -0,0 +1,34 @@
+$NetBSD: patch-ab,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+
+--- htdocs/index.html.orig	Wed May 20 10:59:42 1998
++++ htdocs/index.html	Thu Dec  3 09:48:59 1998
+@@ -38,14 +38,26 @@
+   <A
+    HREF="manual/index.html"
+   >documentation</A>
+-  has been included with this distribution.
++  has been included with this distribution.<BR>
++  If the <STRONG>mod_ssl</STRONG> SSL extension has been installed, read the
++  <A
++   HREF="manual/mod/mod_ssl/index.html"
++  >SSL documentation</A>
++  carefully.
+   </P>
+   <P>
+-  The Webmaster of this site is free to use the image below on
+-  an Apache-powered Web server.  Thanks for using Apache!
++  Information on the NetBSD multiplatform operating system can be found
++  at <A HREF="http://www.netbsd.org/">NetBSD's homepage</A> on the net.
++  </P>
++  <P>
++  The Webmaster of this site is free to use the images below on
++  an Apache/NetBSD-powered Web server.  Thanks for using <A HREF="http://www.apache.org/">Apache</A> on <A HREF="http://www.netbsd.org/">NetBSD</A>!
+   </P>
+   <DIV ALIGN="CENTER">
+    <IMG SRC="apache_pb.gif" ALT="">
++   <A HREF="http://www.netbsd.org/">
++        <IMG SRC="sitedrivenby.gif" border=0
++             ALT="Site driven by NetBSD - NetBSD rocks!"></A>
+   </DIV>
+  </BODY>
+ </HTML>
diff --git a/www/apache6/patches/patch-ae b/www/apache6/patches/patch-ae
new file mode 100644
index 00000000000..9332e5b2307
--- /dev/null
+++ b/www/apache6/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+
+--- src/support/apachectl.orig	Thu Dec  3 08:23:16 1998
++++ src/support/apachectl	Thu Dec  3 08:23:49 1998
+@@ -27,6 +27,9 @@
+ # the path to your httpd binary, including options if necessary
+ HTTPD='/usr/local/apache/src/httpd'
+ #
++# shared object search path
++LD_LIBRARY_PATH=
++export LD_LIBRARY_PATH
+ # a command that outputs a formatted text version of the HTML at the
+ # url given on the command line.  Designed for lynx, however other
+ # programs may work.  
diff --git a/www/apache6/patches/patch-af b/www/apache6/patches/patch-af
new file mode 100644
index 00000000000..f586fbd0f48
--- /dev/null
+++ b/www/apache6/patches/patch-af
@@ -0,0 +1,86 @@
+$NetBSD: patch-af,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+
+--- src/modules/standard/mod_include.c.orig	Thu Sep 24 10:06:42 1998
++++ src/modules/standard/mod_include.c	Mon Dec  7 11:17:39 1998
+@@ -92,7 +92,11 @@
+ #include "http_log.h"
+ #include "http_main.h"
+ #include "util_script.h"
++#include "ap_include_extern.h"
++#include "ap_hook.h"
+ #endif
++#define get_tag ap_include_get_tag
++#define parse_string ap_include_parse_string
+ 
+ #define STARTING_SEQUENCE "<!--#"
+ #define ENDING_SEQUENCE "-->"
+@@ -354,7 +358,8 @@
+  * the tag value is html decoded if dodecode is non-zero
+  */
+ 
+-static char *get_tag(pool *p, FILE *in, char *tag, int tagbuf_len, int dodecode)
++API_EXPORT(char *)
++ap_include_get_tag(pool *p, FILE *in, char *tag, int tagbuf_len, int dodecode)
+ {
+     char *t = tag, *tag_val, c, term;
+ 
+@@ -473,7 +478,7 @@
+ /*
+  * Do variable substitution on strings
+  */
+-static void parse_string(request_rec *r, const char *in, char *out,
++API_EXPORT(void) ap_include_parse_string(request_rec *r, const char *in, char *out,
+ 			size_t length, int leave_name)
+ {
+     char ch;
+@@ -666,7 +671,8 @@
+             parse_string(r, tag_val, parsed_string, sizeof(parsed_string), 0);
+             if (tag[0] == 'f') {
+                 /* be safe; only files in this directory or below allowed */
+-		if (!is_only_below(parsed_string)) {
++		if ((ap_allow_options(r) & OPT_INCNOEXEC) &&
++		    !is_only_below(parsed_string)) {
+                     error_fmt = "unable to include file \"%s\" "
+                         "in parsed file %s";
+                 }
+@@ -1010,7 +1016,8 @@
+     int ret=0;
+ 
+     if (!strcmp(tag, "file")) {
+-        ap_getparents(tag_val);    /* get rid of any nasties */
++	if (ap_allow_options(r) & OPT_INCNOEXEC)
++	    ap_getparents(tag_val);    /* get rid of any nasties */
+         
+         rr = ap_sub_req_lookup_file(tag_val, r);
+ 
+@@ -2090,6 +2097,16 @@
+     }
+ }
+ 
++API_EXPORT(int)
++ap_include_register_extern(const char *cmd, ap_include_extern_func func) {
++    char cmdbuf[40] = "include::";
++
++    strncat(cmdbuf, cmd, 30);
++    ap_hook_configure(cmdbuf, AP_HOOK_SIG5(int,ptr,ptr,ptr,ptr), AP_HOOK_TOPMOST);
++    ap_hook_register(cmdbuf, func, NULL);
++
++    return 0;
++}
+ 
+ 
+ /* -------------------------- The main function --------------------------- */
+@@ -2214,6 +2231,13 @@
+             }
+ #endif
+             else {
++		char cmdbuf[40] = "include::";
++
++		strncat(cmdbuf, directive, 30);
++		if ((ap_hook_status(cmdbuf) >= AP_HOOK_STATE_CONFIGURED) &&
++		    (ap_hook_call(cmdbuf, &ret, f, r, error, timefmt) == TRUE))
++		    continue;
++
+                 ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
+                             "httpd: unknown directive \"%s\" "
+                             "in parsed doc %s",
diff --git a/www/apache6/patches/patch-ag b/www/apache6/patches/patch-ag
new file mode 100644
index 00000000000..13eb9523c64
--- /dev/null
+++ b/www/apache6/patches/patch-ag
@@ -0,0 +1,29 @@
+$NetBSD: patch-ag,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+
+--- src/Configure.orig	Mon Apr 26 14:34:33 1999
++++ src/Configure	Mon Apr 26 15:10:13 1999
+@@ -974,16 +974,15 @@
+ 	    LDFLAGS_SHLIB_EXPORT=""
+ 	    SHLIB_SUFFIX_DEPTH=2
+ 	    ;;
+-	alpha-*-netbsd*|mips-*-netbsd*|powerpc-*-netbsd*)
+-	    CFLAGS_SHLIB="-fpic -DPIC"
+-	    LDFLAGS_SHLIB="-shared"
+-	    LDFLAGS_SHLIB_EXPORT=""
+-	    SHLIB_SUFFIX_DEPTH=2
+-	    ;;
+ 	*-netbsd*)
+-	    CFLAGS_SHLIB="-fpic -DPIC"
+-	    LDFLAGS_SHLIB="-Bshareable"
+-	    LDFLAGS_SHLIB_EXPORT=""
++	    CFLAGS_SHLIB="-fPIC -DPIC"
++	    if echo __ELF__ | ${CC} -E - | grep -q __ELF__; then
++		LDFLAGS_SHLIB="-Bshareable"
++		LDFLAGS_SHLIB_EXPORT=""
++	    else
++		LDFLAGS_SHLIB="-shared"
++		LDFLAGS_SHLIB_EXPORT="-Wl,-E"
++	    fi
+ 	    SHLIB_SUFFIX_DEPTH=2
+ 	    ;;
+ 	*-bsdi)
diff --git a/www/apache6/patches/patch-ah b/www/apache6/patches/patch-ah
new file mode 100644
index 00000000000..63ab3898194
--- /dev/null
+++ b/www/apache6/patches/patch-ah
@@ -0,0 +1,14 @@
+$NetBSD: patch-ah,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+
+--- src/modules/standard/mod_so.c.orig	Sat Sep 19 08:27:24 1998
++++ src/modules/standard/mod_so.c	Thu Dec  3 07:59:19 1998
+@@ -289,6 +296,9 @@
+     void *handle;
+     char *file;
+ 
++/* XXX Hack: ask dlopen() without translating for ServerRoot. */
++    if (filename[0] == '!') file = filename + 1;
++    else
+     file = ap_server_root_relative(cmd->pool, filename);
+     
+     if (!(handle = ap_os_dso_load(file))) {
diff --git a/www/apache6/patches/patch-aj b/www/apache6/patches/patch-aj
new file mode 100644
index 00000000000..dcef27978de
--- /dev/null
+++ b/www/apache6/patches/patch-aj
@@ -0,0 +1,22 @@
+$NetBSD: patch-aj,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+
+--- conf/httpd.conf-dist.orig	Thu Dec  3 11:05:29 1998
++++ conf/httpd.conf-dist	Thu Dec  3 11:07:26 1998
+@@ -18,7 +18,16 @@
+ # binary.
+ #
+ # Example:
+-# LoadModule foo_module libexec/mod_foo.so
++# LoadModule foo_module lib/httpd/mod_foo.so
++
++<IfDefine SSL>
++### Uncomment the following if you wish to use SSL and you need RSAREF: ###
++#LoadFile !librsaref.so.2
++LoadFile !libcrypto.so.1
++LoadFile !libssl.so.1
++LoadModule ssl_module lib/httpd/mod_ssl.so
++AddModule mod_ssl.c
++</IfDefine>
+ 
+ # ServerType is either inetd, or standalone.
+ 
diff --git a/www/apache6/patches/patch-ak b/www/apache6/patches/patch-ak
new file mode 100644
index 00000000000..a96f47f312d
--- /dev/null
+++ b/www/apache6/patches/patch-ak
@@ -0,0 +1,14 @@
+$NetBSD: patch-ak,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+
+--- src/support/apxs.pl.orig	Fri Dec  4 11:34:17 1998
++++ src/support/apxs.pl	Fri Dec  4 11:36:26 1998
+@@ -383,8 +383,7 @@
+         }
+         my $t = $f;
+         $t =~ s|^.+/([^/]+)$|$1|;
+-        push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
+-        push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
++        push(@cmds, "install -c -m 555 -o root -g wheel $f $CFG_LIBEXECDIR/$t");
+ 
+         #   determine module symbolname and filename
+         my $filename = '';
diff --git a/www/apache6/patches/patch-al b/www/apache6/patches/patch-al
new file mode 100644
index 00000000000..8bee8a12e3c
--- /dev/null
+++ b/www/apache6/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+
+--- src/os/unix/os.c.orig	Fri Dec  4 18:53:48 1998
++++ src/os/unix/os.c	Fri Dec  4 18:54:00 1998
+@@ -119,7 +119,7 @@
+ #elif defined(RHAPSODY)
+     NSUnLinkModule(handle,FALSE);
+ 
+-#else
++#elif 0
+     dlclose(handle);
+ #endif
+ 
diff --git a/www/apache6/patches/patch-am b/www/apache6/patches/patch-am
new file mode 100644
index 00000000000..5725a4c584e
--- /dev/null
+++ b/www/apache6/patches/patch-am
@@ -0,0 +1,20 @@
+$NetBSD: patch-am,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+
+--- src/ap/ap_hook.c.orig	Mon Dec  7 10:31:53 1998
++++ src/ap/ap_hook.c	Mon Dec  7 10:32:48 1998
+@@ -705,6 +705,15 @@
+         *((int *)v_rc) = ((int(*)(void *, void *, void *, int))(hf->hf_ptr))(v1, v2, v3, v4);
+         rc = (*((int *)v_rc) != he->he_modeval.v_int);
+     }
++    else if (he->he_sig == AP_HOOK_SIG5(int, ptr, ptr, ptr, ptr)) {
++        /* Call: int func(ptr,ptr,ptr,ptr) */
++        void *v1 = va_arg(ap, va_type(ptr));
++        void *v2 = va_arg(ap, va_type(ptr));
++        void *v3 = va_arg(ap, va_type(ptr));
++        void *v4 = va_arg(ap, va_type(ptr));
++        *((int *)v_rc) = ((int(*)(void *, void *, void *, void *))(hf->hf_ptr))(v1, v2, v3, v4);
++        rc = (*((int *)v_rc) != he->he_modeval.v_int);
++    }
+     else if (he->he_sig == AP_HOOK_SIG6(int, ptr, ptr, ptr, ptr, int)) {
+         /* Call: int func(ptr,ptr,ptr,ptr,int) */
+         void *v1 = va_arg(ap, va_type(ptr));