Update Apache and mod_ssl using new build layout (see post to tech-pkg for

details).  No security fixes in Apache 1.3.3, so immediate upgrade from
1.3.2 is not necessary.

9 files changed, 273 insertions, 13 deletions

diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa
new file mode 100644
index 00000000000..5b2b98df384
--- /dev/null
+++ b/www/apache/patches/patch-aa
@@ -0,0 +1,50 @@
+$NetBSD: patch-aa,v 1.6 1998/12/03 17:23:52 tv Exp $
+
+--- Makefile.tmpl.orig	Thu Dec  3 07:42:35 1998
++++ Makefile.tmpl	Thu Dec  3 08:22:10 1998
+@@ -275,7 +275,7 @@
+ 	$(MKDIR) $(root)$(sysconfdir)/ssl.key
+ 	$(MKDIR) $(root)$(datadir)/htdocs
+ 	$(MKDIR) $(root)$(datadir)/icons
+-	$(MKDIR) $(root)$(datadir)/cgi-bin
++	$(MKDIR) $(root)$(prefix)/libexec/cgi-bin
+ 	$(MKDIR) $(root)$(includedir)
+ 	$(MKDIR) $(root)$(runtimedir)
+ 	$(MKDIR) $(root)$(logfiledir)
+@@ -352,6 +352,7 @@
+ 	@echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*] $(root)$(sbindir)/apachectl"; \
+ 	sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/httpd.pid;' \
+ 		-e 's;HTTPD=.*;HTTPD=$(sbindir)/httpd;' \
++		-e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib:$(prefix)/lib:/usr/local/lib;' \
+ 		< $(TOP)/$(SRC)/support/apachectl > $(TOP)/$(SRC)/.apaci.install.tmp && \
+ 		$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sbindir)/apachectl
+ 	$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.1 $(root)$(mandir)/man1/apachectl.1
+@@ -413,15 +414,15 @@
+ 		find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \
+ 		find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \
+ 	fi
+-	-@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
+-		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
++	-@if [ -f $(root)$(prefix)/libexec/cgi-bin/printenv ]; then \
++		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(prefix)/libexec/cgi-bin/]"; \
+ 	else \
+ 		for script in printenv test-cgi; do \
+ 			cat $(TOP)/cgi-bin/$${script} |\
+ 			sed -e 's;^#!/.*perl;#!$(PERL);' \
+         		> $(TOP)/$(SRC)/.apaci.install.tmp; \
+-			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin/$${script}"; \
+-			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \
++			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(prefix)/libexec/cgi-bin/$${script}"; \
++			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(prefix)/libexec/cgi-bin/$${script}; \
+ 		done; \
+ 	fi
+ 	@echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
+@@ -450,7 +451,7 @@
+ 			-e 's;@@ServerRoot@@/conf/ssl.key;$(sysconfdir)/ssl.key;' \
+ 			-e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
+ 			-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
+-			-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
++			-e 's;@@ServerRoot@@/cgi-bin;$(prefix)/libexec/cgi-bin;' \
+ 			-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
+ 			-e 's;@@ServerRoot@@;$(prefix);' \
+ 			-e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
diff --git a/www/apache/patches/patch-ab b/www/apache/patches/patch-ab
index 19c65dc043b..d39ff875340 100644
--- a/www/apache/patches/patch-ab
+++ b/www/apache/patches/patch-ab
@@ -1,17 +1,26 @@
-$NetBSD: patch-ab,v 1.4 1998/11/12 23:54:33 frueauf Exp $
+$NetBSD: patch-ab,v 1.5 1998/12/03 17:23:52 tv Exp $
 
---- htdocs/index.html.orig	Sat Sep  5 22:09:30 1998
-+++ htdocs/index.html	Sat Sep  5 22:37:43 1998
-@@ -39,13 +39,18 @@
+--- 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.
-+  Information on the NetBSD multiplatform operating system can be found
-+  at <A HREF="http://www.netbsd.org/">NetBSD's homepage</A> on the net.
+-  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>
diff --git a/www/apache/patches/patch-ad b/www/apache/patches/patch-ad
index ce47debd6d0..e5ab86e7208 100644
--- a/www/apache/patches/patch-ad
+++ b/www/apache/patches/patch-ad
@@ -1,10 +1,16 @@
-$NetBSD: patch-ad,v 1.2 1998/11/12 23:54:33 frueauf Exp $
+$NetBSD: patch-ad,v 1.3 1998/12/03 17:23:52 tv Exp $
 
-This patch is necessary for listening on multiple ports safely. It has
-been submitted to the apache group, the gnats ID is os-netbsd/3120.
-
---- src/include/ap_config.h~	Thu Sep 17 23:49:12 1998
-+++ src/include/ap_config.h	Mon Oct  5 09:41:28 1998
+--- src/include/ap_config.h.orig	Sat Oct  3 11:33:35 1998
++++ src/include/ap_config.h	Wed Dec  2 11:18:59 1998
+@@ -398,7 +398,7 @@
+ #define DEFAULT_USER_DIR        "Library/Web Documents"
+ #define DEFAULT_USER            "nobody"
+ #define DEFAULT_GROUP           "nogroup"
+-#define DEFAULT_PATH            "/bin:/usr/bin:/usr/local/bin"
++#define DEFAULT_PATH            "/bin:/usr/bin:@@PREFIX@@/bin:/usr/local/bin"
+ #endif
+ 
+ #elif defined(LINUX)
 @@ -592,6 +592,7 @@
  #define HAVE_MMAP 1
  #define USE_MMAP_SCOREBOARD
diff --git a/www/apache/patches/patch-ae b/www/apache/patches/patch-ae
new file mode 100644
index 00000000000..c62896b6ab3
--- /dev/null
+++ b/www/apache/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 1998/12/03 17:23:53 tv 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/apache/patches/patch-af b/www/apache/patches/patch-af
new file mode 100644
index 00000000000..e702eea2084
--- /dev/null
+++ b/www/apache/patches/patch-af
@@ -0,0 +1,105 @@
+$NetBSD: patch-af,v 1.1 1998/12/03 17:23:53 tv Exp $
+
+--- src/modules/standard/mod_include.c.orig	Thu Sep 24 10:06:42 1998
++++ src/modules/standard/mod_include.c	Wed Dec  2 10:36:06 1998
+@@ -92,7 +92,9 @@
+ #include "http_log.h"
+ #include "http_main.h"
+ #include "util_script.h"
++#include "ap_include_extern.h"
+ #endif
++#define get_tag ap_include_get_tag
+ 
+ #define STARTING_SEQUENCE "<!--#"
+ #define ENDING_SEQUENCE "-->"
+@@ -111,6 +113,12 @@
+ /* just need some arbitrary non-NULL pointer which can't also be a request_rec */
+ #define NESTED_INCLUDE_MAGIC	(&includes_module)
+ 
++static struct extern_handler {
++    struct extern_handler *next;
++    char cmd[20];
++    ap_include_extern_func func;
++} *extern_handlers;
++
+ /* ------------------------ Environment function -------------------------- */
+ 
+ /* XXX: could use ap_table_overlap here */
+@@ -354,7 +362,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;
+ 
+@@ -2090,6 +2099,50 @@
+     }
+ }
+ 
++API_EXPORT(int)
++ap_register_include_extern(const char *cmd, ap_include_extern_func func) {
++    struct extern_handler *h;
++
++    for (h = extern_handlers; h; h = h->next)
++	if (!strncmp(h->cmd, cmd, 20))
++	    return -1;
++    if (!(h = calloc(1, sizeof(*h))))
++	return -1;
++
++    h->next = extern_handlers;
++    strncpy(h->cmd, cmd, 20);
++    h->func = func;
++    extern_handlers = h;
++    return 0;
++}
++
++/*
++ * Since we should be compiled in, dynamic modules will all initialize
++ * _after_ us.  This assumption breaks if mod_includes is made dynamic,
++ * or if modules using ap_register_include_extern() are compiled in.
++ */
++static void includes_init(server_rec *s, pool *p) {
++    struct extern_handler *h, *n;
++
++    for (h = extern_handlers; h; h = n) {
++	n = h->next;
++	free(h);
++    }
++    extern_handlers = NULL;
++}
++
++static int do_externs(FILE *in, request_rec *r, const char *error,
++		      const char *cmd, int *ret) {
++    struct extern_handler *h;
++
++    for (h = extern_handlers; h; h = h->next)
++	if (!strncmp(h->cmd, cmd, 20)) {
++	    *ret = (*h->func)(in, r, error);
++	    return 0;
++	}
++    return -1;
++}
++
+ 
+ 
+ /* -------------------------- The main function --------------------------- */
+@@ -2213,6 +2266,7 @@
+                 ret = handle_perl(f, r, error);
+             }
+ #endif
++	    else if (!do_externs(f, r, error, directive, &ret)) {}
+             else {
+                 ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
+                             "httpd: unknown directive \"%s\" "
+@@ -2420,7 +2474,7 @@
+ module MODULE_VAR_EXPORT includes_module =
+ {
+     STANDARD_MODULE_STUFF,
+-    NULL,                       /* initializer */
++    includes_init,              /* initializer */
+     create_includes_dir_config, /* dir config creater */
+     NULL,                       /* dir merger --- default is to override */
+     NULL,                       /* server config */
diff --git a/www/apache/patches/patch-ag b/www/apache/patches/patch-ag
new file mode 100644
index 00000000000..c865314e7d8
--- /dev/null
+++ b/www/apache/patches/patch-ag
@@ -0,0 +1,27 @@
+$NetBSD: patch-ag,v 1.1 1998/12/03 17:23:53 tv Exp $
+
+--- src/Configure.orig	Wed Oct  7 05:19:30 1998
++++ src/Configure	Wed Dec  2 11:49:22 1998
+@@ -913,16 +914,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"
++            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
+             ;;
+         *-apple-rhapsody*)
diff --git a/www/apache/patches/patch-ah b/www/apache/patches/patch-ah
new file mode 100644
index 00000000000..eb8516f607d
--- /dev/null
+++ b/www/apache/patches/patch-ah
@@ -0,0 +1,14 @@
+$NetBSD: patch-ah,v 1.1 1998/12/03 17:23:53 tv 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/apache/patches/patch-ai b/www/apache/patches/patch-ai
new file mode 100644
index 00000000000..e3d3e794fc6
--- /dev/null
+++ b/www/apache/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 1998/12/03 17:23:54 tv Exp $
+
+--- htdocs/manual/mod/index.html.orig	Thu Dec  3 10:16:58 1998
++++ htdocs/manual/mod/index.html	Thu Dec  3 10:17:57 1998
+@@ -111,6 +111,8 @@
+ <DD>Experimental support for loading modules (DLLs on Windows) at runtime
+ <DT><A HREF="mod_speling.html">mod_speling</A> Apache 1.3 and up
+ <DD>Automatically correct minor typos in URLs
++<DT><A HREF="mod_ssl/index.html">mod_ssl</A> Apache 1.3 with mod_ssl applied
++<DD>Apache SSL interface to SSLeay
+ <DT><A HREF="mod_status.html">mod_status</A>
+ <DD>Server status display
+ <DT><A HREF="mod_userdir.html">mod_userdir</A>
diff --git a/www/apache/patches/patch-aj b/www/apache/patches/patch-aj
new file mode 100644
index 00000000000..fb982398e78
--- /dev/null
+++ b/www/apache/patches/patch-aj
@@ -0,0 +1,22 @@
+$NetBSD: patch-aj,v 1.1 1998/12/03 17:23:54 tv 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.0
++LoadFile !libssl.so.0
++LoadModule ssl_module lib/httpd/mod_ssl.so
++AddModule mod_ssl.c
++</IfDefine>
+ 
+ # ServerType is either inetd, or standalone.
+