Upgrade to 1.3b6, now with loadable modules!

4 files changed, 173 insertions, 116 deletions

diff --git a/www/apache20/files/patch-ab b/www/apache20/files/patch-ab
new file mode 100644
index 000000000000..b0f108c37db2
--- /dev/null
+++ b/www/apache20/files/patch-ab
@@ -0,0 +1,133 @@
+*** Makefile.tmpl.orig	Tue Apr 14 23:17:36 1998
+--- Makefile.tmpl	Tue Apr 21 23:48:17 1998
+***************
+*** 207,218 ****
+  	$(MKDIR) $(mandir)/man1
+  	$(MKDIR) $(mandir)/man8
+  	$(MKDIR) $(sysconfdir)
+! 	$(MKDIR) $(datadir)/htdocs
+  	$(MKDIR) $(datadir)/icons
+! 	$(MKDIR) $(datadir)/cgi-bin
+  	$(MKDIR) $(localstatedir)/$(localstatesubdir_logs)
+  	$(MKDIR) $(localstatedir)/$(localstatesubdir_run)
+! 	$(MKDIR) $(localstatedir)/proxy
+  	$(MKDIR) $(includedir)
+  	@echo "<=== [mktree]"
+  
+--- 207,218 ----
+  	$(MKDIR) $(mandir)/man1
+  	$(MKDIR) $(mandir)/man8
+  	$(MKDIR) $(sysconfdir)
+! 	$(MKDIR) $(datadir)/data.default
+  	$(MKDIR) $(datadir)/icons
+! 	$(MKDIR) $(datadir)/cgi-bin.default
+  	$(MKDIR) $(localstatedir)/$(localstatesubdir_logs)
+  	$(MKDIR) $(localstatedir)/$(localstatesubdir_run)
+! 	$(MKDIR) $(datadir)/proxy
+  	$(MKDIR) $(includedir)
+  	@echo "<=== [mktree]"
+  
+***************
+*** 311,327 ****
+  install-docroot:
+  	@echo "===> [docroot: Installing initial DocumentRoot files]"
+  	-(cd $(ROOT)/htdocs/ && $(TAR) cf - *) |\
+! 	 (cd $(datadir)/htdocs/ && $(TAR) xf -)
+! 	-find $(datadir)/htdocs/ -type d -exec chmod a+rx {} \;
+! 	-find $(datadir)/htdocs/ -type f -exec chmod a+r {} \;
+  	-(cd $(ROOT)/icons/ && $(TAR) cf - *) |\
+  	 (cd $(datadir)/icons/ && $(TAR) xf -)
+  	-find $(datadir)/icons/ -type d -exec chmod a+rx {} \;
+  	-find $(datadir)/icons/ -type f -exec chmod a+r {} \;
+  	-(cd $(ROOT)/cgi-bin/ && $(TAR) cf - *) |\
+! 	 (cd $(datadir)/cgi-bin/ && $(TAR) xf -)
+! 	-find $(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \;
+! 	-find $(datadir)/cgi-bin/ -type f -exec chmod a+r {} \;
+  	@echo "<=== [docroot]"
+  
+  #   create the initial configuration by providing default files
+--- 311,333 ----
+  install-docroot:
+  	@echo "===> [docroot: Installing initial DocumentRoot files]"
+  	-(cd $(ROOT)/htdocs/ && $(TAR) cf - *) |\
+! 	 (cd $(datadir)/data.default/ && $(TAR) xf -)
+! 	-find $(datadir)/data.default/ -type d -exec chmod a+rx {} \;
+! 	-find $(datadir)/data.default/ -type f -exec chmod a+r {} \;
+! 	if [ ! -d $(datadir)/data ]; then \
+! 		$(CP) -Rp $(datadir)/data.default $(datadir)/data; \
+! 	fi
+  	-(cd $(ROOT)/icons/ && $(TAR) cf - *) |\
+  	 (cd $(datadir)/icons/ && $(TAR) xf -)
+  	-find $(datadir)/icons/ -type d -exec chmod a+rx {} \;
+  	-find $(datadir)/icons/ -type f -exec chmod a+r {} \;
+  	-(cd $(ROOT)/cgi-bin/ && $(TAR) cf - *) |\
+! 	 (cd $(datadir)/cgi-bin.default/ && $(TAR) xf -)
+! 	-find $(datadir)/cgi-bin.default/ -type d -exec chmod a+rx {} \;
+! 	-find $(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \;
+! 	if [ ! -d $(datadir)/cgi-bin ]; then \
+! 		$(CP) -Rp $(datadir)/cgi-bin.default $(datadir)/cgi-bin; \
+! 	fi
+  	@echo "<=== [docroot]"
+  
+  #   create the initial configuration by providing default files
+***************
+*** 335,351 ****
+  		 echo ""; \
+  		 cat $(ROOT)/conf/$$conf-dist ) |\
+      	sed -e '/# LoadModule/r .install.conf' \
+!     	    -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
+!     	    -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
+          	-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
+          	-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
+!         	-e 's;@@ServerRoot@@/proxy;$(localstatedir)/proxy;' \
+          	-e 's;@@ServerRoot@@;$(prefix);' \
+          	-e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \
+          	-e 's;logs/apache_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \
+          	-e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
+!         	-e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/access_log;' \
+!         	-e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/error_log;' \
+          	>.install.tmp && \
+  		echo "$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default"; \
+  		$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \
+--- 341,356 ----
+  		 echo ""; \
+  		 cat $(ROOT)/conf/$$conf-dist ) |\
+      	sed -e '/# LoadModule/r .install.conf' \
+! 	    -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
+          	-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
+          	-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
+! 		-e 's;@@ServerRoot@@/proxy;$(datadir)/proxy;' \
+          	-e 's;@@ServerRoot@@;$(prefix);' \
+          	-e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \
+          	-e 's;logs/apache_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \
+          	-e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
+! 		-e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/httpd-access.log;' \
+! 		-e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/httpd-error.log;' \
+          	>.install.tmp && \
+  		echo "$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default"; \
+  		$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \
+***************
+*** 356,363 ****
+  			echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \
+  		fi; \
+  	done
+! 	$(CP) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types
+! 	$(CP) $(ROOT)/conf/magic $(sysconfdir)/magic
+  	@echo "<=== [config]"
+  
+  
+--- 361,374 ----
+  			echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \
+  		fi; \
+  	done
+! 	$(INSTALL_DATA) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types.default
+! 	if [ ! -f "$(sysconfdir)/mime.types" ]; then \
+! 		$(INSTALL_DATA) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types; \
+! 	fi
+! 	$(INSTALL_DATA) $(ROOT)/conf/magic $(sysconfdir)/magic.default
+! 	if [ ! -f "$(sysconfdir)/magic" ]; then \
+! 		$(INSTALL_DATA) $(ROOT)/conf/magic $(sysconfdir)/magic; \
+! 	fi
+  	@echo "<=== [config]"
+  
+  
diff --git a/www/apache20/files/patch-ag b/www/apache20/files/patch-ag
index 4abfaa985725..7f0c21c34f13 100644
--- a/www/apache20/files/patch-ag
+++ b/www/apache20/files/patch-ag
@@ -1,7 +1,7 @@
-*** conf/httpd.conf-dist.orig	Wed Feb  4 22:42:29 1998
---- conf/httpd.conf-dist	Fri Feb 20 13:36:27 1998
+*** conf/httpd.conf-dist.orig	Wed Apr  1 17:16:39 1998
+--- conf/httpd.conf-dist	Tue Apr 21 23:43:19 1998
 ***************
-*** 34,40 ****
+*** 42,48 ****
   #  suggested workaround is to create a user www and use that user.
   
   User nobody
@@ -9,7 +9,7 @@
   
   # ServerAdmin: Your address, where problems with the server should be
   # e-mailed.
---- 34,40 ----
+--- 42,48 ----
   #  suggested workaround is to create a user www and use that user.
   
   User nobody
@@ -18,106 +18,53 @@
   # ServerAdmin: Your address, where problems with the server should be
   # e-mailed.
 ***************
-*** 47,53 ****
-  # mounted filesystem then please read the LockFile documentation,
-  # you will save yourself a lot of trouble.
+*** 86,92 ****
+  # The location of the access logfile (Common Logfile Format).
+  # If this does not start with /, ServerRoot is prepended to it.
   
-! ServerRoot @@ServerRoot@@
+! CustomLog logs/access_log common
   
-  # BindAddress: You can support virtual hosts with this option. This option
-  # is used to tell the server which IP address to listen to. It can either
---- 47,53 ----
-  # mounted filesystem then please read the LockFile documentation,
-  # you will save yourself a lot of trouble.
+  # If you would like to have an agent and referer logfile uncomment the
+  # following directives.
+--- 86,92 ----
+  # The location of the access logfile (Common Logfile Format).
+  # If this does not start with /, ServerRoot is prepended to it.
   
-! ServerRoot /usr/local/etc/apache
+! #CustomLog logs/access_log common
   
-  # BindAddress: You can support virtual hosts with this option. This option
-  # is used to tell the server which IP address to listen to. It can either
+  # If you would like to have an agent and referer logfile uncomment the
+  # following directives.
 ***************
-*** 59,79 ****
-  # ErrorLog: The location of the error log file. If this does not start
-  # with /, ServerRoot is prepended to it.
+*** 97,103 ****
+  # If you prefer a single logfile with access, agent and referer information
+  # (Combined Logfile Format) you can use the following directive.
   
-! ErrorLog logs/error_log
+! #CustomLog logs/access_log combined
   
-  # TransferLog: The location of the transfer log file. If this does not
-  # start with /, ServerRoot is prepended to it.
+  # PidFile: The file the server should log its pid to
+  PidFile logs/httpd.pid
+--- 97,103 ----
+  # If you prefer a single logfile with access, agent and referer information
+  # (Combined Logfile Format) you can use the following directive.
   
-! TransferLog logs/access_log
+! CustomLog logs/access_log combined
   
   # PidFile: The file the server should log its pid to
-! PidFile logs/httpd.pid
-  
-  # ScoreBoardFile: File used to store internal server process information.
+  PidFile logs/httpd.pid
+***************
+*** 106,112 ****
   # Not all architectures require this.  But if yours does (you'll know because
   # this file is created when you run Apache) then you *must* ensure that
   # no two invocations of Apache share the same scoreboard file.
-! ScoreBoardFile logs/apache_status
+! ScoreBoardFile logs/apache_runtime_status
   
   # The LockFile directive sets the path to the lockfile used when Apache
   # is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
---- 59,81 ----
-  # ErrorLog: The location of the error log file. If this does not start
-  # with /, ServerRoot is prepended to it.
-  
-! ErrorLog /var/log/httpd-error.log
-  
-  # TransferLog: The location of the transfer log file. If this does not
-  # start with /, ServerRoot is prepended to it.
-  
-! TransferLog /var/log/httpd-access.log
-! 
-! #LogFormat "%h %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-Agent}i\""
-  
-  # PidFile: The file the server should log its pid to
-! PidFile /var/run/httpd.pid
-  
-  # ScoreBoardFile: File used to store internal server process information.
+--- 106,112 ----
   # Not all architectures require this.  But if yours does (you'll know because
   # this file is created when you run Apache) then you *must* ensure that
   # no two invocations of Apache share the same scoreboard file.
-! ScoreBoardFile /var/run/apache_runtime_status
+! #ScoreBoardFile logs/apache_runtime_status
   
   # The LockFile directive sets the path to the lockfile used when Apache
   # is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
-***************
-*** 172,178 ****
-  
-  # To enable the cache as well, edit and uncomment the following lines:
-  
-! #CacheRoot @@ServerRoot@@/proxy
-  #CacheSize 5
-  #CacheGcInterval 4
-  #CacheMaxExpire 24
---- 174,180 ----
-  
-  # To enable the cache as well, edit and uncomment the following lines:
-  
-! #CacheRoot /usr/local/etc/apache/proxy
-  #CacheSize 5
-  #CacheGcInterval 4
-  #CacheMaxExpire 24
-***************
-*** 196,205 ****
-   
-  #<VirtualHost host.some_domain.com>
-  #ServerAdmin webmaster@host.some_domain.com
-! #DocumentRoot /www/docs/host.some_domain.com
-  #ServerName host.some_domain.com
-! #ErrorLog logs/host.some_domain.com-error_log
-! #TransferLog logs/host.some_domain.com-access_log
-  #</VirtualHost>
-  
-  
---- 198,207 ----
-   
-  #<VirtualHost host.some_domain.com>
-  #ServerAdmin webmaster@host.some_domain.com
-! #DocumentRoot /usr/local/www/host.some_domain.com/data
-  #ServerName host.some_domain.com
-! #ErrorLog /var/log/host.some_domain.com-error_log
-! #TransferLog /var/log/host.some_domain.com-access_log
-  #</VirtualHost>
-  
-  
diff --git a/www/apache20/files/patch-ak b/www/apache20/files/patch-ak
index 6a053da102b7..a99c4343151c 100644
--- a/www/apache20/files/patch-ak
+++ b/www/apache20/files/patch-ak
@@ -1,28 +1,5 @@
-*** src/support/apachectl.orig	Sun Oct 26 02:35:19 1997
---- src/support/apachectl	Fri Nov 21 22:58:08 1997
-***************
-*** 21,30 ****
-  # --------------------                              --------------------
-  # 
-  # the path to your PID file
-! PIDFILE=/usr/local/apache/logs/httpd.pid
-  #
-  # the path to your httpd binary
-! HTTPD=/usr/local/apache/src/httpd
-  #
-  # a command that outputs a formatted text version of the HTML at the
-  # url given on the command line.  Designed for lynx, however other
---- 21,30 ----
-  # --------------------                              --------------------
-  # 
-  # the path to your PID file
-! PIDFILE=/var/run/httpd.pid
-  #
-  # the path to your httpd binary
-! HTTPD=/usr/local/sbin/httpd
-  #
-  # a command that outputs a formatted text version of the HTML at the
-  # url given on the command line.  Designed for lynx, however other
+*** src/support/apachectl.orig	Tue Mar 31 16:53:46 1998
+--- src/support/apachectl	Tue Apr 21 17:15:55 1998
 ***************
 *** 37,42 ****
 --- 37,44 ----
diff --git a/www/apache20/files/patch-al b/www/apache20/files/patch-al
index 893063557d83..039d6320f415 100644
--- a/www/apache20/files/patch-al
+++ b/www/apache20/files/patch-al
@@ -1,7 +1,7 @@
-*** src/support/log_server_status.orig	Thu Oct 23 00:30:46 1997
---- src/support/log_server_status	Fri Nov 21 23:05:50 1997
+*** src/support/log_server_status.orig	Tue Mar 31 16:53:50 1998
+--- src/support/log_server_status	Tue Apr 21 17:18:10 1998
 ***************
-*** 63,72 ****
+*** 67,76 ****
   #
   require 'sys/socket.ph';
   
@@ -12,7 +12,7 @@
   
   sub tcp_connect
   {
---- 63,72 ----
+--- 67,76 ----
   #
   require 'sys/socket.ph';
   
@@ -24,7 +24,7 @@
   sub tcp_connect
   {
 ***************
-*** 89,99 ****
+*** 93,103 ****
   ### Main
   
   {
@@ -36,7 +36,7 @@
   	if ($res) {
   		print OUT "$time:-1:-1:-1:-1:$res\n";
   		exit 1;
---- 89,99 ----
+--- 93,103 ----
   ### Main
   
   {