Update Apache package to version 1.3.9 (SSL Module 2.4.8) using patches

suppled by SUNAGAWA Keiki in PR pkg/8819. This version mostly fixes
bugs discovered since version 1.3.6.

5 files changed, 55 insertions, 69 deletions

diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa
index ebeb3fe22fe..1ee22e81ed0 100644
--- a/www/apache/patches/patch-aa
+++ b/www/apache/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.10 1999/05/07 13:46:43 tv Exp $
+$NetBSD: patch-aa,v 1.11 1999/11/21 22:09:28 tron Exp $
 
---- Makefile.tmpl.orig	Fri May  7 09:49:05 1999
-+++ Makefile.tmpl	Fri May  7 09:52: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@
-@@ -344,34 +344,6 @@
+--- Makefile.tmpl.orig	Mon Sep 27 18:03:16 1999
++++ Makefile.tmpl	Mon Sep 27 18:03:18 1999
+@@ -371,34 +371,6 @@
  			file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
  			echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
  			$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \
@@ -46,7 +37,7 @@ $NetBSD: patch-aa,v 1.10 1999/05/07 13:46:43 tv Exp $
  		done; \
  	fi
  	@echo "<=== [programs]"
-@@ -453,12 +425,13 @@
+@@ -524,12 +496,13 @@
  		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
  		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
  	fi
@@ -61,7 +52,7 @@ $NetBSD: patch-aa,v 1.10 1999/05/07 13:46:43 tv 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}; \
-@@ -475,7 +448,7 @@
+@@ -546,7 +519,7 @@
  #   and initial config files while preserving existing ones.
  install-config:
  	@echo "===> [config: Installing Apache configuration files]"
diff --git a/www/apache/patches/patch-af b/www/apache/patches/patch-af
index a89a8f7845c..9cb08f242d6 100644
--- a/www/apache/patches/patch-af
+++ b/www/apache/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.4 1998/12/07 16:20:40 tv Exp $
+$NetBSD: patch-af,v 1.5 1999/11/21 22:09:28 tron Exp $
 
---- src/modules/standard/mod_include.c.orig	Thu Sep 24 10:06:42 1998
-+++ src/modules/standard/mod_include.c	Mon Dec  7 11:17:39 1998
+--- src/modules/standard/mod_include.c.orig	Sat May 22 08:57:57 1999
++++ src/modules/standard/mod_include.c	Mon Oct  4 20:53:14 1999
 @@ -92,7 +92,11 @@
  #include "http_log.h"
  #include "http_main.h"
@@ -43,17 +43,18 @@ $NetBSD: patch-af,v 1.4 1998/12/07 16:20:40 tv Exp $
                      error_fmt = "unable to include file \"%s\" "
                          "in parsed file %s";
                  }
-@@ -1010,7 +1016,8 @@
-     int ret=0;
- 
-     if (!strcmp(tag, "file")) {
--        ap_getparents(tag_val);    /* get rid of any nasties */
-+	if (ap_allow_options(r) & OPT_INCNOEXEC)
-+	    ap_getparents(tag_val);    /* get rid of any nasties */
-         
-         rr = ap_sub_req_lookup_file(tag_val, r);
+@@ -1057,7 +1063,9 @@
+                         "in parsed file %s";
+         }
+         else {
+-            ap_getparents(tag_val);    /* get rid of any nasties */
++            if (ap_allow_options(r) & OPT_INCNOEXEC)
++               	ap_getparents(tag_val);    /* get rid of any nasties */
++
+             rr = ap_sub_req_lookup_file(tag_val, r);
  
-@@ -2090,6 +2097,16 @@
+             if (rr->status == HTTP_OK && rr->finfo.st_mode != 0) {
+@@ -2135,6 +2143,16 @@
      }
  }
  
@@ -70,7 +71,7 @@ $NetBSD: patch-af,v 1.4 1998/12/07 16:20:40 tv Exp $
  
  
  /* -------------------------- The main function --------------------------- */
-@@ -2214,6 +2231,13 @@
+@@ -2259,6 +2277,13 @@
              }
  #endif
              else {
@@ -82,5 +83,5 @@ $NetBSD: patch-af,v 1.4 1998/12/07 16:20:40 tv Exp $
 +		    continue;
 +
                  ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
-                             "httpd: unknown directive \"%s\" "
-                             "in parsed doc %s",
+ 			      "unknown directive \"%s\" "
+ 			      "in parsed doc %s",
diff --git a/www/apache/patches/patch-ag b/www/apache/patches/patch-ag
deleted file mode 100644
index e8d3973f363..00000000000
--- a/www/apache/patches/patch-ag
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ag,v 1.2 1999/04/30 17:05:20 tv 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/apache/patches/patch-ak b/www/apache/patches/patch-ak
index d223f973929..82b80df1085 100644
--- a/www/apache/patches/patch-ak
+++ b/www/apache/patches/patch-ak
@@ -1,14 +1,14 @@
-$NetBSD: patch-ak,v 1.1 1998/12/04 17:24:33 tv Exp $
+$NetBSD: patch-ak,v 1.2 1999/11/21 22:09:28 tron 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	Mon Sep 27 18:28:55 1999
++++ src/support/apxs.pl	Mon Sep 27 18:31:42 1999
+@@ -426,8 +426,7 @@
          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, "install -c -m 555 -o root -g wheel $f $CFG_LIBEXECDIR/$t");
+         }
  
          #   determine module symbolname and filename
-         my $filename = '';
diff --git a/www/apache/patches/patch-an b/www/apache/patches/patch-an
new file mode 100644
index 00000000000..7edc1a42b97
--- /dev/null
+++ b/www/apache/patches/patch-an
@@ -0,0 +1,23 @@
+$NetBSD: patch-an,v 1.1 1999/11/21 22:10:55 tron Exp $
+
+--- configure.orig	Mon Sep 27 18:50:00 1999
++++ configure	Mon Sep 27 18:50:09 1999
+@@ -395,6 +395,7 @@
+             echo " --mandir=DIR           install manual pages in DIR"
+             echo " --sysconfdir=DIR       install configuration files in DIR"
+             echo " --datadir=DIR          install read-only  data files in DIR"
++            echo " --cgidir=DIR           install cgi files in DIR"
+             echo " --includedir=DIR       install includes files in DIR"
+             echo " --localstatedir=DIR    install modifiable data files in DIR"
+             echo " --runtimedir=DIR       install runtime data in DIR"
+@@ -626,6 +627,10 @@
+         --datadir=*)       
+             datadir="$apc_optarg"       
+             autosuffix_datadir=no
++            ;;
++        --cgidir=*)       
++            cgidir="$apc_optarg"       
++            autosuffix_cgidir=no
+             ;;
+         --includedir=*)       
+             includedir="$apc_optarg"