- 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

4 files changed, 48 insertions, 46 deletions

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 {