Changelog:

	- Sync with apache13 layout (and some patches)
	- use DOCSDIR
	- Add no_zombies.patch
	- use DIST_SUBDIR=apache

Removed files:
	- files/patch-aq
	- files/patch-ar

Added files:
	- files/patch-httpd.conf-dist
	- files/post-patch-conf:httpd.conf-dist.orig
	- files/patch-FixPatch
	- files/patch-SSLpatch
	- files/patch-Makefile.tmpl
	- files/patch-src::modules::standard::mod_auth_db.module
	- files/patch-src::support::dbmanage
	- files/patch-src::support::log_server_status
	- files/patch-configure

PR:		58403
Submitted By:	MAINTAINER

8 files changed, 207 insertions, 17 deletions

diff --git a/www/apache13-ssl/files/patch-Makefile.tmpl b/www/apache13-ssl/files/patch-Makefile.tmpl
new file mode 100644
index 000000000000..c07cc063ec0b
--- /dev/null
+++ b/www/apache13-ssl/files/patch-Makefile.tmpl
@@ -0,0 +1,108 @@
+--- Makefile.tmpl.orig	Mon Apr 28 15:32:12 2003
++++ Makefile.tmpl	Wed Oct 22 22:59:14 2003
+@@ -270,10 +270,10 @@
+ 	$(MKDIR) $(root)$(mandir)/man1
+ 	$(MKDIR) $(root)$(mandir)/man8
+ 	$(MKDIR) $(root)$(sysconfdir)
+-	$(MKDIR) $(root)$(htdocsdir)
++	$(MKDIR) $(root)$(htdocsdir)-dist
+ 	$(MKDIR) $(root)$(manualdir)
+ 	$(MKDIR) $(root)$(iconsdir)
+-	$(MKDIR) $(root)$(cgidir)
++	$(MKDIR) $(root)$(cgidir)-dist
+ 	$(MKDIR) $(root)$(includedir)
+ 	$(MKDIR) $(root)$(includedir)/xml
+ 	$(MKDIR) $(root)$(runtimedir)
+@@ -459,33 +459,29 @@
+ #   icons and distributed CGI scripts.
+ install-data:
+ 	@echo "===> [data: Installing initial data files]"
+-	-@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
+-		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
+-	else \
+-		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
++		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)-dist/"; \
+ 		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* apache_pb.* ) |\
+-		(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
+-		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
+-		find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \
+-	fi
+-	-@if [ -d $(TOP)/htdocs/manual ]; then \
++		(cd $(root)$(htdocsdir)-dist/ && $(TAR) -xf -); \
++		find $(root)$(htdocsdir)-dist/ -type d -exec chmod a+rx {} \; ; \
++		find $(root)$(htdocsdir)-dist/ -type f -print | xargs chmod a+r ;
+ 		echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
+ 		(cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\
+ 		(cd $(root)$(manualdir)/ && $(TAR) -xf -); \
+ 		find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
+-		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
++		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ;
++	if [ ! -d $(root)$(htdocsdir)/ ]; then \
++		$(LN) -sf $(root)$(htdocsdir)-dist $(root)$(htdocsdir); \
+ 	fi
+-	-@if [ -f $(root)$(cgidir)/printenv ]; then \
+-		echo "[PRESERVING EXISTING CGI 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)$(cgidir)/$${script}"; \
+-			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
+-		done; \
+-	fi
++			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)-dist/$${script}"; \
++			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)-dist/$${script}; \
++		done;
++	if [ ! -d $(root)$(cgidir)/ ]; then \
++		$(LN) -sf $(root)$(cgidir)-dist $(root)$(cgidir); \
++  	fi
+ 	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
+ 	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
+ 	(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
+@@ -506,7 +502,7 @@
+ 		if [ ".$(TARGET)" = .httpd ]; then \
+ 			target_prefix=""; \
+ 		else \
+-			target_prefix="$(TARGET)_"; \
++			target_prefix="$(TARGET)-"; \
+ 		fi; \
+ 		(echo "##"; \
+ 		 echo "## $${target_conf} -- Apache HTTP server configuration file"; \
+@@ -524,10 +520,10 @@
+ 			-e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \
+ 			-e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
+ 			-e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \
+-			-e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \
+-			-e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \
+-			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \
+-			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \
++			-e "s;logs/access_log;$(logfiledir)/$${target_prefix}access.log;" \
++			-e "s;logs/error_log;$(logfiledir)/$${target_prefix}error.log;" \
++			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer.log;" \
++			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent.log;" \
+ 			-e 's;conf/magic;$(sysconfdir)/magic;' \
+ 			-e 's;conf/srm.conf;$(sysconfdir)/srm.conf;' \
+ 			-e 's;conf/access.conf;$(sysconfdir)/access.conf;' \
+@@ -539,8 +535,8 @@
+ 			-e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \
+ 			-e 's;ServerName new.host.name;ServerName $(conf_servername);' \
+ 			> $(TOP)/$(SRC)/.apaci.install.tmp && \
+-		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}.default"; \
+-		$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}.default; \
++		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}-dist"; \
++		$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}-dist; \
+ 		if [ ! -f "$(root)$(sysconfdir)/$${target_conf}" ]; then \
+ 			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}"; \
+ 			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}; \
+@@ -549,8 +545,8 @@
+ 		fi; \
+ 	done
+ 	-@for conf in mime.types magic; do \
+-		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \
+-		$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \
++		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}-dist"; \
++		$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}-dist; \
+ 		if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
+ 			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}"; \
+ 			$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}; \
diff --git a/www/apache13-ssl/files/patch-ar b/www/apache13-ssl/files/patch-SSLpatch
index db93d4cec5d8..db93d4cec5d8 100644
--- a/www/apache13-ssl/files/patch-ar
+++ b/www/apache13-ssl/files/patch-SSLpatch
diff --git a/www/apache13-ssl/files/patch-aq b/www/apache13-ssl/files/patch-aq
deleted file mode 100644
index fb59d97ba8b4..000000000000
--- a/www/apache13-ssl/files/patch-aq
+++ /dev/null
@@ -1,17 +0,0 @@
---- FixPatch.orig	Sun May 23 13:34:08 1999
-+++ FixPatch	Mon May 31 09:03:49 1999
-@@ -112,13 +112,6 @@
- 	echo "Your version of patch is out-of-date. You need patch 2.1 or 2.5."
- fi
- 
--echo -n "Do you want me to apply the fixed-up Apache-SSL patch for you? [n] "
--read ans
--echo $ans | grep -i "^[ \t]*y" >/dev/null
--if [ $? = 0 ]; then
--    patch -p1 <SSLpatch.fixed-up
--else
--    echo "OK, I won't apply the fixed-up patch.  I've left it in SSLpatch.fixed-up";
--fi
-+patch -p1 <SSLpatch.fixed-up
- 
- exit
diff --git a/www/apache13-ssl/files/patch-configure b/www/apache13-ssl/files/patch-configure
new file mode 100644
index 000000000000..78be57c08eed
--- /dev/null
+++ b/www/apache13-ssl/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	Tue May 21 16:24:59 2002
++++ configure	Wed Jun 19 05:27:31 2002
+@@ -1251,7 +1251,7 @@
+     echo "       DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
+     echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
+     echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
+-    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
++    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log"
+     echo "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
+     echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
+     echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
+@@ -1349,7 +1349,7 @@
+ echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
+ echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
+ echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
+-echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
++echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci
+ echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
+ echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci
+ echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
diff --git a/www/apache13-ssl/files/patch-src::modules::standard::mod_auth_db.module b/www/apache13-ssl/files/patch-src::modules::standard::mod_auth_db.module
new file mode 100644
index 000000000000..f4f02e80cbc2
--- /dev/null
+++ b/www/apache13-ssl/files/patch-src::modules::standard::mod_auth_db.module
@@ -0,0 +1,31 @@
+--- src/modules/standard/mod_auth_db.module.bak	Tue Oct 16 13:12:02 2001
++++ src/modules/standard/mod_auth_db.module	Thu Feb 20 12:55:19 2003
+@@ -4,23 +4,23 @@
+     DB_LIB=''
+     if ./helpers/TestCompile func db_create; then
+         DB_VERSION='Berkeley-DB/3.x'
+-    elif ./helpers/TestCompile lib db db_create; then
++    elif ./helpers/TestCompile lib dbXXX db_create; then
+         DB_VERSION='Berkeley-DB/3.x'
+         DB_LIB='-ldb'
+     elif ./helpers/TestCompile func db_open; then
+         DB_VERSION='Berkeley-DB/2.x'
+-    elif ./helpers/TestCompile lib db db_open; then
++    elif ./helpers/TestCompile lib dbXXX db_open; then
+         DB_VERSION='Berkeley-DB/2.x'
+         DB_LIB='-ldb'
+-    elif ./helpers/TestCompile lib db2 db_open; then
++    elif ./helpers/TestCompile lib db2XXX db_open; then
+         DB_VERSION='Berkeley-DB/2.x'
+         DB_LIB='-ldb2'
+     elif ./helpers/TestCompile func dbopen; then
+         DB_VERSION='Berkeley-DB/1.x'
+-    elif ./helpers/TestCompile lib db dbopen; then
++    elif ./helpers/TestCompile lib dbXXX dbopen; then
+         DB_VERSION='Berkeley-DB/1.x'
+         DB_LIB='-ldb'
+-    elif ./helpers/TestCompile lib db1 dbopen; then
++    elif ./helpers/TestCompile lib db1XXX dbopen; then
+         DB_VERSION='Berkeley-DB/1.x'
+         DB_LIB='-ldb1'
+     elif TCADDINCL='#include <db.h>' INCLUDES1="$INCLUDES1 -I/usr/include/db1" TLIB="-ldb1" \
diff --git a/www/apache13-ssl/files/patch-src::support::dbmanage b/www/apache13-ssl/files/patch-src::support::dbmanage
new file mode 100644
index 000000000000..d92d2f447613
--- /dev/null
+++ b/www/apache13-ssl/files/patch-src::support::dbmanage
@@ -0,0 +1,11 @@
+--- src/support/dbmmanage.bak	Thu Mar 14 00:05:37 2002
++++ src/support/dbmmanage	Mon Jun  2 23:05:27 2003
+@@ -338,6 +338,8 @@
+     } elsif (substr($chkpass, 0, 5) eq '{SHA}') {
+         need_sha1_crypt;
+         $crypt_method = "sha1";
++    } elsif (substr($chkpass, 0, 3) eq '$1$') {
++	$crypt_method = "crypt";
+     } elsif (length($chkpass) == 13 && $chkpass ne $testpass) {
+         $crypt_method = "crypt";
+     } else {
diff --git a/www/apache13-ssl/files/patch-src::support::log_server_status b/www/apache13-ssl/files/patch-src::support::log_server_status
new file mode 100644
index 000000000000..bd792616581e
--- /dev/null
+++ b/www/apache13-ssl/files/patch-src::support::log_server_status
@@ -0,0 +1,24 @@
+--- src/support/log_server_status.orig	Mon Jan 15 20:06:38 2001
++++ src/support/log_server_status	Fri Jan 25 08:03:03 2002
+@@ -70,10 +70,10 @@
+ #
+ require 'sys/socket.ph';
+ 
+-$wherelog = "/var/log/graph/";  # Logs will be like "/var/log/graph/19960312"
++$wherelog = "/var/log/httpd-status-";
+ $server = "localhost";          # Name of server, could be "www.foo.com"
+ $port = "80";                   # Port on server
+-$request = "/status/?auto";     # Request to send
++$request = "/server-status/?auto";     # Request to send
+ 
+ sub tcp_connect
+ {
+@@ -103,7 +103,7 @@
+ 	chomp($date);
+ 	($day,$time)=split(/:/,$date);
+ 	$res=&tcp_connect($server,$port);
+-	open(OUT,">>$wherelog$day");
++	open(OUT,">>$wherelog$day.log");
+ 	if ($res) {
+ 		print OUT "$time:-1:-1:-1:-1:$res\n";
+ 		exit 1;
diff --git a/www/apache13-ssl/files/post-patch-conf:httpd.conf-dist.orig b/www/apache13-ssl/files/post-patch-conf:httpd.conf-dist.orig
new file mode 100644
index 000000000000..864075e30d2d
--- /dev/null
+++ b/www/apache13-ssl/files/post-patch-conf:httpd.conf-dist.orig
@@ -0,0 +1,13 @@
+--- conf/httpd.conf-dist.orig	Wed Oct 22 23:09:02 2003
++++ conf/httpd.conf-dist	Wed Oct 22 23:09:14 2003
+@@ -945,8 +945,8 @@
+ # Note that all SSL options can apply to virtual hosts.
+ # Disable SSL. Useful in combination with virtual hosts. Note that SSLEnable is
+ # now also supported.
+-#SSLDisable
+-SSLEnable
++SSLDisable
++#SSLEnable
+ 
+ # Set the path for the global cache server executable.
+ # If this facility gives you trouble, you can disable it by setting