Upgrade to 1.3.26.

13 files changed, 175 insertions, 120 deletions

diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile
index d37d160..cabe6a4 100644
--- a/www/apache13+ipv6/Makefile
+++ b/www/apache13+ipv6/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	apache+ipv6
-PORTVERSION=	1.3.22
+PORTVERSION=	1.3.26
 CATEGORIES=	www ipv6
-PORTREVISION=   5
-MASTER_SITES=   http://httpd.apache.org/dist/httpd/ \
+MASTER_SITES=   http://www.apache.org/dist/httpd/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \
 		ftp://ftp.rge.com/pub/infosystems/apache/dist/httpd/ \
 		ftp://apache.compuex.com/pub/apache/dist/httpd/ \
@@ -26,34 +25,74 @@ MASTER_SITES=   http://httpd.apache.org/dist/httpd/ \
 		ftp://apache.nextpath.com/pub/apache/dist/httpd/
 DISTNAME=	apache_${PORTVERSION}
 
-PATCH_SITES=	ftp://ftp.piuha.net/pub/misc/
-PATCHFILES=	apache-1.3.22-v6-20011123.diff.gz
+PATCH_SITES=	http://motoyuki.bsdclub.org/data/IPv6/
+PATCHFILES=	apache-1.3.26-v6-20020620.diff.gz
 
 MAINTAINER=	sumikawa@FreeBSD.org
 
-FORBIDDEN=	"Vulnerable to denial-of-service.  See" \
-		"http://httpd.apache.org/info/security_bulletin_20020617.txt"
+DATADIR=${PREFIX}/www
+DOCUMENT_ROOT=${DATADIR}/data
+DEFAULT_PATH=/bin:/usr/bin:${PREFIX}/bin
+
+.if defined(WITH_APACHE_SUEXEC) && ${WITH_APACHE_SUEXEC} == yes
+
+APACHE_SUEXEC_DOCROOT?=${DOCUMENT_ROOT}
+APACHE_SUEXEC_USERDIR?=public_html
+
+SUEXEC_CONF= \
+	--enable-suexec \
+	--suexec-docroot=${APACHE_SUEXEC_DOCROOT} \
+	--suexec-caller=www \
+	--suexec-uidmin=1000 \
+	--suexec-gidmin=1000 \
+	--suexec-logfile=/var/log/httpd-suexec.log \
+	--suexec-userdir=${APACHE_SUEXEC_USERDIR} \
+	--suexec-safepath=${DEFAULT_PATH}
+
+.if defined(APACHE_SUEXEC_UMASK)
+SUEXEC_CONF+= \
+	--suexec-umask=${APACHE_SUEXEC_UMASK}
+.endif
+
+PLIST_SUB+=     SUB_SUEXEC=""
+SUEXEC_MAN=     suexec.8
+
+.else   # !SUEXEC
+
+SUEXEC_CONF=
+PLIST_SUB+=     SUB_SUEXEC="@comment "
+SUEXEC_MAN=
+
+.endif  # !SUEXEC
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	\
+# += for child ports
+CONFIGURE_ARGS+=	\
 		--prefix=${PREFIX} \
 		--server-uid=www \
 		--server-gid=www \
 		--with-perl=${PERL} \
-		--with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
-		--suexec-docroot=${PREFIX}/www/data \
+		--with-layout=FreeBSD \
 		--without-confadjust \
 		--enable-rule=INET6 \
 		--enable-module=most \
 		--enable-module=auth_db \
 		--enable-module=mmap_static \
 		--disable-module=auth_dbm \
-		--enable-shared=max
+		--enable-shared=max \
+		${SUEXEC_CONF}
 
-OPTIM=		-DHARD_SERVER_LIMIT=512 \
-		-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
-		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" \
-		-DACCEPT_FILTER_NAME=\\"httpready\\"
+OPTIM=          -DDOCUMENT_LOCATION=\\"${DOCUMENT_ROOT}\\" \
+		-DDEFAULT_PATH=\\"${DEFAULT_PATH}\\"
+
+#
+# Set APACHE_HARD_SERVER_LIMIT env. variable to desired value
+#
+.if defined(APACHE_HARD_SERVER_LIMIT)
+OPTIM+=         -DHARD_SERVER_LIMIT=${APACHE_HARD_SERVER_LIMIT}
+.else
+OPTIM+=         -DHARD_SERVER_LIMIT=512
+.endif
 
 #
 # Set WITH_APACHE_PERF_TUNING env. variable to YES to get maximum performance
@@ -63,18 +102,25 @@ OPTIM+=		-DBUFFERED_LOGS
 CFLAGS+=	-O6 -fomit-frame-pointer
 .endif
 
-CONFIGURE_ENV=	OPTIM='${OPTIM}'
+CONFIGURE_ENV=	OPTIM='${OPTIM}' LD_SHLIB='${CC}'
 
 MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
-MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
+MAN8=           ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 \
+		${SUEXEC_MAN}
+
+post-extract:
+	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/apache.sh \
+		> ${WRKSRC}/apache.sh
 
 pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
 
 post-install:
+	${INSTALL_DATA} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh.default
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
-		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \
+		${INSTALL_SCRIPT} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/apache13+ipv6/distinfo b/www/apache13+ipv6/distinfo
index d18a05d..0954151 100644
--- a/www/apache13+ipv6/distinfo
+++ b/www/apache13+ipv6/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.3.22.tar.gz) = 77d34c0ac49c3af2416b786228007f90
-MD5 (apache-1.3.22-v6-20011123.diff.gz) = 124bba799abe1214edcfcfcd570eddaf
+MD5 (apache_1.3.26.tar.gz) = 52e9b875597a208fca9d393e710087b6
+MD5 (apache-1.3.26-v6-20020620.diff.gz) = e4f268a0a58d24827552faefd73d1859
diff --git a/www/apache13+ipv6/files/FreeBSD.layout b/www/apache13+ipv6/files/FreeBSD.layout
deleted file mode 100644
index b73ee2a..0000000
--- a/www/apache13+ipv6/files/FreeBSD.layout
+++ /dev/null
@@ -1,20 +0,0 @@
-#   FreeBSD layout...
-<Layout FreeBSD>
-    prefix:        /usr/local
-    exec_prefix:   $prefix
-    bindir:        $exec_prefix/bin
-    sbindir:       $exec_prefix/sbin
-    libexecdir:    $exec_prefix/libexec/apache
-    mandir:        $prefix/man
-    sysconfdir:    $prefix/etc/apache
-    datadir:       $prefix/www
-    iconsdir:      $datadir/icons
-    htdocsdir:     $datadir/data
-    manualdir:     $prefix/share/doc/apache
-    cgidir:        $datadir/cgi-bin
-    includedir:    $prefix/include/apache
-    localstatedir: /var
-    runtimedir:    $localstatedir/run
-    logfiledir:    $localstatedir/log
-    proxycachedir: $datadir/proxy
-</Layout>
diff --git a/www/apache13+ipv6/files/apache.sh b/www/apache13+ipv6/files/apache.sh
index ca43218..da657b5 100644
--- a/www/apache13+ipv6/files/apache.sh
+++ b/www/apache13+ipv6/files/apache.sh
@@ -1,16 +1,11 @@
 #!/bin/sh
 
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-
 case "$1" in
 start)
-	[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && echo -n ' apache'
+	[ -x %%PREFIX%%/sbin/apachectl ] && %%PREFIX%%/sbin/apachectl start > /dev/null && echo -n ' apache'
 	;;
 stop)
-	[ -r /var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache'
+	[ -r /var/run/httpd.pid ] && %%PREFIX%%/sbin/apachectl stop > /dev/null && echo -n ' apache'
 	;;
 *)
 	echo "Usage: `basename $0` {start|stop}" >&2
diff --git a/www/apache13+ipv6/files/patch-aa b/www/apache13+ipv6/files/patch-aa
index 15cd58c..78be57c 100644
--- a/www/apache13+ipv6/files/patch-aa
+++ b/www/apache13+ipv6/files/patch-aa
@@ -1,23 +1,19 @@
---- configure.orig	Tue Jan 18 01:53:17 2000
-+++ configure	Mon Jan 24 19:37:21 2000
-@@ -1232,8 +1232,8 @@
+--- 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_XFERLOG: ${logfiledir_relative}access_log"
 -    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
-+    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.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"
-@@ -1330,8 +1330,8 @@
+@@ -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_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
 -echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
-+echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.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
diff --git a/www/apache13+ipv6/files/patch-ab b/www/apache13+ipv6/files/patch-ab
index a6d93e7..a99bd73 100644
--- a/www/apache13+ipv6/files/patch-ab
+++ b/www/apache13+ipv6/files/patch-ab
@@ -1,21 +1,19 @@
---- Makefile.tmpl.orig	Sun Oct  7 02:01:09 2001
-+++ Makefile.tmpl	Sun Dec  2 11:19:23 2001
-@@ -270,10 +270,12 @@
+--- Makefile.tmpl.orig	Thu Mar 14 00:05:27 2002
++++ Makefile.tmpl	Thu Jun 20 05:30:58 2002
+@@ -270,10 +270,10 @@
  	$(MKDIR) $(root)$(mandir)/man1
  	$(MKDIR) $(root)$(mandir)/man8
  	$(MKDIR) $(root)$(sysconfdir)
 -	$(MKDIR) $(root)$(htdocsdir)
-+	$(RM) -rf $(root)$(htdocsdir).default
 +	$(MKDIR) $(root)$(htdocsdir).default
  	$(MKDIR) $(root)$(manualdir)
  	$(MKDIR) $(root)$(iconsdir)
 -	$(MKDIR) $(root)$(cgidir)
-+	$(RM) -rf $(root)$(cgidir).default
 +	$(MKDIR) $(root)$(cgidir).default
  	$(MKDIR) $(root)$(includedir)
  	$(MKDIR) $(root)$(includedir)/xml
  	$(MKDIR) $(root)$(runtimedir)
-@@ -457,33 +459,39 @@
+@@ -459,33 +459,39 @@
  #   icons and distributed CGI scripts.
  install-data:
  	@echo "===> [data: Installing initial data files]"
@@ -70,7 +68,7 @@
  	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
  	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
  	(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
-@@ -522,14 +530,14 @@
+@@ -524,10 +530,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;' \
@@ -85,8 +83,3 @@
  			-e 's;conf/magic;$(sysconfdir)/magic;' \
  			-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
  			-e 's;User nobody;User $(conf_user);' \
--			-e 's;Group #-1;Group $(conf_group);' \
-+			-e 's;Group "#-1";Group $(conf_group);' \
- 			-e 's;Port 80;Port $(conf_port);' \
- 			-e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \
- 			-e 's;ServerName new.host.name;ServerName $(conf_servername);' \
diff --git a/www/apache13+ipv6/files/patch-ag b/www/apache13+ipv6/files/patch-ag
index 80373fb..58c6081 100644
--- a/www/apache13+ipv6/files/patch-ag
+++ b/www/apache13+ipv6/files/patch-ag
@@ -1,6 +1,6 @@
---- conf/httpd.conf-dist.orig	Mon Feb 21 08:30:46 2000
-+++ conf/httpd.conf-dist	Mon May 29 16:48:49 2000
-@@ -354,7 +354,22 @@
+--- conf/httpd.conf-dist.orig	Wed Jan  9 19:05:31 2002
++++ conf/httpd.conf-dist	Fri Jan 25 07:59:12 2002
+@@ -356,7 +356,22 @@
  # directory index.  Separate multiple entries with spaces.
  #
  <IfModule mod_dir.c>
@@ -24,7 +24,7 @@
  </IfModule>
  
  #
-@@ -473,7 +488,7 @@
+@@ -476,7 +491,7 @@
  # define per-<VirtualHost> access logfiles, transactions will be
  # logged therein and *not* in this file.
  #
@@ -33,7 +33,7 @@
  
  #
  # If you would like to have agent and referer logfiles, uncomment the
-@@ -486,7 +501,7 @@
+@@ -489,7 +504,7 @@
  # If you prefer a single logfile with access, agent, and referer information
  # (Combined Logfile Format) you can use the following directive.
  #
@@ -42,25 +42,19 @@
  
  #
  # Optionally add a line containing the server version and virtual host
-@@ -708,13 +723,17 @@
-     # For example, the PHP 3.x module (not part of the Apache distribution - see
-     # http://www.php.net) will typically use:
+@@ -759,6 +774,15 @@
      #
--    #AddType application/x-httpd-php3 .php3
--    #AddType application/x-httpd-php3-source .phps
+     <IfModule mod_negotiation.c>
+         LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ru ltz ca es sv tw
++    </IfModule>
++
 +    <IfModule mod_php3.c>
-+        AddType application/x-httpd-php3 .php3
-+        AddType application/x-httpd-php3-source .php3s
++	AddType application/x-httpd-php3 .php3
++	AddType application/x-httpd-php3-source .php3s
 +    </IfModule>
-     #
-     # And for PHP 4.x, use:
-     #
--    #AddType application/x-httpd-php .php
--    #AddType application/x-httpd-php-source .phps
 +    <IfModule mod_php4.c>
-+        AddType application/x-httpd-php .php
-+        AddType application/x-httpd-php-source .phps
-+    </IfModule>
- 
-     AddType application/x-tar .tgz
++	AddType application/x-httpd-php .php
++	AddType application/x-httpd-php-source .phps
+     </IfModule>
  
+     #
diff --git a/www/apache13+ipv6/files/patch-ak b/www/apache13+ipv6/files/patch-ak
index 486f7ad..9f31635 100644
--- a/www/apache13+ipv6/files/patch-ak
+++ b/www/apache13+ipv6/files/patch-ak
@@ -4,7 +4,7 @@
  # --------------------                              --------------------
  # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
  
-+eval `limits -e -C daemon` >/dev/null 2>&1
++eval `limits -e -U www` >/dev/null 2>&1
 +
  ERROR=0
  ARGV="$@"
diff --git a/www/apache13+ipv6/files/patch-al b/www/apache13+ipv6/files/patch-al
index b355a69..bd79261 100644
--- a/www/apache13+ipv6/files/patch-al
+++ b/www/apache13+ipv6/files/patch-al
@@ -1,6 +1,6 @@
---- src/support/log_server_status.orig	Fri Jun  4 19:54:19 1999
-+++ src/support/log_server_status	Fri Sep  3 15:53:16 1999
-@@ -67,10 +67,10 @@
+--- 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';
  
@@ -13,7 +13,7 @@
  
  sub tcp_connect
  {
-@@ -100,7 +100,7 @@
+@@ -103,7 +103,7 @@
  	chomp($date);
  	($day,$time)=split(/:/,$date);
  	$res=&tcp_connect($server,$port);
diff --git a/www/apache13+ipv6/pkg-deinstall b/www/apache13+ipv6/pkg-deinstall
index deb5f9b..4576501 100644
--- a/www/apache13+ipv6/pkg-deinstall
+++ b/www/apache13+ipv6/pkg-deinstall
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/www/apache13+ipv6/Attic/pkg-deinstall,v 1.2 2001-12-09 00:39:30 sumikawa Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/apache13+ipv6/Attic/pkg-deinstall,v 1.3 2002-06-21 12:06:04 sumikawa Exp $
 #
 
 if [ "$2" != "POST-DEINSTALL" ]; then
diff --git a/www/apache13+ipv6/pkg-install b/www/apache13+ipv6/pkg-install
index fb0a4e5..1bfefbd 100644
--- a/www/apache13+ipv6/pkg-install
+++ b/www/apache13+ipv6/pkg-install
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/www/apache13+ipv6/Attic/pkg-install,v 1.1 2001-10-23 04:41:45 sumikawa Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/apache13+ipv6/Attic/pkg-install,v 1.2 2002-06-21 12:06:04 sumikawa Exp $
 #
 
 if [ "$2" != "PRE-INSTALL" ]; then
diff --git a/www/apache13+ipv6/pkg-message b/www/apache13+ipv6/pkg-message
new file mode 100644
index 0000000..76b79ba
--- /dev/null
+++ b/www/apache13+ipv6/pkg-message
@@ -0,0 +1,4 @@
+===>  COMPATIBILITY NOTE:
+      As of version 1.3.24, the RedirectMatch directive requires an
+      absolute URL target location per RFC 2068. Uses of RedirectMatch that
+      specify a relative URL will fail and must be corrected to function.
diff --git a/www/apache13+ipv6/pkg-plist b/www/apache13+ipv6/pkg-plist
index b059e9f..d56b598 100644
--- a/www/apache13+ipv6/pkg-plist
+++ b/www/apache13+ipv6/pkg-plist
@@ -1,3 +1,5 @@
+@comment $FreeBSD: /tmp/pcvs/ports/www/apache13+ipv6/Attic/pkg-plist,v 1.14 2002-06-21 12:06:04 sumikawa Exp $
+bin/checkgid
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
@@ -16,7 +18,9 @@ etc/apache/mime.types.default
 @unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf.default; then rm -f %D/etc/apache/srm.conf; fi
 etc/apache/srm.conf.default
 @exec [ -f %B/srm.conf ] || cp %B/%f %B/srm.conf
-etc/rc.d/apache.sh
+@unexec if cmp -s %D/etc/rc.d/apache.sh %D/etc/rc.d/apache.sh.default; then rm -f %D/etc/rc.d/apache.sh; fi
+etc/rc.d/apache.sh.default
+@exec [ -f %B/apache.sh ] || ( cp %B/%f %B/apache.sh; chmod 755 %B/apache.sh )
 include/apache/ap.h
 include/apache/ap_alloc.h
 include/apache/ap_compat.h
@@ -46,9 +50,7 @@ include/apache/multithread.h
 include/apache/os-inline.c
 include/apache/os.h
 include/apache/rfc1413.h
-include/apache/sa_len.h
 include/apache/scoreboard.h
-include/apache/sockaddr_storage.h
 include/apache/util_date.h
 include/apache/util_md5.h
 include/apache/util_script.h
@@ -103,6 +105,7 @@ sbin/apxs
 sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
+%%SUB_SUEXEC%%sbin/suexec
 www/data.default/apache_pb.gif
 @exec [ -d %D/www/data/ ] || ln -fs %B %D/www/data
 www/data.default/index.html.ca
@@ -118,7 +121,7 @@ www/data.default/index.html.he.iso8859-8
 www/data.default/index.html.it
 www/data.default/index.html.ja.jis
 www/data.default/index.html.kr.iso-kr
-www/data.default/index.html.lu
+www/data.default/index.html.lb.utf8
 www/data.default/index.html.nl
 www/data.default/index.html.nn
 www/data.default/index.html.no
@@ -133,14 +136,16 @@ www/data.default/index.html.ru.ucs2
 www/data.default/index.html.ru.ucs4
 www/data.default/index.html.ru.utf8
 www/data.default/index.html.se
-www/data.default/index.html.zh.Big5
+www/data.default/index.html.zh
 share/doc/apache/LICENSE
 share/doc/apache/bind.html.en
 share/doc/apache/bind.html.fr
 share/doc/apache/bind.html.html
+share/doc/apache/bind.html.ja.jis
 share/doc/apache/cgi_path.html.en
 share/doc/apache/cgi_path.html.fr
 share/doc/apache/cgi_path.html.html
+share/doc/apache/cgi_path.html.ja.jis
 share/doc/apache/configuring.html.en
 share/doc/apache/configuring.html.fr
 share/doc/apache/configuring.html.html
@@ -164,6 +169,7 @@ share/doc/apache/handler.html.en
 share/doc/apache/handler.html.html
 share/doc/apache/handler.html.ja.jis
 share/doc/apache/header.html
+share/doc/apache/howto/auth.html
 share/doc/apache/howto/cgi.html.en
 share/doc/apache/howto/cgi.html.html
 share/doc/apache/howto/cgi.html.ja.jis
@@ -242,14 +248,21 @@ share/doc/apache/mod/header.html
 share/doc/apache/mod/index-bytype.html.en
 share/doc/apache/mod/index-bytype.html.fr
 share/doc/apache/mod/index-bytype.html.html
+share/doc/apache/mod/index-bytype.html.ja.jis
 share/doc/apache/mod/index.html.en
 share/doc/apache/mod/index.html.fr
 share/doc/apache/mod/index.html.html
 share/doc/apache/mod/index.html.ja.jis
-share/doc/apache/mod/mod_access.html
-share/doc/apache/mod/mod_actions.html
+share/doc/apache/mod/mod_access.html.en
+share/doc/apache/mod/mod_access.html.html
+share/doc/apache/mod/mod_access.html.ja.jis
+share/doc/apache/mod/mod_actions.html.en
+share/doc/apache/mod/mod_actions.html.html
+share/doc/apache/mod/mod_actions.html.ja.jis
 share/doc/apache/mod/mod_alias.html
-share/doc/apache/mod/mod_asis.html
+share/doc/apache/mod/mod_asis.html.en
+share/doc/apache/mod/mod_asis.html.html
+share/doc/apache/mod/mod_asis.html.ja.jis
 share/doc/apache/mod/mod_auth.html
 share/doc/apache/mod/mod_auth_anon.html
 share/doc/apache/mod/mod_auth_db.html
@@ -258,10 +271,14 @@ share/doc/apache/mod/mod_auth_digest.html
 share/doc/apache/mod/mod_autoindex.html
 share/doc/apache/mod/mod_browser.html
 share/doc/apache/mod/mod_cern_meta.html
-share/doc/apache/mod/mod_cgi.html
+share/doc/apache/mod/mod_cgi.html.en
+share/doc/apache/mod/mod_cgi.html.html
+share/doc/apache/mod/mod_cgi.html.ja.jis
 share/doc/apache/mod/mod_cookies.html
 share/doc/apache/mod/mod_digest.html
-share/doc/apache/mod/mod_dir.html
+share/doc/apache/mod/mod_dir.html.en
+share/doc/apache/mod/mod_dir.html.html
+share/doc/apache/mod/mod_dir.html.ja.jis
 share/doc/apache/mod/mod_dld.html
 share/doc/apache/mod/mod_env.html.en
 share/doc/apache/mod/mod_env.html.html
@@ -271,7 +288,9 @@ share/doc/apache/mod/mod_expires.html
 share/doc/apache/mod/mod_headers.html
 share/doc/apache/mod/mod_imap.html
 share/doc/apache/mod/mod_include.html
-share/doc/apache/mod/mod_info.html
+share/doc/apache/mod/mod_info.html.en
+share/doc/apache/mod/mod_info.html.html
+share/doc/apache/mod/mod_info.html.ja.jis
 share/doc/apache/mod/mod_isapi.html
 share/doc/apache/mod/mod_log_agent.html
 share/doc/apache/mod/mod_log_common.html
@@ -290,11 +309,19 @@ share/doc/apache/mod/mod_rewrite.html
 share/doc/apache/mod/mod_setenvif.html.en
 share/doc/apache/mod/mod_setenvif.html.html
 share/doc/apache/mod/mod_setenvif.html.ja.jis
-share/doc/apache/mod/mod_so.html
-share/doc/apache/mod/mod_speling.html
+share/doc/apache/mod/mod_so.html.en
+share/doc/apache/mod/mod_so.html.html
+share/doc/apache/mod/mod_so.html.ja.jis
+share/doc/apache/mod/mod_speling.html.en
+share/doc/apache/mod/mod_speling.html.html
+share/doc/apache/mod/mod_speling.html.ja.jis
 share/doc/apache/mod/mod_status.html
-share/doc/apache/mod/mod_unique_id.html
-share/doc/apache/mod/mod_userdir.html
+share/doc/apache/mod/mod_unique_id.html.en
+share/doc/apache/mod/mod_unique_id.html.html
+share/doc/apache/mod/mod_unique_id.html.ja.jis
+share/doc/apache/mod/mod_userdir.html.en
+share/doc/apache/mod/mod_userdir.html.html
+share/doc/apache/mod/mod_userdir.html.ja.jis
 share/doc/apache/mod/mod_usertrack.html
 share/doc/apache/mod/mod_vhost_alias.html
 share/doc/apache/mod/module-dict.html.en
@@ -310,30 +337,43 @@ share/doc/apache/new_features_1_3.html.en
 share/doc/apache/new_features_1_3.html.html
 share/doc/apache/new_features_1_3.html.ja.jis
 share/doc/apache/new_features_2_0.html
-share/doc/apache/process-model.html
+share/doc/apache/process-model.html.en
+share/doc/apache/process-model.html.html
+share/doc/apache/process-model.html.ja.jis
 share/doc/apache/programs/ab.html
-share/doc/apache/programs/apachectl.html
+share/doc/apache/programs/apachectl.html.en
+share/doc/apache/programs/apachectl.html.html
+share/doc/apache/programs/apachectl.html.ja.jis
 share/doc/apache/programs/apxs.html
 share/doc/apache/programs/dbmmanage.html
 share/doc/apache/programs/footer.html
 share/doc/apache/programs/header.html
 share/doc/apache/programs/htdigest.html
-share/doc/apache/programs/htpasswd.html
-share/doc/apache/programs/httpd.html
+share/doc/apache/programs/htpasswd.html.en
+share/doc/apache/programs/htpasswd.html.html
+share/doc/apache/programs/htpasswd.html.ja.jis
+share/doc/apache/programs/httpd.html.en
+share/doc/apache/programs/httpd.html.html
+share/doc/apache/programs/httpd.html.ja.jis
 share/doc/apache/programs/index.html.en
 share/doc/apache/programs/index.html.html
 share/doc/apache/programs/index.html.ja.jis
 share/doc/apache/programs/logresolve.html
 share/doc/apache/programs/other.html
 share/doc/apache/programs/rotatelogs.html
-share/doc/apache/programs/suexec.html
+share/doc/apache/programs/suexec.html.en
+share/doc/apache/programs/suexec.html.html
+share/doc/apache/programs/suexec.html.ja.jis
 share/doc/apache/readme-tpf.html
 share/doc/apache/search/manual-index.cgi
-share/doc/apache/sections.html
+share/doc/apache/sections.html.en
+share/doc/apache/sections.html.html
+share/doc/apache/sections.html.ja.jis
 share/doc/apache/server-wide.html.en
 share/doc/apache/server-wide.html.fr
 share/doc/apache/server-wide.html.html
 share/doc/apache/server-wide.html.ja.jis
+share/doc/apache/sitemap.html
 share/doc/apache/sourcereorg.html
 share/doc/apache/stopping.html.en
 share/doc/apache/stopping.html.fr
@@ -348,7 +388,9 @@ share/doc/apache/urlmapping.html
 share/doc/apache/vhosts/details.html
 share/doc/apache/vhosts/details_1_2.html
 share/doc/apache/vhosts/examples.html
-share/doc/apache/vhosts/fd-limits.html
+share/doc/apache/vhosts/fd-limits.html.en
+share/doc/apache/vhosts/fd-limits.html.html
+share/doc/apache/vhosts/fd-limits.html.ja.jis
 share/doc/apache/vhosts/footer.html
 share/doc/apache/vhosts/header.html
 share/doc/apache/vhosts/host.html
@@ -362,11 +404,14 @@ share/doc/apache/vhosts/name-based.html.html
 share/doc/apache/vhosts/name-based.html.ja.jis
 share/doc/apache/vhosts/vhosts-in-depth.html
 share/doc/apache/vhosts/virtual-host.html
-share/doc/apache/win_compiling.html
+share/doc/apache/win_compiling.html.en
+share/doc/apache/win_compiling.html.html
+share/doc/apache/win_compiling.html.ja.jis
 share/doc/apache/win_service.html.en
 share/doc/apache/win_service.html.html
 share/doc/apache/win_service.html.ja.jis
-share/doc/apache/windows.html
+share/doc/apache/windows.html.en
+share/doc/apache/windows.html.ja.jis
 www/cgi-bin.default/printenv
 @exec [ -d %D/www/cgi-bin/ ] || ln -fs %B %D/www/cgi-bin
 www/cgi-bin.default/test-cgi
@@ -413,6 +458,8 @@ www/icons/continued.gif
 www/icons/continued.png
 www/icons/dir.gif
 www/icons/dir.png
+www/icons/diskimg.gif
+www/icons/diskimg.png
 www/icons/down.gif
 www/icons/down.png
 www/icons/dvi.gif