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.

1 files changed, 32 insertions, 46 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 \