upgrade to 1.3.6

5 files changed, 92 insertions, 102 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 0b33a183b142..c1fe6e66eeb4 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -3,11 +3,11 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 ache@nagual.pp.ru
 #
-# $Id: Makefile,v 1.68 1999/03/13 17:11:02 billf Exp $
+# $Id: Makefile,v 1.69 1999/03/13 17:57:44 billf Exp $
 #
 
-DISTNAME=       apache_1.3.4
-PKGNAME=        apache-1.3.4
+DISTNAME=       apache_1.3.6
+PKGNAME=        apache-1.3.6
 CATEGORIES=	www
 MASTER_SITES=   http://www.apache.org/dist/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -64,8 +64,8 @@ CFLAGS+= -O6 -fomit-frame-pointer
 
 CONFIGURE_ENV= OPTIM='${OPTIM}'
 
-MAN1=   ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1
-MAN8=   apxs.8 httpd.8 logresolve.8 rotatelogs.8
+MAN1= dbmmanage.1 htdigest.1 htpasswd.1
+MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index 1ec9f3e89a85..ddcb734d3180 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1 +1 @@
-MD5 (apache_1.3.4.tar.gz) = eab1d93bc17e7d9fcf87dc9fa744a9d3
+MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
diff --git a/www/apache22/files/patch-ab b/www/apache22/files/patch-ab
index 0639f2c81376..8e8b8a45919c 100644
--- a/www/apache22/files/patch-ab
+++ b/www/apache22/files/patch-ab
@@ -1,6 +1,14 @@
---- Makefile.tmpl.orig	Thu Jan  7 14:50:45 1999
-+++ Makefile.tmpl	Fri Jan 15 02:39:17 1999
-@@ -110,6 +110,7 @@
+--- Makefile.tmpl.orig	Tue Mar 16 03:38:46 1999
++++ Makefile.tmpl	Thu Mar 25 23:53:46 1999
+@@ -113,13 +113,14 @@
+ sysconfdir      = @sysconfdir@
+ datadir         = @datadir@
+ iconsdir        = $(datadir)/icons
+-htdocsdir       = $(datadir)/htdocs
++htdocsdir       = $(datadir)/data
+ cgidir          = $(datadir)/cgi-bin
+ includedir      = @includedir@
+ localstatedir   = @localstatedir@
  runtimedir      = @runtimedir@
  logfiledir      = @logfiledir@
  proxycachedir   = @proxycachedir@
@@ -8,76 +16,67 @@
  
  libexecdir_relative   = @libexecdir_relative@
  
-@@ -239,9 +240,9 @@
+@@ -249,9 +250,9 @@
  	$(MKDIR) $(root)$(mandir)/man1
  	$(MKDIR) $(root)$(mandir)/man8
  	$(MKDIR) $(root)$(sysconfdir)
--	$(MKDIR) $(root)$(datadir)/htdocs
+-	$(MKDIR) $(root)$(htdocsdir)
 +	$(MKDIR) $(root)$(doc_prefix)
- 	$(MKDIR) $(root)$(datadir)/icons
--	$(MKDIR) $(root)$(datadir)/cgi-bin
-+	$(MKDIR) $(root)$(datadir)/cgi-bin.default
+ 	$(MKDIR) $(root)$(iconsdir)
+-	$(MKDIR) $(root)$(cgidir)
++	$(MKDIR) $(root)$(cgidir).default
  	$(MKDIR) $(root)$(includedir)
  	$(MKDIR) $(root)$(runtimedir)
  	$(MKDIR) $(root)$(logfiledir)
-@@ -363,25 +364,33 @@
+@@ -379,26 +380,34 @@
  #   icons and distributed CGI scripts.
  install-data:
  	@echo "===> [data: Installing initial data files]"
--	-@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
--		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
+-	-@if [ -f $(root)$(htdocsdir)/index.html ]; then \
+-		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
 -	else \
--		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \
-+#        -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
-+#                echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
-+#        else \
+-		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
++#       -@if [ -f $(root)$(htdocsdir)/index.html ]; then \
++#               echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
++#       else \
 +		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \
- 		(cd $(TOP)/htdocs/ && $(TAR) -hcf - *) |\
--		(cd $(root)$(datadir)/htdocs/ && $(TAR) -xf -); \
--		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/]"; \
--	else \
-+		(cd $(root)$(doc_prefix)/ && $(TAR) xf -); \
+ 		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\
+-		(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
+-		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
+-		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
++		(cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \
 +		find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
-+		find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ;
-+#        fi
-+	 if [ ! -d $(root)$(datadir)/data ]; then \
-+		$(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data; \
-+	 fi
-+	 $(RM) $(root)$(datadir)/data.default
-+	 $(LN) -s $(root)$(doc_prefix) $(root)$(datadir)/data.default
-+#        -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
-+#                echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
-+#        else \
++		find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \
++#       fi
++	if [ ! -d $(root)$(htdocsdir) ]; then \
++	       $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \
+ 	fi
+-	-@if [ -f $(root)$(cgidir)/printenv ]; then \
+-		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
+-	else \
++	$(RM) $(root)$(htdocsdir).default
++	$(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default
++#       -@if [ -f $(root)$(cgidir)/printenv ]; 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; \
-+			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin.default/$${script}"; \
-+			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin.default/$${script}; \
-+		done;
-+#        fi
-+	if [ ! -d $(root)$(datadir)/cgi-bin ]; then \
-+		$(LN) -sf $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \
- 	fi
- 	@echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
- 	(cd $(TOP)/icons/ && $(TAR) -hcf - *) |\
-@@ -411,7 +420,7 @@
- 		 echo ""; \
- 		 cat $(TOP)/conf/$${conf}-dist ) |\
- 		 sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
--			-e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
-+			-e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
- 			-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
- 			-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
- 			-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
-@@ -419,10 +428,10 @@
+-			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
+-			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
++			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \
++			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \
+ 		done; \
+-	fi
++#       fi
++	if [ ! -d $(root)$(cgidir) ]; then \
++		$(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \
++  	fi
+ 	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
+ 	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
+ 	(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
+@@ -436,10 +445,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;' \
diff --git a/www/apache22/files/patch-ak b/www/apache22/files/patch-ak
index 7cda58a4604b..09c3852d49fa 100644
--- a/www/apache22/files/patch-ak
+++ b/www/apache22/files/patch-ak
@@ -1,40 +1,28 @@
-*** src/support/apachectl.orig	Fri Jul 17 01:25:54 1998
---- src/support/apachectl	Fri Jul 24 00:34:59 1998
-***************
-*** 39,44 ****
---- 39,46 ----
-  # --------------------                              --------------------
-  # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
-  
-+ eval `limits -e -C daemon` >/dev/null 2>&1
-+ 
-  ERROR=0
-  ARGV="$@"
-  if [ "x$ARGV" = "x" ] ; then 
-***************
-*** 50,56 ****
-      # check for pidfile
-      if [ -f $PIDFILE ] ; then
-  	PID=`cat $PIDFILE`
-! 	if kill -0 $PID; then
-  	    STATUS="httpd (pid $PID) running"
-  	    RUNNING=1
-  	else
---- 52,58 ----
-      # check for pidfile
-      if [ -f $PIDFILE ] ; then
-  	PID=`cat $PIDFILE`
-! 	if kill -0 $PID > /dev/null 2>&1; then
-  	    STATUS="httpd (pid $PID) running"
-  	    RUNNING=1
-  	else
-***************
-*** 82,87 ****
---- 84,90 ----
-  	fi
-  	if kill $PID ; then
-  	    echo "$0 $ARG: httpd stopped"
-+ 	    rm $PIDFILE
-  	else
-  	    echo "$0 $ARG: httpd could not be stopped"
-  	    ERROR=4
+--- src/support/apachectl.orig	Tue Feb  9 21:00:34 1999
++++ src/support/apachectl	Fri Mar 26 00:08:20 1999
+@@ -39,6 +39,8 @@
+ # --------------------                              --------------------
+ # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
+ 
++eval `limits -e -C daemon` >/dev/null 2>&1
++
+ ERROR=0
+ ARGV="$@"
+ if [ "x$ARGV" = "x" ] ; then 
+@@ -50,7 +52,7 @@
+     # check for pidfile
+     if [ -f $PIDFILE ] ; then
+ 	PID=`cat $PIDFILE`
+-	if [ ! "x$PID" = "x" ] && kill -0 $PID; then
++	if [ ! "x$PID" = "x" ] && kill -0 $PID > /dev/null 2>&1; then
+ 	    STATUS="httpd (pid $PID) running"
+ 	    RUNNING=1
+ 	else
+@@ -82,6 +84,7 @@
+ 	fi
+ 	if kill $PID ; then
+ 	    echo "$0 $ARG: httpd stopped"
++	    rm $PIDFILE
+ 	else
+ 	    echo "$0 $ARG: httpd could not be stopped"
+ 	    ERROR=4
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index 5e978c82e3c5..1ff28c37a3c8 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -167,6 +167,7 @@ share/doc/apache/manual/new_features_1_2.html
 share/doc/apache/manual/new_features_1_3.html
 share/doc/apache/manual/process-model.html
 share/doc/apache/manual/readme-tpf.html
+share/doc/apache/manual/search/manual-index.cgi
 share/doc/apache/manual/sections.html
 share/doc/apache/manual/sourcereorg.html
 share/doc/apache/manual/stopping.html
@@ -183,6 +184,7 @@ share/doc/apache/manual/vhosts/header.html
 share/doc/apache/manual/vhosts/host.html
 share/doc/apache/manual/vhosts/index.html
 share/doc/apache/manual/vhosts/ip-based.html
+share/doc/apache/manual/vhosts/mass.html
 share/doc/apache/manual/vhosts/name-based.html
 share/doc/apache/manual/vhosts/vhosts-in-depth.html
 share/doc/apache/manual/vhosts/virtual-host.html
@@ -302,6 +304,7 @@ www/icons/world2.gif
 @dirrm share/doc/apache/manual/images
 @dirrm share/doc/apache/manual/misc
 @dirrm share/doc/apache/manual/mod
+@dirrm share/doc/apache/manual/search
 @dirrm share/doc/apache/manual/vhosts
 @dirrm share/doc/apache/manual
 @dirrm share/doc/apache