diff options
author | martti <martti> | 2001-10-08 13:23:37 +0000 |
---|---|---|
committer | martti <martti> | 2001-10-08 13:23:37 +0000 |
commit | 694b035728488342bb852344d6f332b11b9b7ae1 (patch) | |
tree | 631afd5761e625b2f6a4c6d7bf41464db5aa892d /www/apache6 | |
parent | c765893633691bd5c3530a97a19fb198c5d610db (diff) | |
download | pkgsrc-694b035728488342bb852344d6f332b11b9b7ae1.tar.gz |
- Upgraded to 1.3.20.
- IPv6 patch will be maintained at ftp://ftp.piuha.net/pub/misc/
A better ChangeLog (1.3.19 -> 1.3.20) is available in
pkgsrc/www/apache/Makefile rev 1.73
Diffstat (limited to 'www/apache6')
-rw-r--r-- | www/apache6/Makefile | 10 | ||||
-rw-r--r-- | www/apache6/distinfo | 18 | ||||
-rw-r--r-- | www/apache6/patches/patch-ab | 8 | ||||
-rw-r--r-- | www/apache6/patches/patch-ac | 54 | ||||
-rw-r--r-- | www/apache6/patches/patch-af | 8 | ||||
-rw-r--r-- | www/apache6/patches/patch-ai | 24 | ||||
-rw-r--r-- | www/apache6/pkg/PLIST | 32 |
7 files changed, 87 insertions, 67 deletions
diff --git a/www/apache6/Makefile b/www/apache6/Makefile index 5c6120418cf..c78346b69f8 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2001/09/27 23:18:51 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2001/10/08 13:23:37 martti Exp $ # # This package does not compile in mod_ssl support hooks, as it conflicts # with IPv6-enable patch. @@ -7,8 +7,8 @@ # sanity fixes in apache module API (for example, avoid u_long for IPv4 addrs) # -DISTNAME= apache_1.3.19 -PKGNAME= apache6-1.3.19 +DISTNAME= apache_1.3.20 +PKGNAME= apache6-1.3.20 CATEGORIES= www MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ http://www.apache.de/dist/httpd/ \ @@ -16,9 +16,9 @@ MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ sitedrivenby.gif -MASTER_SITES+= ftp://ftp.kame.net/pub/kame/misc/ +MASTER_SITES+= ftp://ftp.piuha.net/pub/misc/ DISTFILES+= ${IPV6_PATCH} -IPV6_PATCH= apache-1.3.19-v6-20010301a.diff.gz +IPV6_PATCH= apache-1.3.20-v6-20010807.diff.gz PATCH_DIST_STRIP= -p1 # IPv6 patch needs -p1 MAINTAINER= itojun@netbsd.org diff --git a/www/apache6/distinfo b/www/apache6/distinfo index 828229747c8..31b86b213a2 100644 --- a/www/apache6/distinfo +++ b/www/apache6/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.3 2001/04/29 21:21:13 jlam Exp $ +$NetBSD: distinfo,v 1.4 2001/10/08 13:23:37 martti Exp $ -SHA1 (apache_1.3.19.tar.gz) = 2cc8d431ef9eb1037f876394fef4aecb83948501 -Size (apache_1.3.19.tar.gz) = 1928677 bytes +SHA1 (apache_1.3.20.tar.gz) = c791b6513b253035c04e76f4e1882ad847134a12 +Size (apache_1.3.20.tar.gz) = 1973138 bytes SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658 Size (sitedrivenby.gif) = 8519 bytes -SHA1 (apache-1.3.19-v6-20010301a.diff.gz) = 6a859aad911613f110bbb4a4572929da8d7758eb -Size (apache-1.3.19-v6-20010301a.diff.gz) = 57203 bytes +SHA1 (apache-1.3.20-v6-20010807.diff.gz) = 7af0bf257dbc9473d1ef56731a25d29d85c3489c +Size (apache-1.3.20-v6-20010807.diff.gz) = 54347 bytes SHA1 (patch-aa) = 0048d2cc0c96626f84e44192aca29256e9f30f72 -SHA1 (patch-ab) = 18c07600171218432ac9f4e510722d20f72d39a9 -SHA1 (patch-ac) = 4c18bb80f3fbe8d44c941e403ff10fd92b820785 +SHA1 (patch-ab) = 7619dbf1cf584f9e92998fe25de0860bfbeb277e +SHA1 (patch-ac) = d4dd4f5521a7c713a038dec2606dad14356d746f SHA1 (patch-ae) = 2e4e7aab1cff7ddc82697946eeb8d13cd3aa1df0 -SHA1 (patch-af) = 78d0f26131c1000f45a072d55b1c82806c4e5ddf +SHA1 (patch-af) = 8115ea5b59fc86e7354effd25dc22525e7627802 SHA1 (patch-ah) = 553f8f2bf4bf7278adb46ff8749be154f10e39d3 -SHA1 (patch-ai) = 6bf9f59849803e2594ef9eaff161b377c6d1071a +SHA1 (patch-ai) = 51d71dfd6706eda420293f2a9f81d8982f789753 diff --git a/www/apache6/patches/patch-ab b/www/apache6/patches/patch-ab index 6becde22568..1ace2958e90 100644 --- a/www/apache6/patches/patch-ab +++ b/www/apache6/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.4 2001/04/29 21:21:14 jlam Exp $ +$NetBSD: patch-ab,v 1.5 2001/10/08 13:23:37 martti Exp $ ---- conf/httpd.conf-dist.orig Tue Feb 6 19:40:11 2001 -+++ conf/httpd.conf-dist Tue Feb 6 19:42:15 2001 -@@ -204,7 +204,12 @@ +--- conf/httpd.conf-dist.orig Sun May 13 19:59:49 2001 ++++ conf/httpd.conf-dist Mon Oct 8 14:28:52 2001 +@@ -197,7 +197,12 @@ # the order below without expert advice. # # Example: diff --git a/www/apache6/patches/patch-ac b/www/apache6/patches/patch-ac index bd8404f2167..67a2aac8c55 100644 --- a/www/apache6/patches/patch-ac +++ b/www/apache6/patches/patch-ac @@ -1,35 +1,37 @@ -$NetBSD: patch-ac,v 1.1 2001/02/06 10:58:18 itojun Exp $ +$NetBSD: patch-ac,v 1.2 2001/10/08 13:23:37 martti Exp $ ---- htdocs/index.html.en.orig Fri Jan 19 14:39:47 2001 -+++ htdocs/index.html.en -@@ -33,12 +33,26 @@ - <HR WIDTH="50%" SIZE="8"> +--- htdocs/index.html.en.orig Fri May 4 02:00:38 2001 ++++ htdocs/index.html.en Mon Oct 8 14:33:54 2001 +@@ -27,12 +27,31 @@ - <p>The Apache <A HREF="manual/">documentation</A> has been included with --this distribution.</p> -+this distribution. If the <STRONG>mod_ssl</STRONG> SSL extension has + <hr width="50%" size="8" /> + <p>The Apache <a href="manual/">documentation</a> has been included ++this distribution. If the <STRONG>mod_ssl</STRONG> SSL extension has +been installed, then please carefully read the -+<A HREF="manual/mod/mod_ssl/index.html">SSL documentation</A>.</p> ++<a href="manual/mod/mod_ssl/index.html">SSL documentation</a>.</p> + with this distribution.</p> --<p>You are free to use the image below on an Apache-powered web server. --Thanks for using Apache!</p> +<p>Information on the NetBSD multi-platform operating system can be found at -+<A HREF="http://www.netbsd.org/">The NetBSD Project homepage</A></p> ++<a href="http://www.netbsd.org/">The NetBSD Project homepage</a></p> ++ + <p>You are free to use the image below on an Apache-powered web + server. Thanks for using Apache!</p> --<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT=""></DIV> +-<div align="center"><img src="apache_pb.gif" alt="" /></div> +<p>Please feel free to use the images below on an Apache/NetBSD-powered web -+server. Thanks for using -+<A HREF="http://www.apache.org/">Apache</A> on -+<A HREF="http://www.netbsd.org/">NetBSD</A>!</p> ++server. Thanks for using ++<a href="http://www.apache.org/">Apache</a> on ++<a href="http://www.netbsd.org/">NetBSD</a>!</p> ++ ++<div align="CENTER"> ++ <a href="http://www.apache.org/"> ++ <img src="apache_pb.gif" border=0 alt="Powered by Apache"> ++ </a> ++ <a href="http://www.netbsd.org/"> ++ <img src="sitedrivenby.gif" border=0 alt="Site driven by NetBSD"> ++ </a> ++</div> + -+<DIV ALIGN="CENTER"> -+ <A HREF="http://www.apache.org/"> -+ <IMG SRC="apache_pb.gif" BORDER=0 ALT="Powered by Apache"> -+ </A> -+ <A HREF="http://www.netbsd.org/"> -+ <IMG SRC="sitedrivenby.gif" BORDER=0 ALT="Site driven by NetBSD"> -+ </A> -+</DIV> + </body> + </html> - </BODY> - </HTML> diff --git a/www/apache6/patches/patch-af b/www/apache6/patches/patch-af index 1baf2de093a..015ef18c00c 100644 --- a/www/apache6/patches/patch-af +++ b/www/apache6/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.3 2001/02/06 10:58:18 itojun Exp $ +$NetBSD: patch-af,v 1.4 2001/10/08 13:23:37 martti Exp $ ---- src/modules/standard/mod_so.c.orig Tue Jan 16 02:05:49 2001 -+++ src/modules/standard/mod_so.c Tue Feb 6 19:42:56 2001 -@@ -305,7 +305,15 @@ +--- src/modules/standard/mod_so.c.orig Tue Feb 27 04:59:53 2001 ++++ src/modules/standard/mod_so.c Mon Oct 8 14:34:14 2001 +@@ -308,7 +308,15 @@ return err; } diff --git a/www/apache6/patches/patch-ai b/www/apache6/patches/patch-ai index d84737343cc..21f5234b16e 100644 --- a/www/apache6/patches/patch-ai +++ b/www/apache6/patches/patch-ai @@ -1,14 +1,14 @@ -$NetBSD: patch-ai,v 1.1 2001/02/06 10:58:19 itojun Exp $ +$NetBSD: patch-ai,v 1.2 2001/10/08 13:23:38 martti Exp $ ---- src/support/apxs.pl.orig Fri Feb 2 00:42:14 2001 -+++ src/support/apxs.pl -@@ -427,8 +427,7 @@ - my $t = $f; - $t =~ s|^.+/([^/]+)$|$1|; - if ($opt_i) { -- push(@cmds, "cp $f $CFG_LIBEXECDIR/$t"); -- push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t"); -+ push(@cmds, "install -c -m 555 -o root -g wheel $f $CFG_LIBEXECDIR/$t"); +--- src/support/apxs.pl.orig Fri May 4 08:22:17 2001 ++++ src/support/apxs.pl Mon Oct 8 14:35:47 2001 +@@ -459,8 +459,7 @@ + if ($^O ne "MSWin32") { + $t =~ s|^.+/([^/]+)$|$1|; + if ($opt_i) { +- push(@cmds, "cp $f $CFG_LIBEXECDIR/$t"); +- push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t"); ++ push(@cmds, "install -c -m 555 -o root -g wheel $f $CFG_LIBEXECDIR/$t"); + } } - - # determine module symbolname and filename + else { diff --git a/www/apache6/pkg/PLIST b/www/apache6/pkg/PLIST index a7a2b238d10..6079e600005 100644 --- a/www/apache6/pkg/PLIST +++ b/www/apache6/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2001/05/02 22:22:43 jlam Exp $ +@comment $NetBSD: PLIST,v 1.13 2001/10/08 13:23:38 martti Exp $ bin/dbmmanage bin/htdigest bin/htpasswd @@ -8,6 +8,7 @@ include/httpd/ap_alloc.h include/httpd/ap_compat.h include/httpd/ap_config.h include/httpd/ap_config_auto.h +include/httpd/ap_ebcdic.h include/httpd/sa_len.h include/httpd/sockaddr_storage.h include/httpd/ap_ctype.h @@ -98,11 +99,12 @@ 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/index.html.zh.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.en +share/httpd/htdocs/manual/configuring.html.fr share/httpd/htdocs/manual/configuring.html.html share/httpd/htdocs/manual/configuring.html.ja.jis share/httpd/htdocs/manual/content-negotiation.html @@ -142,11 +144,13 @@ share/httpd/htdocs/manual/index.html.html share/httpd/htdocs/manual/index.html.ja.jis share/httpd/htdocs/manual/install-tpf.html share/httpd/htdocs/manual/install.html.en +share/httpd/htdocs/manual/install.html.es share/httpd/htdocs/manual/install.html.fr share/httpd/htdocs/manual/install.html.html share/httpd/htdocs/manual/install.html.ja.jis share/httpd/htdocs/manual/invoking.html share/httpd/htdocs/manual/invoking.html.fr +share/httpd/htdocs/manual/invoking.html.html share/httpd/htdocs/manual/keepalive.html share/httpd/htdocs/manual/location.html share/httpd/htdocs/manual/man-template.html @@ -182,7 +186,9 @@ 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-bytype.html.fr share/httpd/htdocs/manual/mod/index.html +share/httpd/htdocs/manual/mod/index.html.fr share/httpd/htdocs/manual/mod/mod_access.html share/httpd/htdocs/manual/mod/mod_actions.html share/httpd/htdocs/manual/mod/mod_alias.html @@ -200,7 +206,9 @@ share/httpd/htdocs/manual/mod/mod_cookies.html share/httpd/htdocs/manual/mod/mod_digest.html share/httpd/htdocs/manual/mod/mod_dir.html share/httpd/htdocs/manual/mod/mod_dld.html -share/httpd/htdocs/manual/mod/mod_env.html +share/httpd/htdocs/manual/mod/mod_env.html.en +share/httpd/htdocs/manual/mod/mod_env.html.html +share/httpd/htdocs/manual/mod/mod_env.html.ja.jis share/httpd/htdocs/manual/mod/mod_example.html share/httpd/htdocs/manual/mod/mod_expires.html share/httpd/htdocs/manual/mod/mod_headers.html @@ -212,7 +220,9 @@ share/httpd/htdocs/manual/mod/mod_log_agent.html share/httpd/htdocs/manual/mod/mod_log_common.html share/httpd/htdocs/manual/mod/mod_log_config.html share/httpd/htdocs/manual/mod/mod_log_referer.html -share/httpd/htdocs/manual/mod/mod_mime.html +share/httpd/htdocs/manual/mod/mod_mime.html.en +share/httpd/htdocs/manual/mod/mod_mime.html.html +share/httpd/htdocs/manual/mod/mod_mime.html.ja.jis share/httpd/htdocs/manual/mod/mod_mime_magic.html share/httpd/htdocs/manual/mod/mod_mmap_static.html share/httpd/htdocs/manual/mod/mod_negotiation.html.en @@ -220,7 +230,9 @@ share/httpd/htdocs/manual/mod/mod_negotiation.html.html share/httpd/htdocs/manual/mod/mod_negotiation.html.ja.jis share/httpd/htdocs/manual/mod/mod_proxy.html share/httpd/htdocs/manual/mod/mod_rewrite.html -share/httpd/htdocs/manual/mod/mod_setenvif.html +share/httpd/htdocs/manual/mod/mod_setenvif.html.en +share/httpd/htdocs/manual/mod/mod_setenvif.html.html +share/httpd/htdocs/manual/mod/mod_setenvif.html.ja.jis share/httpd/htdocs/manual/mod/mod_so.html share/httpd/htdocs/manual/mod/mod_speling.html share/httpd/htdocs/manual/mod/mod_status.html @@ -251,7 +263,9 @@ share/httpd/htdocs/manual/programs/header.html share/httpd/htdocs/manual/programs/htdigest.html share/httpd/htdocs/manual/programs/htpasswd.html share/httpd/htdocs/manual/programs/httpd.html -share/httpd/htdocs/manual/programs/index.html +share/httpd/htdocs/manual/programs/index.html.en +share/httpd/htdocs/manual/programs/index.html.html +share/httpd/htdocs/manual/programs/index.html.ja.jis share/httpd/htdocs/manual/programs/logresolve.html share/httpd/htdocs/manual/programs/other.html share/httpd/htdocs/manual/programs/rotatelogs.html @@ -265,7 +279,11 @@ share/httpd/htdocs/manual/server-wide.html.html share/httpd/htdocs/manual/server-wide.html.ja.jis share/httpd/htdocs/manual/sourcereorg.html share/httpd/htdocs/manual/stopping.html -share/httpd/htdocs/manual/suexec.html +share/httpd/htdocs/manual/stopping.html.fr +share/httpd/htdocs/manual/stopping.html.html +share/httpd/htdocs/manual/suexec.html.en +share/httpd/htdocs/manual/suexec.html.html +share/httpd/htdocs/manual/suexec.html.ja.jis share/httpd/htdocs/manual/suexec_1_2.html share/httpd/htdocs/manual/unixware.html share/httpd/htdocs/manual/upgrading_to_1_3.html |