upgrade apache original version to 1.3.9.

use latest IPv6 patch from ftp://ftp.kame.net/pub/kame/misc/.

fixes PR: 8307

8 files changed, 72 insertions, 70 deletions

diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 944e5670815..a02648bd451 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/08/18 09:24:09 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/09/01 07:41:01 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.6
-PKGNAME=		apache6-1.3.6p0
+DISTNAME=		apache_1.3.9
+PKGNAME=		apache6-1.3.9
 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-136-v6-19990724.diff.gz
+PATCHFILES=		apache-139-v6-19990901a.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		itojun@itojun.org
diff --git a/www/apache6/files/md5 b/www/apache6/files/md5
index fa1d4167dfc..d2cd8239c52 100644
--- a/www/apache6/files/md5
+++ b/www/apache6/files/md5
@@ -1,5 +1,5 @@
-$NetBSD: md5,v 1.2 1999/07/23 18:19:30 itojun Exp $
+$NetBSD: md5,v 1.3 1999/09/01 07:41:02 itojun Exp $
 
-MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
+MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32
 MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1
-MD5 (apache-136-v6-19990724.diff.gz) = cab405b60a916219f90bd048a2078616
+MD5 (apache-139-v6-19990901a.diff.gz) = 64fea82095fbc58a5367551f9e686483
diff --git a/www/apache6/files/patch-sum b/www/apache6/files/patch-sum
index cfcf6615109..27fa42613f1 100644
--- a/www/apache6/files/patch-sum
+++ b/www/apache6/files/patch-sum
@@ -1,10 +1,10 @@
-$NetBSD: patch-sum,v 1.2 1999/07/23 18:19:30 itojun Exp $
+$NetBSD: patch-sum,v 1.3 1999/09/01 07:41:02 itojun Exp $
 
-MD5 (patch-aa) = 89c66d7772eb6f558198d9efc0fd58e9
+MD5 (patch-aa) = 7cdc55b80eb5389605960973c6c888ad
 MD5 (patch-ab) = 4b835238ed8e929366119786655a0ffc
 MD5 (patch-ae) = 2cd742f756f4cf2b9aa420ece607b069
-MD5 (patch-ag) = 05d7657a8048c3d64ce4843af547479b
 MD5 (patch-ah) = c3e3a232e0c5028a15dea4473bf39955
 MD5 (patch-aj) = e4878583ffc2957e50c25d3d22d1d4db
-MD5 (patch-ak) = 789f4a45ea6f9ee5b739db378326b3de
+MD5 (patch-ak) = f025ef3f85f08ba8374148f3dcc0eccf
 MD5 (patch-al) = 392b4228824401ad7d1676d2054fa1d6
+MD5 (patch-am) = 06fcd06d209d53e87b02e94707bdd21c
diff --git a/www/apache6/patches/patch-aa b/www/apache6/patches/patch-aa
index 8df3e0e0edf..3bc1d500390 100644
--- a/www/apache6/patches/patch-aa
+++ b/www/apache6/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.2 1999/07/23 18:19:30 itojun Exp $
+$NetBSD: patch-aa,v 1.3 1999/09/01 07:41:03 itojun Exp $
 
---- Makefile.tmpl.orig	Mon Mar 15 16:38:46 1999
-+++ Makefile.tmpl	Fri Jul 23 10:07:16 1999
-@@ -114,7 +114,7 @@
- datadir         = @datadir@
- iconsdir        = $(datadir)/icons
- htdocsdir       = $(datadir)/htdocs
--cgidir          = $(datadir)/cgi-bin
-+cgidir          = $(prefix)/libexec/cgi-bin
- includedir      = @includedir@
- localstatedir   = @localstatedir@
- runtimedir      = @runtimedir@
-@@ -388,12 +388,13 @@
+--- Makefile.tmpl.orig	Thu Aug 12 23:58:18 1999
++++ Makefile.tmpl	Wed Sep  1 00:08:27 1999
+@@ -450,12 +450,13 @@
  		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
  		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
  	fi
@@ -26,7 +17,7 @@ $NetBSD: patch-aa,v 1.2 1999/07/23 18:19:30 itojun Exp $
  			> $(TOP)/$(SRC)/.apaci.install.tmp; \
  			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
  			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
-@@ -410,7 +411,7 @@
+@@ -472,7 +473,7 @@
  #   and initial config files while preserving existing ones.
  install-config:
  	@echo "===> [config: Installing Apache configuration files]"
diff --git a/www/apache6/patches/patch-ag b/www/apache6/patches/patch-ag
deleted file mode 100644
index 13eb9523c64..00000000000
--- a/www/apache6/patches/patch-ag
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
-
---- src/Configure.orig	Mon Apr 26 14:34:33 1999
-+++ src/Configure	Mon Apr 26 15:10:13 1999
-@@ -974,16 +974,15 @@
- 	    LDFLAGS_SHLIB_EXPORT=""
- 	    SHLIB_SUFFIX_DEPTH=2
- 	    ;;
--	alpha-*-netbsd*|mips-*-netbsd*|powerpc-*-netbsd*)
--	    CFLAGS_SHLIB="-fpic -DPIC"
--	    LDFLAGS_SHLIB="-shared"
--	    LDFLAGS_SHLIB_EXPORT=""
--	    SHLIB_SUFFIX_DEPTH=2
--	    ;;
- 	*-netbsd*)
--	    CFLAGS_SHLIB="-fpic -DPIC"
--	    LDFLAGS_SHLIB="-Bshareable"
--	    LDFLAGS_SHLIB_EXPORT=""
-+	    CFLAGS_SHLIB="-fPIC -DPIC"
-+	    if echo __ELF__ | ${CC} -E - | grep -q __ELF__; then
-+		LDFLAGS_SHLIB="-Bshareable"
-+		LDFLAGS_SHLIB_EXPORT=""
-+	    else
-+		LDFLAGS_SHLIB="-shared"
-+		LDFLAGS_SHLIB_EXPORT="-Wl,-E"
-+	    fi
- 	    SHLIB_SUFFIX_DEPTH=2
- 	    ;;
- 	*-bsdi)
diff --git a/www/apache6/patches/patch-ak b/www/apache6/patches/patch-ak
index a96f47f312d..f1b192acb6f 100644
--- a/www/apache6/patches/patch-ak
+++ b/www/apache6/patches/patch-ak
@@ -1,14 +1,16 @@
-$NetBSD: patch-ak,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+$NetBSD: patch-ak,v 1.2 1999/09/01 07:41:03 itojun Exp $
 
---- src/support/apxs.pl.orig	Fri Dec  4 11:34:17 1998
-+++ src/support/apxs.pl	Fri Dec  4 11:36:26 1998
-@@ -383,8 +383,7 @@
-         }
+--- src/support/apxs.pl.orig	Sat Jul 24 11:05:02 1999
++++ src/support/apxs.pl	Wed Sep  1 00:06:50 1999
+@@ -426,8 +426,9 @@
          my $t = $f;
          $t =~ s|^.+/([^/]+)$|$1|;
--        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");
+         if ($opt_i) {
+-	    push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
+-	    push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
++#	    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
-         my $filename = '';
diff --git a/www/apache6/patches/patch-am b/www/apache6/patches/patch-am
new file mode 100644
index 00000000000..71a3fb0ecde
--- /dev/null
+++ b/www/apache6/patches/patch-am
@@ -0,0 +1,22 @@
+$NetBSD: patch-am,v 1.3 1999/09/01 07:41:03 itojun Exp $
+
+--- config.layout.orig	Thu Jul 29 11:12:43 1999
++++ config.layout	Wed Sep  1 00:21:55 1999
+@@ -21,7 +21,7 @@
+     datadir:       $prefix
+     iconsdir:      $datadir/icons
+     htdocsdir:     $datadir/htdocs
+-    cgidir:        $datadir/cgi-bin
++    cgidir:        $prefix/libexec/cgi-bin
+     includedir:    $prefix/include
+     localstatedir: $prefix
+     runtimedir:    $localstatedir/logs
+@@ -42,7 +42,7 @@
+     datadir:       $prefix/share+
+     iconsdir:      $datadir/icons
+     htdocsdir:     $datadir/htdocs
+-    cgidir:        $datadir/cgi-bin
++    cgidir:        $prefix/libexec/cgi-bin
+     includedir:    $prefix/include+
+     localstatedir: $prefix/var+
+     runtimedir:    $localstatedir/run
diff --git a/www/apache6/pkg/PLIST b/www/apache6/pkg/PLIST
index 7bb593ac851..943f7c2e295 100644
--- a/www/apache6/pkg/PLIST
+++ b/www/apache6/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1999/07/23 18:19:31 itojun Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/09/01 07:41:04 itojun Exp $
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
@@ -20,6 +20,7 @@ include/httpd/ap_ctype.h
 @comment include/httpd/ap_include_extern.h
 include/httpd/ap_md5.h
 include/httpd/ap_mmn.h
+include/httpd/ap_sha1.h
 include/httpd/buff.h
 include/httpd/compat.h
 include/httpd/conf.h
@@ -36,14 +37,26 @@ include/httpd/http_request.h
 include/httpd/http_vhost.h
 include/httpd/httpd.h
 include/httpd/multithread.h
-include/httpd/os.h
 include/httpd/os-inline.c
+include/httpd/os.h
 include/httpd/rfc1413.h
 include/httpd/scoreboard.h
 include/httpd/util_date.h
 include/httpd/util_md5.h
 include/httpd/util_script.h
 include/httpd/util_uri.h
+include/httpd/xml/asciitab.h
+include/httpd/xml/hashtable.h
+include/httpd/xml/iasciitab.h
+include/httpd/xml/latin1tab.h
+include/httpd/xml/nametab.h
+include/httpd/xml/utf8tab.h
+include/httpd/xml/xmldef.h
+include/httpd/xml/xmlparse.h
+include/httpd/xml/xmlrole.h
+include/httpd/xml/xmltok.h
+include/httpd/xml/xmltok_impl.h
+lib/httpd/httpd.exp
 lib/httpd/mod_proxy.so
 libexec/cgi-bin/printenv
 libexec/cgi-bin/test-cgi
@@ -127,6 +140,7 @@ share/httpd/htdocs/manual/mod/mod_auth.html
 share/httpd/htdocs/manual/mod/mod_auth_anon.html
 share/httpd/htdocs/manual/mod/mod_auth_db.html
 share/httpd/htdocs/manual/mod/mod_auth_dbm.html
+share/httpd/htdocs/manual/mod/mod_auth_digest.html
 share/httpd/htdocs/manual/mod/mod_autoindex.html
 share/httpd/htdocs/manual/mod/mod_browser.html
 share/httpd/htdocs/manual/mod/mod_cern_meta.html
@@ -161,6 +175,7 @@ share/httpd/htdocs/manual/mod/mod_status.html
 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/multilogs.html
 share/httpd/htdocs/manual/new_features_1_0.html
 share/httpd/htdocs/manual/new_features_1_1.html
@@ -300,12 +315,13 @@ share/httpd/icons/uu.gif
 share/httpd/icons/uuencoded.gif
 share/httpd/icons/world1.gif
 share/httpd/icons/world2.gif
-@exec mkdir -p /var/log/httpd /var/spool/httpd/proxy %D/lib/httpd %D/etc/httpd/ssl.crt %D/etc/httpd/ssl.csr %D/etc/httpd/ssl.key
-@unexec rmdir /var/log/httpd /var/spool/httpd/proxy /var/spool/httpd 2>/dev/null || true
-@dirrm etc/httpd/ssl.crt
-@dirrm etc/httpd/ssl.csr
-@dirrm etc/httpd/ssl.key
+@comment @exec mkdir -p /var/log/httpd /var/spool/httpd/proxy %D/lib/httpd %D/etc/httpd/ssl.crt %D/etc/httpd/ssl.csr %D/etc/httpd/ssl.key
+@comment @unexec rmdir /var/log/httpd /var/spool/httpd/proxy /var/spool/httpd 2>/dev/null || true
+@comment @dirrm etc/httpd/ssl.crt
+@comment @dirrm etc/httpd/ssl.csr
+@comment @dirrm etc/httpd/ssl.key
 @unexec rmdir %D/etc/httpd 2>/dev/null || true
+@dirrm include/httpd/xml
 @dirrm include/httpd
 @dirrm lib/httpd
 @dirrm libexec/cgi-bin