Update build to work with mod_ssl-2.6.6-1.3.12 to keep in sync with ap-ssl.

EAPI didn't change so no need to change Apache's version number.

Also standardize package builds to have Apache listen on ports 80/443
regardless of UID of user that builds the package, and make MAINTAINER
point to me.

11 files changed, 206 insertions, 194 deletions

diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa
index 1ee22e81ed0..609648fedbd 100644
--- a/www/apache/patches/patch-aa
+++ b/www/apache/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 1999/11/21 22:09:28 tron Exp $
+$NetBSD: patch-aa,v 1.12 2000/09/12 14:17:32 jlam Exp $
 
---- Makefile.tmpl.orig	Mon Sep 27 18:03:16 1999
-+++ Makefile.tmpl	Mon Sep 27 18:03:18 1999
-@@ -371,34 +371,6 @@
+--- Makefile.tmpl.orig	Thu Sep  7 01:19:50 2000
++++ Makefile.tmpl
+@@ -382,34 +382,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}; \
@@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.11 1999/11/21 22:09:28 tron Exp $
  		done; \
  	fi
  	@echo "<=== [programs]"
-@@ -524,12 +496,13 @@
+@@ -535,12 +507,13 @@
  		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
  		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
  	fi
@@ -52,7 +52,7 @@ $NetBSD: patch-aa,v 1.11 1999/11/21 22:09:28 tron Exp $
  			> $(TOP)/$(SRC)/.apaci.install.tmp; \
  			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
  			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
-@@ -546,7 +519,7 @@
+@@ -557,7 +530,7 @@
  #   and initial config files while preserving existing ones.
  install-config:
  	@echo "===> [config: Installing Apache configuration files]"
diff --git a/www/apache/patches/patch-ab b/www/apache/patches/patch-ab
index f632938757a..baba26c38fc 100644
--- a/www/apache/patches/patch-ab
+++ b/www/apache/patches/patch-ab
@@ -1,38 +1,22 @@
-$NetBSD: patch-ab,v 1.6 2000/01/31 16:35:37 christos Exp $
+$NetBSD: patch-ab,v 1.7 2000/09/12 14:17:32 jlam Exp $
 
---- htdocs/index.html.en.orig	Sat Nov 20 16:29:40 1999
-+++ htdocs/index.html.en	Sun Jan 30 17:00:58 2000
-@@ -28,11 +28,29 @@
+--- conf/httpd.conf-dist.orig	Thu Sep  7 01:19:50 2000
++++ conf/httpd.conf-dist
+@@ -199,7 +199,16 @@
+ # the order below without expert advice.
+ #
+ # 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
++LoadFile !libcrypto.so
++LoadFile !libssl.so
++LoadModule ssl_module lib/httpd/mod_ssl.so
++AddModule mod_ssl.c
++</IfDefine>
  
- 
- <P>
--The Apache <A HREF="manual/index.html">documentation</A> has been included with this distribution.
--
-+The Apache <A HREF="manual/index.html">documentation</A>
-+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>
-+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>
--You are free to use the image below on an Apache-powered web server.  Thanks for using Apache!
-+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=""></DIV>
-+<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>
+ #
+ # ExtendedStatus controls whether Apache will generate "full" status
diff --git a/www/apache/patches/patch-ac b/www/apache/patches/patch-ac
new file mode 100644
index 00000000000..03a4f9c92ec
--- /dev/null
+++ b/www/apache/patches/patch-ac
@@ -0,0 +1,38 @@
+$NetBSD: patch-ac,v 1.3 2000/09/12 14:17:32 jlam Exp $
+
+--- htdocs/index.html.en.orig	Sat Nov 20 16:29:40 1999
++++ htdocs/index.html.en
+@@ -28,11 +28,29 @@
+ 
+ 
+ <P>
+-The Apache <A HREF="manual/index.html">documentation</A> has been included with this distribution.
+-
++The Apache <A HREF="manual/index.html">documentation</A>
++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>
++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>
+-You are free to use the image below on an Apache-powered web server.  Thanks for using Apache!
++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=""></DIV>
++<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/apache/patches/patch-am b/www/apache/patches/patch-ad
index fcd43871cd5..d589b0b653c 100644
--- a/www/apache/patches/patch-am
+++ b/www/apache/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-am,v 1.4 1999/11/27 22:52:09 rh Exp $
+$NetBSD: patch-ad,v 1.5 2000/09/12 14:17:32 jlam Exp $
 
---- src/ap/ap_hook.c.orig	Sat Nov 27 23:46:41 1999
-+++ src/ap/ap_hook.c	Sat Nov 27 23:46:43 1999
+--- src/ap/ap_hook.c.orig	Thu Sep  7 01:19:46 2000
++++ src/ap/ap_hook.c
 @@ -740,6 +740,15 @@
          *((int *)v_rc) = ((int(*)(void *, void *, void *, int, void *))(hf->hf_ptr))(v1, v2, v3, v4, v5);
          rc = (*((int *)v_rc) != he->he_modeval.v_int);
diff --git a/www/apache/patches/patch-ae b/www/apache/patches/patch-ae
index c62896b6ab3..eed25315c3a 100644
--- a/www/apache/patches/patch-ae
+++ b/www/apache/patches/patch-ae
@@ -1,14 +1,87 @@
-$NetBSD: patch-ae,v 1.1 1998/12/03 17:23:53 tv Exp $
+$NetBSD: patch-ae,v 1.2 2000/09/12 14:17:32 jlam 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.  
+--- src/modules/standard/mod_include.c.orig	Wed Feb  2 15:44:03 2000
++++ src/modules/standard/mod_include.c
+@@ -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 "-->"
+@@ -351,7 +355,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;
+ 
+@@ -470,7 +475,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;
+@@ -663,7 +668,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";
+                 }
+@@ -1075,7 +1081,9 @@
+                         "in parsed file %s";
+         }
+         else {
+-            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);
+ 
+             if (rr->status == HTTP_OK && rr->finfo.st_mode != 0) {
+@@ -2154,6 +2162,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 --------------------------- */
+@@ -2278,6 +2296,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,
+ 			      "unknown directive \"%s\" "
+ 			      "in parsed doc %s",
diff --git a/www/apache/patches/patch-af b/www/apache/patches/patch-af
index 9cb08f242d6..a9ac584adb2 100644
--- a/www/apache/patches/patch-af
+++ b/www/apache/patches/patch-af
@@ -1,87 +1,21 @@
-$NetBSD: patch-af,v 1.5 1999/11/21 22:09:28 tron Exp $
+$NetBSD: patch-af,v 1.6 2000/09/12 14:17:32 jlam Exp $
 
---- src/modules/standard/mod_include.c.orig	Sat May 22 08:57:57 1999
-+++ src/modules/standard/mod_include.c	Mon Oct  4 20:53:14 1999
-@@ -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
+--- src/modules/standard/mod_so.c.orig	Thu Sep  7 01:28:46 2000
++++ src/modules/standard/mod_so.c
+@@ -307,7 +307,15 @@
+     ap_os_dso_handle_t handle;
+     char *file;
  
- #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";
-                 }
-@@ -1057,7 +1063,9 @@
-                         "in parsed file %s";
-         }
-         else {
--            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);
- 
-             if (rr->status == HTTP_OK && rr->finfo.st_mode != 0) {
-@@ -2135,6 +2143,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 --------------------------- */
-@@ -2259,6 +2277,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,
- 			      "unknown directive \"%s\" "
- 			      "in parsed doc %s",
+-    file = ap_server_root_relative(cmd->pool, filename);
++    /*
++     * XXX Hack: If the filename starts with '!', then just as dlopen()
++     * XXX without translating to a pathname relative to ServerRoot.
++     */
++    if (filename[0] == '!') {
++	file = filename + 1;
++    } else {
++	file = ap_server_root_relative(cmd->pool, filename);
++    }
+     
+     if (!(handle = ap_os_dso_load(file))) {
+ 	const char *my_error = ap_os_dso_error();
diff --git a/www/apache/patches/patch-ag b/www/apache/patches/patch-ag
new file mode 100644
index 00000000000..aae9bc10a41
--- /dev/null
+++ b/www/apache/patches/patch-ag
@@ -0,0 +1,18 @@
+$NetBSD: patch-ag,v 1.4 2000/09/12 14:17:32 jlam Exp $
+
+--- src/os/unix/os.c.orig	Sat Jan 15 11:01:09 2000
++++ src/os/unix/os.c
+@@ -129,7 +129,12 @@
+ #elif defined(HAVE_DYLD)
+     NSUnLinkModule(handle,FALSE);
+ 
+-#else
++/*
++ * Work around Apache dlclose() bug, where shared objects may be
++ * dlclose()d before their cleanup procedures are called.
++ * Fixes mod_perl vs. CGI interaction bug.
++ */
++#elif 0
+     dlclose(handle);
+ #endif
+ 
diff --git a/www/apache/patches/patch-ah b/www/apache/patches/patch-ah
index 3028ee5c944..9e86aa92e6d 100644
--- a/www/apache/patches/patch-ah
+++ b/www/apache/patches/patch-ah
@@ -1,14 +1,14 @@
-$NetBSD: patch-ah,v 1.2 1999/11/27 22:52:09 rh Exp $
+$NetBSD: patch-ah,v 1.3 2000/09/12 14:17:33 jlam Exp $
 
---- src/modules/standard/mod_so.c.orig	Sat Nov 27 23:46:32 1999
-+++ src/modules/standard/mod_so.c	Sat Nov 27 23:46:34 1999
-@@ -306,6 +306,9 @@
-     ap_os_dso_handle_t 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))) {
+--- src/support/apachectl.orig	Thu Sep  7 01:19:50 2000
++++ src/support/apachectl
+@@ -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/apache/patches/patch-ak b/www/apache/patches/patch-ai
index 219a14864c4..eb7417cb769 100644
--- a/www/apache/patches/patch-ak
+++ b/www/apache/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.3 2000/01/31 16:35:37 christos Exp $
+$NetBSD: patch-ai,v 1.3 2000/09/12 14:17:33 jlam Exp $
 
---- src/support/apxs.pl.orig	Sun Jan 30 17:04:24 2000
-+++ src/support/apxs.pl	Sun Jan 30 17:05:33 2000
+--- src/support/apxs.pl.orig	Thu Sep  7 01:19:50 2000
++++ src/support/apxs.pl
 @@ -424,8 +424,7 @@
          my $t = $f;
          $t =~ s|^.+/([^/]+)$|$1|;
diff --git a/www/apache/patches/patch-aj b/www/apache/patches/patch-aj
deleted file mode 100644
index bfb78c667a0..00000000000
--- a/www/apache/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2000/09/06 05:52:49 jlam Exp $
-
---- conf/httpd.conf-dist.orig	Sat Nov 27 23:46:36 1999
-+++ conf/httpd.conf-dist	Sat Nov 27 23:46:36 1999
-@@ -199,7 +199,16 @@
- # the order below without expert advice.
- #
- # 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
-+LoadFile !libcrypto.so
-+LoadFile !libssl.so
-+LoadModule ssl_module lib/httpd/mod_ssl.so
-+AddModule mod_ssl.c
-+</IfDefine>
- 
- #
- # ExtendedStatus controls whether Apache will generate "full" status
diff --git a/www/apache/patches/patch-al b/www/apache/patches/patch-al
deleted file mode 100644
index 3e55333823a..00000000000
--- a/www/apache/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.2 1999/11/27 22:52:09 rh Exp $
-
---- src/os/unix/os.c.orig	Sat Nov 27 23:46:39 1999
-+++ src/os/unix/os.c	Sat Nov 27 23:46:40 1999
-@@ -126,7 +126,7 @@
- #elif defined(HAVE_DYLD)
-     NSUnLinkModule(handle,FALSE);
- 
--#else
-+#elif 0
-     dlclose(handle);
- #endif
-