Update Apache to 1.3.6, mod_ssl to 2.2.8, and mod_perl to 1.19. mod_ssl

now makes use of OpenSSL.

8 files changed, 62 insertions, 190 deletions

diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa
index 5891deb6c58..e6af557ed6c 100644
--- a/www/apache/patches/patch-aa
+++ b/www/apache/patches/patch-aa
@@ -1,51 +1,37 @@
-$NetBSD: patch-aa,v 1.7 1998/12/04 17:23:20 tv Exp $
+$NetBSD: patch-aa,v 1.8 1999/04/30 17:05:20 tv Exp $
 
---- Makefile.tmpl.orig	Fri Dec  4 11:41:42 1998
-+++ Makefile.tmpl	Fri Dec  4 11:47:53 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,17 +414,13 @@
- 		find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \
- 		find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \
+--- Makefile.tmpl.orig	Mon Apr 26 16:03:46 1999
++++ Makefile.tmpl	Mon Apr 26 16:29:40 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@
+@@ -453,12 +453,13 @@
+ 		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
+ 		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
  	fi
--	-@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
--		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
--	else \
+-	-@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);' \
-         		> $(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}; \
--		done; \
--	fi
-+			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;
- 	@echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
- 	(cd $(TOP)/icons/ && $(TAR) cf - *) |\
- 	(cd $(root)$(datadir)/icons/ && $(TAR) xf -); \
-@@ -450,7 +447,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;' \
++			-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 +476,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/apache/patches/patch-ac b/www/apache/patches/patch-ac
deleted file mode 100644
index fa06308e0f1..00000000000
--- a/www/apache/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1998/10/02 14:40:13 tv Exp $
-
---- src/os/unix/os.h.orig	Fri Oct  2 10:14:27 1998
-+++ src/os/unix/os.h	Fri Oct  2 10:14:54 1998
-@@ -114,7 +114,8 @@
- #define RTLD_GLOBAL 0
- #endif
- 
--#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || \
-+	(defined(__NetBSD__) && !defined(__ELF__))
- #define DLSYM_NEEDS_UNDERSCORE
- #endif
- 
diff --git a/www/apache/patches/patch-ad b/www/apache/patches/patch-ad
deleted file mode 100644
index e5ab86e7208..00000000000
--- a/www/apache/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.3 1998/12/03 17:23:52 tv Exp $
-
---- 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
- #define USE_MMAP_FILES
-+#define USE_FLOCK_SERIALIZED_ACCEPT
- #endif
- 
- #elif defined(UTS21)
diff --git a/www/apache/patches/patch-ag b/www/apache/patches/patch-ag
index c865314e7d8..e8d3973f363 100644
--- a/www/apache/patches/patch-ag
+++ b/www/apache/patches/patch-ag
@@ -1,27 +1,29 @@
-$NetBSD: patch-ag,v 1.1 1998/12/03 17:23:53 tv Exp $
+$NetBSD: patch-ag,v 1.2 1999/04/30 17:05:20 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*)
+--- 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/apache/patches/patch-ai b/www/apache/patches/patch-ai
deleted file mode 100644
index e3d3e794fc6..00000000000
--- a/www/apache/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$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-am b/www/apache/patches/patch-am
index 04c306f5a03..82325745f69 100644
--- a/www/apache/patches/patch-am
+++ b/www/apache/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.2 1998/12/07 17:35:49 tv Exp $
+$NetBSD: patch-am,v 1.3 1999/04/30 17:05:20 tv 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
@@ -7,7 +7,7 @@ $NetBSD: patch-am,v 1.2 1998/12/07 17:35:49 tv Exp $
          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,int) */
++        /* 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));
diff --git a/www/apache/patches/patch-core-404 b/www/apache/patches/patch-core-404
deleted file mode 100644
index 301103c8944..00000000000
--- a/www/apache/patches/patch-core-404
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-core-404,v 1.2 1998/12/05 05:00:00 tv Exp $
-
-This patch fixes a potential denial-of-service vulnerability in
-Apache 1.3.2 and 1.3.3.  It is strongly recommended that you apply
-it or upgrade to a more recent version of Apache when it is available.
-
-Thanks to Studenten Net Twente for finding and reporting the problem.
-
-Index: include/http_log.h
-===================================================================
-RCS file: /home/cvs/apache-1.3/src/include/http_log.h,v
-retrieving revision 1.31
-diff -u -r1.31 http_log.h
---- src/include/http_log.h	1998/08/06 17:30:24	1.31
-+++ src/include/http_log.h	1998/10/30 02:23:06
-@@ -105,6 +105,15 @@
- #define APLOG_MARK	__FILE__,__LINE__
- 
- void ap_open_logs (server_rec *, pool *p);
-+
-+/* The two primary logging functions, ap_log_error and ap_log_rerror,
-+ * use a printf style format string to build the log message.  It is
-+ * VERY IMPORTANT that you not include any raw data from the network,
-+ * such as the request-URI or request header fields, within the format
-+ * string.  Doing so makes the server vulnerable to a denial-of-service
-+ * attack and other messy behavior.  Instead, use a simple format string
-+ * like "%s", followed by the string containing the untrusted data.
-+ */
- API_EXPORT(void) ap_log_error(const char *file, int line, int level,
- 			     const server_rec *s, const char *fmt, ...)
- 			    __attribute__((format(printf,5,6)));
-Index: main/http_core.c
-===================================================================
-RCS file: /home/cvs/apache-1.3/src/main/http_core.c,v
-retrieving revision 1.237
-diff -u -r1.237 http_core.c
---- src/main/http_core.c	1998/10/23 20:07:39	1.237
-+++ src/main/http_core.c	1998/10/30 02:23:07
-@@ -2783,7 +2783,7 @@
- 	else {
- 	    emsg = ap_pstrcat(r->pool, emsg, r->filename, r->path_info, NULL);
- 	}
--	ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r, emsg);
-+	ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r, "%s", emsg);
- 	return HTTP_NOT_FOUND;
-     }
-     if (r->method_number != M_GET) {
diff --git a/www/apache/patches/patch-proxy-segv b/www/apache/patches/patch-proxy-segv
deleted file mode 100644
index 28e61ad136d..00000000000
--- a/www/apache/patches/patch-proxy-segv
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-proxy-segv,v 1.2 1998/12/05 05:00:00 tv Exp $
-
-This patch fixes a segmentation violation in mod_proxy when a
-response is non-cachable.  Problem reported by Doug Bloebaum.
-
-Index: modules/proxy/proxy_util.c
-===================================================================
-RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_util.c,v
-retrieving revision 1.70
-diff -u -r1.70 proxy_util.c
---- src/modules/proxy/proxy_util.c	1998/08/31 19:51:59	1.70
-+++ src/modules/proxy/proxy_util.c	1998/10/09 16:21:14
-@@ -581,7 +581,7 @@
-                 ap_reset_timeout(r);
- 
-             if (w <= 0) {
--                if (c != NULL) {
-+                if (c != NULL && c->fp != NULL) {
-                     /* when a send failure occurs, we need to decide
-                      * whether to continue loading and caching the
-                      * document, or to abort the whole thing