4 files changed, 70 insertions, 38 deletions

diff --git a/russian/apache13/Makefile b/russian/apache13/Makefile
index b10a5aaad745..a43a0456a4de 100644
--- a/russian/apache13/Makefile
+++ b/russian/apache13/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	apache
 PORTVERSION=	${APACHE_VERSION}.${RA_VERSION}
 CATEGORIES=	russian www
-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/ \
@@ -31,11 +31,8 @@ PATCHFILES=	patches_${APACHE_VERSION}rusPL${RA_VERSION}.tar.gz
 
 MAINTAINER=	lev@serebryakov.spb.ru
 
-FORBIDDEN=	"Vulnerable to denial-of-service.  See" \
-		"http://httpd.apache.org/info/security_bulletin_20020617.txt"
-
-RA_VERSION=	30.12
-APACHE_VERSION=	1.3.24
+RA_VERSION=	30.13
+APACHE_VERSION=	1.3.26
 Y2K=		http://www.apache.org/docs/misc/FAQ.html#year2000
 
 #
diff --git a/russian/apache13/distinfo b/russian/apache13/distinfo
index a05362b81676..8b064f302f60 100644
--- a/russian/apache13/distinfo
+++ b/russian/apache13/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.3.24.tar.gz) = ebea6588c3954731fcc318d29bc82409
-MD5 (patches_1.3.24rusPL30.12.tar.gz) = ed41aaf74a3adcd5bd30bf93573ed691
+MD5 (apache_1.3.26.tar.gz) = 52e9b875597a208fca9d393e710087b6
+MD5 (patches_1.3.26rusPL30.13.tar.gz) = df0d0a94a076869c813257548f4ced55
diff --git a/russian/apache13/files/patch-aa b/russian/apache13/files/patch-aa
index 15cd58c27ef2..fd39302751f3 100644
--- a/russian/apache13/files/patch-aa
+++ b/russian/apache13/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	Sat Jun 22 14:37:40 2002
++++ configure	Sat Jun 22 14:38:01 2002
+@@ -1263,7 +1263,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 @@
+@@ -1361,7 +1361,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/russian/apache13/pkg-plist b/russian/apache13/pkg-plist
index db6041d78dcc..4a5e21e85cc4 100644
--- a/russian/apache13/pkg-plist
+++ b/russian/apache13/pkg-plist
@@ -240,7 +240,6 @@ share/doc/apache/ra-powered.gif
 @exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data
 @exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
 share/doc/apache/index.html
-share/doc/apache/index.html.ru
 share/doc/apache/index.html.ca
 share/doc/apache/index.html.cz
 share/doc/apache/index.html.de
@@ -254,13 +253,14 @@ share/doc/apache/index.html.he.iso8859-8
 share/doc/apache/index.html.it
 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.lb.utf8
 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
 share/doc/apache/index.html.pt-br
+share/doc/apache/index.html.ru
 share/doc/apache/index.html.ru.cp-1251
 share/doc/apache/index.html.ru.cp866
 share/doc/apache/index.html.ru.iso-ru
@@ -269,14 +269,16 @@ share/doc/apache/index.html.ru.ucs2
 share/doc/apache/index.html.ru.ucs4
 share/doc/apache/index.html.ru.utf8
 share/doc/apache/index.html.se
-share/doc/apache/index.html.zh.Big5
+share/doc/apache/index.html.zh
 share/doc/apache/manual/LICENSE
 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/bind.html.ja.jis
 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/cgi_path.html.ja.jis
 share/doc/apache/manual/configuring.html.en
 share/doc/apache/manual/configuring.html.fr
 share/doc/apache/manual/configuring.html.html
@@ -379,15 +381,21 @@ share/doc/apache/manual/mod/header.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-bytype.html.html
+share/doc/apache/manual/mod/index-bytype.html.ja.jis
 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_access.html.en
+share/doc/apache/manual/mod/mod_access.html.html
 share/doc/apache/manual/mod/mod_access.html.ja.jis
-share/doc/apache/manual/mod/mod_actions.html
+share/doc/apache/manual/mod/mod_actions.html.en
+share/doc/apache/manual/mod/mod_actions.html.html
+share/doc/apache/manual/mod/mod_actions.html.ja.jis
 share/doc/apache/manual/mod/mod_alias.html
-share/doc/apache/manual/mod/mod_asis.html
+share/doc/apache/manual/mod/mod_asis.html.en
+share/doc/apache/manual/mod/mod_asis.html.html
+share/doc/apache/manual/mod/mod_asis.html.ja.jis
 share/doc/apache/manual/mod/mod_auth.html
 share/doc/apache/manual/mod/mod_auth_anon.html
 share/doc/apache/manual/mod/mod_auth_db.html
@@ -396,7 +404,9 @@ share/doc/apache/manual/mod/mod_auth_digest.html
 share/doc/apache/manual/mod/mod_autoindex.html
 share/doc/apache/manual/mod/mod_browser.html
 share/doc/apache/manual/mod/mod_cern_meta.html
-share/doc/apache/manual/mod/mod_cgi.html
+share/doc/apache/manual/mod/mod_cgi.html.en
+share/doc/apache/manual/mod/mod_cgi.html.html
+share/doc/apache/manual/mod/mod_cgi.html.ja.jis
 share/doc/apache/manual/mod/mod_cookies.html
 share/doc/apache/manual/mod/mod_digest.html
 share/doc/apache/manual/mod/mod_dir.html.en
@@ -411,7 +421,9 @@ share/doc/apache/manual/mod/mod_expires.html
 share/doc/apache/manual/mod/mod_headers.html
 share/doc/apache/manual/mod/mod_imap.html
 share/doc/apache/manual/mod/mod_include.html
-share/doc/apache/manual/mod/mod_info.html
+share/doc/apache/manual/mod/mod_info.html.en
+share/doc/apache/manual/mod/mod_info.html.html
+share/doc/apache/manual/mod/mod_info.html.ja.jis
 share/doc/apache/manual/mod/mod_isapi.html
 share/doc/apache/manual/mod/mod_log_agent.html
 share/doc/apache/manual/mod/mod_log_common.html
@@ -430,11 +442,19 @@ share/doc/apache/manual/mod/mod_rewrite.html
 share/doc/apache/manual/mod/mod_setenvif.html.en
 share/doc/apache/manual/mod/mod_setenvif.html.html
 share/doc/apache/manual/mod/mod_setenvif.html.ja.jis
-share/doc/apache/manual/mod/mod_so.html
-share/doc/apache/manual/mod/mod_speling.html
+share/doc/apache/manual/mod/mod_so.html.en
+share/doc/apache/manual/mod/mod_so.html.html
+share/doc/apache/manual/mod/mod_so.html.ja.jis
+share/doc/apache/manual/mod/mod_speling.html.en
+share/doc/apache/manual/mod/mod_speling.html.html
+share/doc/apache/manual/mod/mod_speling.html.ja.jis
 share/doc/apache/manual/mod/mod_status.html
-share/doc/apache/manual/mod/mod_unique_id.html
-share/doc/apache/manual/mod/mod_userdir.html
+share/doc/apache/manual/mod/mod_unique_id.html.en
+share/doc/apache/manual/mod/mod_unique_id.html.html
+share/doc/apache/manual/mod/mod_unique_id.html.ja.jis
+share/doc/apache/manual/mod/mod_userdir.html.en
+share/doc/apache/manual/mod/mod_userdir.html.html
+share/doc/apache/manual/mod/mod_userdir.html.ja.jis
 share/doc/apache/manual/mod/mod_usertrack.html
 share/doc/apache/manual/mod/mod_vhost_alias.html
 share/doc/apache/manual/mod/module-dict.html.en
@@ -450,26 +470,38 @@ share/doc/apache/manual/new_features_1_3.html.en
 share/doc/apache/manual/new_features_1_3.html.html
 share/doc/apache/manual/new_features_1_3.html.ja.jis
 share/doc/apache/manual/new_features_2_0.html
-share/doc/apache/manual/process-model.html
+share/doc/apache/manual/process-model.html.en
+share/doc/apache/manual/process-model.html.html
+share/doc/apache/manual/process-model.html.ja.jis
 share/doc/apache/manual/programs/ab.html
-share/doc/apache/manual/programs/apachectl.html
+share/doc/apache/manual/programs/apachectl.html.en
+share/doc/apache/manual/programs/apachectl.html.html
+share/doc/apache/manual/programs/apachectl.html.ja.jis
 share/doc/apache/manual/programs/apxs.html
 share/doc/apache/manual/programs/dbmmanage.html
 share/doc/apache/manual/programs/footer.html
 share/doc/apache/manual/programs/header.html
 share/doc/apache/manual/programs/htdigest.html
-share/doc/apache/manual/programs/htpasswd.html
-share/doc/apache/manual/programs/httpd.html
+share/doc/apache/manual/programs/htpasswd.html.en
+share/doc/apache/manual/programs/htpasswd.html.html
+share/doc/apache/manual/programs/htpasswd.html.ja.jis
+share/doc/apache/manual/programs/httpd.html.en
+share/doc/apache/manual/programs/httpd.html.html
+share/doc/apache/manual/programs/httpd.html.ja.jis
 share/doc/apache/manual/programs/index.html.en
 share/doc/apache/manual/programs/index.html.html
 share/doc/apache/manual/programs/index.html.ja.jis
 share/doc/apache/manual/programs/logresolve.html
 share/doc/apache/manual/programs/other.html
 share/doc/apache/manual/programs/rotatelogs.html
-share/doc/apache/manual/programs/suexec.html
+share/doc/apache/manual/programs/suexec.html.en
+share/doc/apache/manual/programs/suexec.html.html
+share/doc/apache/manual/programs/suexec.html.ja.jis
 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/sections.html.en
+share/doc/apache/manual/sections.html.html
+share/doc/apache/manual/sections.html.ja.jis
 share/doc/apache/manual/server-wide.html.en
 share/doc/apache/manual/server-wide.html.fr
 share/doc/apache/manual/server-wide.html.html
@@ -489,7 +521,9 @@ share/doc/apache/manual/urlmapping.html
 share/doc/apache/manual/vhosts/details.html
 share/doc/apache/manual/vhosts/details_1_2.html
 share/doc/apache/manual/vhosts/examples.html
-share/doc/apache/manual/vhosts/fd-limits.html
+share/doc/apache/manual/vhosts/fd-limits.html.en
+share/doc/apache/manual/vhosts/fd-limits.html.html
+share/doc/apache/manual/vhosts/fd-limits.html.ja.jis
 share/doc/apache/manual/vhosts/footer.html
 share/doc/apache/manual/vhosts/header.html
 share/doc/apache/manual/vhosts/host.html
@@ -503,11 +537,14 @@ 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_compiling.html.en
+share/doc/apache/manual/win_compiling.html.html
+share/doc/apache/manual/win_compiling.html.ja.jis
 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/windows.html.en
+share/doc/apache/manual/windows.html.ja.jis
 www/cgi-bin.default/printenv
 www/cgi-bin.default/test-cgi
 www/icons/README
@@ -553,6 +590,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
@@ -633,6 +672,7 @@ www/icons/screw2.gif
 www/icons/screw2.png
 www/icons/script.gif
 www/icons/script.png
+www/icons/small/README.txt
 www/icons/small/back.gif
 www/icons/small/back.png
 www/icons/small/binary.gif
@@ -683,7 +723,6 @@ www/icons/small/ps.gif
 www/icons/small/ps.png
 www/icons/small/rainbow.gif
 www/icons/small/rainbow.png
-www/icons/small/README.txt
 www/icons/small/sound.gif
 www/icons/small/sound.png
 www/icons/small/sound2.gif