4 files changed, 68 insertions, 38 deletions

diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index b0e63a45bfb9..e1a5bb5a08e4 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=    1.3.24
-PORTREVISION=   7
+PORTVERSION=    1.3.26
 CATEGORIES=	www
 MASTER_SITES=   http://www.apache.org/dist/httpd/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \
@@ -26,15 +25,12 @@ MASTER_SITES=   http://www.apache.org/dist/httpd/ \
 		ftp://apache.nextpath.com/pub/apache/dist/httpd/
 DISTNAME=	apache_${PORTVERSION}
 
-PATCH_SITES=    http://www.apache.org/dist/httpd/patches/apply_to_1.3.24/
-PATCHFILES=     proxy_http1.1_chunking.patch
-PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP}
+PATCH_SITES=    http://www.apache.org/dist/httpd/patches/apply_to_1.3.26/
+#PATCHFILES=
+#PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP}
 
 MAINTAINER=	ache@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
diff --git a/www/apache13/distinfo b/www/apache13/distinfo
index 128f13ae1414..ac765497b0d5 100644
--- a/www/apache13/distinfo
+++ b/www/apache13/distinfo
@@ -1,2 +1 @@
-MD5 (apache_1.3.24.tar.gz) = ebea6588c3954731fcc318d29bc82409
-MD5 (proxy_http1.1_chunking.patch) = 52f62e5d7a8f123ef78400f21292c21f
+MD5 (apache_1.3.26.tar.gz) = 52e9b875597a208fca9d393e710087b6
diff --git a/www/apache13/files/patch-aa b/www/apache13/files/patch-aa
index 0524f0c3db2a..78be57c08eed 100644
--- a/www/apache13/files/patch-aa
+++ b/www/apache13/files/patch-aa
@@ -1,23 +1,19 @@
---- configure.orig	Thu Sep 27 22:12:03 2001
-+++ configure	Fri Jan 25 07:46:03 2002
-@@ -1251,8 +1251,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"
-@@ -1350,8 +1350,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/pkg-plist b/www/apache13/pkg-plist
index 4e1a858d9cad..eb20be225f33 100644
--- a/www/apache13/pkg-plist
+++ b/www/apache13/pkg-plist
@@ -121,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
@@ -136,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
@@ -246,15 +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_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
+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
@@ -263,7 +271,9 @@ 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.en
@@ -278,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
@@ -297,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
@@ -317,26 +337,38 @@ 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
@@ -356,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
@@ -370,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
@@ -421,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