upgrade to 1.3.14 + IPv6 patch. apache side fixed security hole between

1.3.12 -> 1.3.14.

4 files changed, 68 insertions, 16 deletions

diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index dec25b1befd..3fdec1ac1fa 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/09/20 05:14:12 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2000/11/14 19:58:05 itojun Exp $
 #
 # The fourth number in the PKGNAME version indicates a NetBSD pkg revision
 # (to indicate changes in the shipped third party patches such as the mod_ssl
@@ -10,8 +10,8 @@
 # sanity fixes in apache module API (for example, avoid u_long for IPv4 addrs)
 #
 
-DISTNAME=		apache_1.3.12
-PKGNAME=		apache6-1.3.12
+DISTNAME=		apache_1.3.14
+PKGNAME=		apache6-1.3.14
 CATEGORIES=		www
 MASTER_SITES=		http://www.apache.org/dist/ \
 			ftp://ftp.modssl.org/source/ \
@@ -21,7 +21,7 @@ DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 #			${SSL_DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=		ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES=		apache-1.3.12-v6-20000908a.diff.gz
+PATCHFILES=		apache-1.3.14-v6-20001114.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		itojun@itojun.org
diff --git a/www/apache6/files/apache.sh b/www/apache6/files/apache.sh
index 95df689a22a..8a55af11815 100644
--- a/www/apache6/files/apache.sh
+++ b/www/apache6/files/apache.sh
@@ -1,15 +1,47 @@
-#!/bin/sh
+#! /bin/sh
 #
-# $NetBSD: apache.sh,v 1.3 2000/09/20 05:14:12 jlam Exp $
+# $NetBSD: apache.sh,v 1.4 2000/11/14 19:58:05 itojun Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
 
-CMD=${1:-start}
+name="apache"
+command="@PREFIX@/sbin/apachectl"
+pidfile="/var/run/httpd.pid"
+conffile="@PREFIX@/etc/httpd/httpd.conf"
 
-if [ -x @PREFIX@/sbin/httpd -a -f @PREFIX@/etc/httpd/httpd.conf ]
+apache_start="start"
+
+if [ -f @PREFIX@/etc/httpd/mod_ssl.conf ]
 then
- @PREFIX@/sbin/apachectl $CMD >/dev/null
- echo -n ' apache'
+	# This file can reset apache_start to "startssl"
+	. @PREFIX@/etc/httpd/mod_ssl.conf
 fi
+
+cmd=${1:-start}
+
+case ${cmd} in
+start)
+	if [ -x ${command} -a -f ${conffile} ]; then
+		echo "Starting ${name}."
+		${command} ${apache_start} > /dev/null
+	fi
+	;;
+stop)
+	if [ -x ${command} -a -f ${pidfile} ]; then
+		echo "Stopping ${name}."
+		${command} stop > /dev/null
+	fi
+	;;
+restart)
+	( $0 stop )
+	sleep 5
+	$0 start
+	;;
+*)
+	if [ -x ${command} ]; then
+		${command} ${cmd}
+	fi
+	;;
+esac
 exit 0
diff --git a/www/apache6/files/md5 b/www/apache6/files/md5
index b2759abf706..18012b05acc 100644
--- a/www/apache6/files/md5
+++ b/www/apache6/files/md5
@@ -1,5 +1,5 @@
-$NetBSD: md5,v 1.6 2000/09/08 11:42:44 itojun Exp $
+$NetBSD: md5,v 1.7 2000/11/14 19:58:05 itojun Exp $
 
-MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2
+MD5 (apache_1.3.14.tar.gz) = 34803e3d83a0a9ed981b571657b33109
 MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1
-MD5 (apache-1.3.12-v6-20000908a.diff.gz) = 4e218076276d989a878b9416f7c4f234
+MD5 (apache-1.3.14-v6-20001114.diff.gz) = ea89d6b8dd2ba9314bf2073627230b7a
diff --git a/www/apache6/pkg/PLIST b/www/apache6/pkg/PLIST
index fa0ca8653e2..f4628517319 100644
--- a/www/apache6/pkg/PLIST
+++ b/www/apache6/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2000/09/20 05:14:13 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2000/11/14 19:58:06 itojun Exp $
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
@@ -9,7 +9,7 @@ etc/httpd/magic.default
 etc/httpd/mime.types.default
 @exec if [ ! -f %D/etc/httpd/mime.types ]; then cp -p %D/etc/httpd/mime.types.default %D/etc/httpd/mime.types; fi
 etc/rc.d/apache
-include/httpd/alloc.h
+include/httpd/ap_alloc.h
 include/httpd/ap.h
 include/httpd/ap_compat.h
 include/httpd/ap_config.h
@@ -77,6 +77,7 @@ sbin/apxs
 sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
+share/httpd/htdocs/README.rus
 share/httpd/htdocs/apache_pb.gif
 share/httpd/htdocs/index.html.ca
 share/httpd/htdocs/index.html.cz
@@ -86,17 +87,29 @@ share/httpd/htdocs/index.html.ee
 share/httpd/htdocs/index.html.en
 share/httpd/htdocs/index.html.es
 share/httpd/htdocs/index.html.fr
+share/httpd/htdocs/index.html.he.iso8859-8
 share/httpd/htdocs/index.html.it
 share/httpd/htdocs/index.html.ja.jis
+share/httpd/htdocs/index.html.kr.iso-kr
 share/httpd/htdocs/index.html.lu
 share/httpd/htdocs/index.html.nl
+share/httpd/htdocs/index.html.no
 share/httpd/htdocs/index.html.po.iso-pl
 share/httpd/htdocs/index.html.pt
 share/httpd/htdocs/index.html.pt-br
+share/httpd/htdocs/index.html.ru.cp-1251
+share/httpd/htdocs/index.html.ru.cp866
+share/httpd/htdocs/index.html.ru.iso-ru
+share/httpd/htdocs/index.html.ru.koi8-r
+share/httpd/htdocs/index.html.ru.ucs2
+share/httpd/htdocs/index.html.ru.ucs4
+share/httpd/htdocs/index.html.ru.utf8
 share/httpd/htdocs/index.html.se
+share/httpd/htdocs/index.html.tw.Big5
 share/httpd/htdocs/manual/LICENSE
 share/httpd/htdocs/manual/bind.html
 share/httpd/htdocs/manual/cgi_path.html
+share/httpd/htdocs/manual/configuring.html
 share/httpd/htdocs/manual/content-negotiation.html
 share/httpd/htdocs/manual/custom-error.html
 share/httpd/htdocs/manual/dns-caveats.html
@@ -115,8 +128,8 @@ share/httpd/htdocs/manual/images/mod_rewrite_fig2.fig
 share/httpd/htdocs/manual/images/mod_rewrite_fig2.gif
 share/httpd/htdocs/manual/images/sub.gif
 share/httpd/htdocs/manual/index.html
-share/httpd/htdocs/manual/install.html
 share/httpd/htdocs/manual/install-tpf.html
+share/httpd/htdocs/manual/install.html
 share/httpd/htdocs/manual/invoking.html
 share/httpd/htdocs/manual/keepalive.html
 share/httpd/htdocs/manual/location.html
@@ -142,6 +155,7 @@ share/httpd/htdocs/manual/misc/perf-tuning.html
 share/httpd/htdocs/manual/misc/perf.html
 share/httpd/htdocs/manual/misc/rewriteguide.html
 share/httpd/htdocs/manual/misc/security_tips.html
+share/httpd/htdocs/manual/misc/tutorials.html
 share/httpd/htdocs/manual/misc/vif-info.html
 share/httpd/htdocs/manual/misc/windoz_keepalive.html
 share/httpd/htdocs/manual/mod/core.html
@@ -149,6 +163,7 @@ share/httpd/htdocs/manual/mod/directive-dict.html
 share/httpd/htdocs/manual/mod/directives.html
 share/httpd/htdocs/manual/mod/footer.html
 share/httpd/htdocs/manual/mod/header.html
+share/httpd/htdocs/manual/mod/index-bytype.html
 share/httpd/htdocs/manual/mod/index.html
 share/httpd/htdocs/manual/mod/mod_access.html
 share/httpd/htdocs/manual/mod/mod_actions.html
@@ -194,12 +209,15 @@ share/httpd/htdocs/manual/mod/mod_unique_id.html
 share/httpd/htdocs/manual/mod/mod_userdir.html
 share/httpd/htdocs/manual/mod/mod_usertrack.html
 share/httpd/htdocs/manual/mod/mod_vhost_alias.html
+share/httpd/htdocs/manual/mod/module-dict.html
+share/httpd/htdocs/manual/mpeix.html
 share/httpd/htdocs/manual/multilogs.html
 share/httpd/htdocs/manual/netware.html
 share/httpd/htdocs/manual/new_features_1_0.html
 share/httpd/htdocs/manual/new_features_1_1.html
 share/httpd/htdocs/manual/new_features_1_2.html
 share/httpd/htdocs/manual/new_features_1_3.html
+share/httpd/htdocs/manual/new_features_2_0.html
 share/httpd/htdocs/manual/process-model.html
 share/httpd/htdocs/manual/readme-tpf.html
 share/httpd/htdocs/manual/search/manual-index.cgi
@@ -223,6 +241,8 @@ share/httpd/htdocs/manual/vhosts/mass.html
 share/httpd/htdocs/manual/vhosts/name-based.html
 share/httpd/htdocs/manual/vhosts/vhosts-in-depth.html
 share/httpd/htdocs/manual/vhosts/virtual-host.html
+share/httpd/htdocs/manual/win_compiling.html
+share/httpd/htdocs/manual/win_service.html
 share/httpd/htdocs/manual/windows.html
 share/httpd/htdocs/sitedrivenby.gif
 share/httpd/icons/README