Upgrade to Apache 1.3.22 + mod_ssl 2.8.5

Submitted by: Masahiro TAKEMURA <mastake@msel.t.u-tokyo.ac.jp>

www/apache13-modssl/Makefile

@@ -48,8 +48,8 @@ USE_OPENSSL=	YES
 
 LIB_DEPENDS=	mm.11:${PORTSDIR}/devel/mm
 
-VERSION_APACHE=	1.3.20
-VERSION_MODSSL=	2.8.4
+VERSION_APACHE=	1.3.22
+VERSION_MODSSL=	2.8.5
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes

www/apache13-modssl/distinfo

@@ -1,2 +1,2 @@
-MD5 (apache_1.3.20.tar.gz) = d58d373b5f528a61a3490daec5e8f91f
-MD5 (mod_ssl-2.8.4-1.3.20.tar.gz) = ff1a548c2387f123a3df4436a1e884f9
+MD5 (apache_1.3.22.tar.gz) = 77d34c0ac49c3af2416b786228007f90
+MD5 (mod_ssl-2.8.5-1.3.22.tar.gz) = 5139c874e759b8410a29f9dcb4b578e5

www/apache13-modssl/files/FreeBSD.layout

@@ -10,6 +10,7 @@
     datadir:       $prefix/www
     iconsdir:      $datadir/icons
     htdocsdir:     $datadir/data
+    manualdir:     $prefix/share/doc/apache/manual
     cgidir:        $datadir/cgi-bin
     includedir:    $prefix/include/apache
     localstatedir: /var

www/apache13-modssl/files/patch-aa

@@ -1,6 +1,6 @@
---- configure.orig	Sat Jan 22 21:55:19 2000
-+++ configure	Sat Jan 22 21:59:01 2000
-@@ -1198,7 +1198,7 @@
+--- configure.orig	Mon Oct 22 20:44:08 2001
++++ configure	Mon Oct 22 20:44:42 2001
+@@ -1216,7 +1216,7 @@
      conf_user="nobody"
  fi
  if [ "x$conf_group" = "x" ]; then
@@ -9,7 +9,7 @@
  fi
  
  ##
-@@ -1232,8 +1232,8 @@
+@@ -1263,8 +1263,8 @@
      echo "       DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
      echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
      echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
@@ -20,7 +20,7 @@
      echo "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
      echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
      echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
-@@ -1330,8 +1330,8 @@
+@@ -1365,8 +1365,8 @@
  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

www/apache13-modssl/files/patch-ac

@@ -1,7 +1,7 @@
---- conf/httpd.conf-dist.orig	Wed Mar 24 10:30:16 1999
-+++ conf/httpd.conf-dist	Wed Mar 24 10:33:06 1999
-@@ -94,8 +94,8 @@
- # these files altogether by using "/dev/null" (for Unix) or
+--- conf/httpd.conf-dist.orig	Thu Oct 18 13:57:36 2001
++++ conf/httpd.conf-dist	Thu Oct 18 13:58:20 2001
+@@ -92,8 +92,8 @@
+ # server ignore these files altogether by using "/dev/null" (for Unix) or
  # "nul" (for Win32) for the arguments to the directives.
  #
 -#ResourceConfig conf/srm.conf
@@ -11,16 +11,16 @@
  
  #
  # Timeout: The number of seconds before receives and sends time out.
-@@ -251,7 +251,7 @@
- #  don't use Group #-1 on these systems!
+@@ -255,7 +255,7 @@
+ #  don't use Group "#-1" on these systems!
  #
  User nobody
--Group #-1
+-Group "#-1"
 +Group nobody
  
  #
  # ServerAdmin: Your address, where problems with the server should be
-@@ -354,7 +354,22 @@
+@@ -367,7 +367,22 @@
  # directory index.  Separate multiple entries with spaces.
  #
  <IfModule mod_dir.c>
@@ -44,7 +44,7 @@
  </IfModule>
  
  #
-@@ -469,7 +469,7 @@
+@@ -487,7 +502,7 @@
  # define per-<VirtualHost> access logfiles, transactions will be
  # logged therein and *not* in this file.
  #
@@ -53,7 +53,7 @@
  
  #
  # If you would like to have agent and referer logfiles, uncomment the
-@@ -482,7 +482,7 @@
+@@ -500,7 +515,7 @@
  # If you prefer a single logfile with access, agent, and referer information
  # (Combined Logfile Format) you can use the following directive.
  #
@@ -62,7 +62,7 @@
  
  #
  # Optionally add a line containing the server version and virtual host
-@@ -708,13 +723,17 @@
+@@ -779,13 +794,17 @@
      # For example, the PHP 3.x module (not part of the Apache distribution - see
      # http://www.php.net) will typically use:
      #

www/apache13-modssl/files/patch-ae

@@ -1,6 +1,6 @@
---- src/support/log_server_status.orig	Fri Jun  4 17:54:19 1999
-+++ src/support/log_server_status	Thu Aug 19 16:30:48 1999
-@@ -67,7 +67,7 @@
+--- src/support/log_server_status.orig	Tue Jan 16 02:06:38 2001
++++ src/support/log_server_status	Mon Oct 22 20:44:59 2001
+@@ -70,7 +70,7 @@
  #
  require 'sys/socket.ph';
  
@@ -9,7 +9,7 @@
  $server = "localhost";          # Name of server, could be "www.foo.com"
  $port = "80";                   # Port on server
  $request = "/status/?auto";     # Request to send
-@@ -93,14 +93,14 @@
+@@ -96,14 +96,14 @@
  ### Main
  
  {

www/apache13-modssl/files/patch-ah

@@ -1,6 +1,6 @@
---- src/modules/ssl/Makefile.tmpl.orig	Thu Dec 30 15:58:07 1999
-+++ src/modules/ssl/Makefile.tmpl	Wed Feb  9 11:43:49 2000
-@@ -122,6 +122,11 @@
+--- src/modules/ssl/Makefile.tmpl.orig	Mon Jan  1 19:48:52 2001
++++ src/modules/ssl/Makefile.tmpl	Mon Oct 22 20:45:05 2001
+@@ -128,6 +128,11 @@
  ##  END-USER AREA
  ##
  
@@ -12,7 +12,7 @@
  all: lib
  
  lib: $(LIB)
-@@ -138,10 +143,10 @@
+@@ -144,10 +149,10 @@
  .SUFFIXES: .o .lo
  
  .c.o:
@@ -25,7 +25,7 @@
  
  clean:
  	rm -f $(OBJS) $(OBJS_PIC) 
-@@ -186,7 +191,7 @@
+@@ -201,7 +206,7 @@
  depend:
  	cp Makefile.tmpl Makefile.tmpl.bak \
  	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \

www/apache13-modssl/files/patch-ai

@@ -1,18 +1,29 @@
---- Makefile.tmpl.orig	Thu Oct 19 11:30:46 2000
-+++ Makefile.tmpl	Thu Oct 19 11:43:48 2000
-@@ -125,2 +125,3 @@
+--- Makefile.tmpl.orig	Thu Oct 18 14:14:44 2001
++++ Makefile.tmpl	Thu Oct 18 14:18:07 2001
+@@ -127,6 +127,7 @@
+ runtimedir      = @runtimedir@
+ logfiledir      = @logfiledir@
  proxycachedir   = @proxycachedir@
 +doc_prefix	= $(prefix)/share/doc/apache
  
-@@ -327,5 +328,5 @@
+ libexecdir_relative   = @libexecdir_relative@
+ 
+@@ -329,10 +330,10 @@
+ 	$(MKDIR) $(root)$(sysconfdir)/ssl.csr
+ 	$(MKDIR) $(root)$(sysconfdir)/ssl.key
  	$(MKDIR) $(root)$(sysconfdir)/ssl.prm
 -	$(MKDIR) $(root)$(htdocsdir)
 +	$(MKDIR) $(root)$(doc_prefix)
+ 	$(MKDIR) $(root)$(manualdir)
  	$(MKDIR) $(root)$(iconsdir)
 -	$(MKDIR) $(root)$(cgidir)
 +	$(MKDIR) $(root)$(cgidir).default
  	$(MKDIR) $(root)$(includedir)
-@@ -528,14 +529,18 @@
+ 	$(MKDIR) $(root)$(includedir)/xml
+ 	$(MKDIR) $(root)$(runtimedir)
+@@ -531,14 +532,17 @@
+ #   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)/]"; \
@@ -21,27 +32,32 @@
 +#		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
 +#	else \
  		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
- 		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\
+ 		(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 -exec chmod a+r {} \; ; \
--	fi
--	-@if [ -f $(root)$(cgidir)/printenv ]; then \
--		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
--	else \
+-		find $(root)$(htdocsdir)/ -type f -print | xargs 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 {} \; ; \
++		find $(root)$(doc_prefix)/ -type f -print | xargs chmod a+r ; \
 +#	fi
 +	if [ ! -d $(root)$(htdocsdir) ]; then \
 +		$(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \
-+	fi
-+	$(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default
+ 	fi
+ 	-@if [ -d $(TOP)/htdocs/manual ]; then \
+ 		echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
+@@ -547,16 +551,19 @@
+ 		find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
+ 		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
+ 	fi
+-	-@if [ -f $(root)$(cgidir)/printenv ]; then \
+-		echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
+-	else \
 +#	-@if [ -f $(root)$(cgidir)/printenv ]; then \
-+#		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
++#		echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
 +#	else \
  		for script in printenv test-cgi; do \
-@@ -544,5 +549,8 @@
+ 			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}; \
@@ -52,7 +68,11 @@
 +	if [ ! -d $(root)$(cgidir) ]; then \
 +		$(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \
  	fi
-@@ -594,6 +602,6 @@
+ 	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
+ 	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
+@@ -605,10 +612,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;" \
@@ -63,3 +83,5 @@
 +			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \
 +			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \
  			-e 's;conf/magic;$(sysconfdir)/magic;' \
+ 			-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
+ 			-e 's;User nobody;User $(conf_user);' \

www/apache13-modssl/pkg-plist

@@ -127,7 +127,6 @@ sbin/apxs
 sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
-share/doc/apache/README.rus
 @exec mkdir -p %D/www
 @exec ln -fs %B %D/www/data.default
 @unexec rm -f %D/www/data.default
@@ -148,6 +147,7 @@ share/doc/apache/index.html.ja.jis
 share/doc/apache/index.html.kr.iso-kr
 share/doc/apache/index.html.lu
 share/doc/apache/index.html.nl
+share/doc/apache/index.html.nn
 share/doc/apache/index.html.no
 share/doc/apache/index.html.po.iso-pl
 share/doc/apache/index.html.pt
@@ -163,18 +163,27 @@ share/doc/apache/index.html.se
 share/doc/apache/index.html.zh.Big5
 share/doc/apache/index.html.el
 share/doc/apache/manual/LICENSE
-share/doc/apache/manual/bind.html
-share/doc/apache/manual/cgi_path.html
+share/doc/apache/manual/bind.html.en
+share/doc/apache/manual/bind.html.fr
+share/doc/apache/manual/bind.html.html
+share/doc/apache/manual/cgi_path.html.en
+share/doc/apache/manual/cgi_path.html.fr
+share/doc/apache/manual/cgi_path.html.html
 share/doc/apache/manual/configuring.html.fr
 share/doc/apache/manual/configuring.html.en
 share/doc/apache/manual/configuring.html.ja.jis
 share/doc/apache/manual/content-negotiation.html
 share/doc/apache/manual/custom-error.html.en
 share/doc/apache/manual/custom-error.html.ja.jis
-share/doc/apache/manual/dns-caveats.html
+share/doc/apache/manual/cygwin.html
+share/doc/apache/manual/dns-caveats.html.en
+share/doc/apache/manual/dns-caveats.html.fr
+share/doc/apache/manual/dns-caveats.html.html
 share/doc/apache/manual/dso.html
 share/doc/apache/manual/ebcdic.html
-share/doc/apache/manual/env.html
+share/doc/apache/manual/env.html.en
+share/doc/apache/manual/env.html.html
+share/doc/apache/manual/env.html.ja.jis
 share/doc/apache/manual/footer.html
 share/doc/apache/manual/handler.html.en
 share/doc/apache/manual/handler.html.ja.jis
@@ -203,10 +212,13 @@ share/doc/apache/manual/install-tpf.html
 share/doc/apache/manual/install.html.es
 share/doc/apache/manual/install.html.en
 share/doc/apache/manual/install.html.ja.jis
-share/doc/apache/manual/invoking.html
+share/doc/apache/manual/invoking.html.en
 share/doc/apache/manual/invoking.html.html
-share/doc/apache/manual/keepalive.html
+share/doc/apache/manual/keepalive.html.en
+share/doc/apache/manual/keepalive.html.html
+share/doc/apache/manual/keepalive.html.ja.jis
 share/doc/apache/manual/location.html
+share/doc/apache/manual/logs.html
 share/doc/apache/manual/man-template.html
 share/doc/apache/manual/misc/API.html
 share/doc/apache/manual/misc/FAQ.html
@@ -232,16 +244,26 @@ share/doc/apache/manual/misc/security_tips.html
 share/doc/apache/manual/misc/tutorials.html
 share/doc/apache/manual/misc/vif-info.html
 share/doc/apache/manual/misc/windoz_keepalive.html
-share/doc/apache/manual/mod/core.html
+share/doc/apache/manual/mod/core.html.en
+share/doc/apache/manual/mod/core.html.fr
+share/doc/apache/manual/mod/core.html.html
 share/doc/apache/manual/mod/directive-dict.html.en
+share/doc/apache/manual/mod/directive-dict.html.fr
 share/doc/apache/manual/mod/directive-dict.html.ja.jis
-share/doc/apache/manual/mod/directives.html
+share/doc/apache/manual/mod/directives.html.de
+share/doc/apache/manual/mod/directives.html.en
+share/doc/apache/manual/mod/directives.html.fr
+share/doc/apache/manual/mod/directives.html.html
+share/doc/apache/manual/mod/directives.html.ja.jis
 share/doc/apache/manual/mod/footer.html
 share/doc/apache/manual/mod/header.html
-share/doc/apache/manual/mod/index-bytype.html
+share/doc/apache/manual/mod/index-bytype.html.en
 share/doc/apache/manual/mod/index-bytype.html.fr
-share/doc/apache/manual/mod/index.html
+share/doc/apache/manual/mod/index-bytype.html.html
+share/doc/apache/manual/mod/index.html.en
 share/doc/apache/manual/mod/index.html.fr
+share/doc/apache/manual/mod/index.html.html
+share/doc/apache/manual/mod/index.html.ja.jis
 share/doc/apache/manual/mod/mod_access.html
 share/doc/apache/manual/mod/mod_actions.html
 share/doc/apache/manual/mod/mod_alias.html
@@ -381,7 +403,7 @@ share/doc/apache/manual/server-wide.html.en
 share/doc/apache/manual/server-wide.html.ja.jis
 share/doc/apache/manual/sections.html
 share/doc/apache/manual/sourcereorg.html
-share/doc/apache/manual/stopping.html
+share/doc/apache/manual/stopping.html.en
 share/doc/apache/manual/stopping.html.fr
 share/doc/apache/manual/stopping.html.html
 share/doc/apache/manual/suexec.html.en
@@ -401,16 +423,21 @@ share/doc/apache/manual/vhosts/index.html.en
 share/doc/apache/manual/vhosts/index.html.ja.jis
 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/name-based.html.en
+share/doc/apache/manual/vhosts/name-based.html.html
+share/doc/apache/manual/vhosts/name-based.html.ja.jis
 share/doc/apache/manual/vhosts/vhosts-in-depth.html
 share/doc/apache/manual/vhosts/virtual-host.html
 share/doc/apache/manual/win_compiling.html
-share/doc/apache/manual/win_service.html
+share/doc/apache/manual/win_service.html.en
+share/doc/apache/manual/win_service.html.html
+share/doc/apache/manual/win_service.html.ja.jis
 share/doc/apache/manual/windows.html
 share/doc/apache/manual/mod/directive-dict.html.html
 share/doc/apache/manual/mod/mod_negotiation.html.html
 share/doc/apache/manual/mod/module-dict.html.html
 share/doc/apache/manual/configuring.html.html
+share/doc/apache/manual/custom-error.html.fr
 share/doc/apache/manual/custom-error.html.html
 share/doc/apache/manual/handler.html.html
 share/doc/apache/manual/index.html.fr
@@ -538,6 +565,113 @@ www/icons/uu.gif
 www/icons/uuencoded.gif
 www/icons/world1.gif
 www/icons/world2.gif
+www/icons/a.png
+www/icons/alert.black.png
+www/icons/alert.red.png
+www/icons/apache_pb.png
+www/icons/back.png
+www/icons/ball.gray.png
+www/icons/ball.red.png
+www/icons/binary.png
+www/icons/binhex.png
+www/icons/blank.png
+www/icons/bomb.png
+www/icons/box1.png
+www/icons/box2.png
+www/icons/broken.png
+www/icons/burst.png
+www/icons/c.png
+www/icons/comp.blue.png
+www/icons/comp.gray.png
+www/icons/compressed.png
+www/icons/continued.png
+www/icons/dir.png
+www/icons/down.png
+www/icons/dvi.png
+www/icons/f.png
+www/icons/folder.png
+www/icons/folder.open.png
+www/icons/folder.sec.png
+www/icons/forward.png
+www/icons/generic.png
+www/icons/generic.red.png
+www/icons/generic.sec.png
+www/icons/hand.right.png
+www/icons/hand.up.png
+www/icons/icon.sheet.png
+www/icons/image1.png
+www/icons/image2.png
+www/icons/image3.png
+www/icons/index.png
+www/icons/layout.png
+www/icons/left.png
+www/icons/link.png
+www/icons/movie.png
+www/icons/p.png
+www/icons/patch.png
+www/icons/pdf.png
+www/icons/pie0.png
+www/icons/pie1.png
+www/icons/pie2.png
+www/icons/pie3.png
+www/icons/pie4.png
+www/icons/pie5.png
+www/icons/pie6.png
+www/icons/pie7.png
+www/icons/pie8.png
+www/icons/portal.png
+www/icons/ps.png
+www/icons/quill.png
+www/icons/right.png
+www/icons/screw1.png
+www/icons/screw2.png
+www/icons/script.png
+www/icons/small/back.png
+www/icons/small/binary.png
+www/icons/small/binhex.png
+www/icons/small/blank.png
+www/icons/small/broken.png
+www/icons/small/burst.png
+www/icons/small/comp1.png
+www/icons/small/comp2.png
+www/icons/small/compressed.png
+www/icons/small/continued.png
+www/icons/small/dir.png
+www/icons/small/dir2.png
+www/icons/small/doc.png
+www/icons/small/forward.png
+www/icons/small/generic.png
+www/icons/small/generic2.png
+www/icons/small/generic3.png
+www/icons/small/image.png
+www/icons/small/image2.png
+www/icons/small/index.png
+www/icons/small/key.png
+www/icons/small/movie.png
+www/icons/small/patch.png
+www/icons/small/ps.png
+www/icons/small/rainbow.png
+www/icons/small/sound.png
+www/icons/small/sound2.png
+www/icons/small/tar.png
+www/icons/small/text.png
+www/icons/small/transfer.png
+www/icons/small/unknown.png
+www/icons/small/uu.png
+www/icons/sound1.png
+www/icons/sound2.png
+www/icons/sphere1.png
+www/icons/sphere2.png
+www/icons/tar.png
+www/icons/tex.png
+www/icons/text.png
+www/icons/transfer.png
+www/icons/unknown.png
+www/icons/up.png
+www/icons/uu.png
+www/icons/uuencoded.png
+www/icons/world1.png
+www/icons/world2.png
 @exec mkdir -p %D/www/proxy
 @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
 @unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi