- Update mod_ssl's distname to 2.1.3 (does not require an apache version

  bump; EAPI is unchanged)
- Remove restriction of mod_include to disallow "../" or "/" prefixed
  file names in <!--#include file=""--> if Includes (but not
  IncludesNOEXEC) is set; proposed in Apache PR mod_include/3500
- Add signature for hook function used to do mod_include callbacks
  (perl-embedded SSI was not working with new 4 argument call)

4 files changed, 49 insertions, 10 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index a7dc9147e0c..55daa8911c6 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 1998/12/04 17:23:19 tv Exp $
+# $NetBSD: Makefile,v 1.28 1998/12/07 16:20:39 tv 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
@@ -23,7 +23,7 @@ HOMEPAGE=		http://www.apache.org/
 
 CONFLICTS=		apache-1.3.[012] apache-*modssl-* apache-1.3.3.[01]
 
-SSL_DISTNAME=		mod_ssl-2.1.2-1.3.3
+SSL_DISTNAME=		mod_ssl-2.1.3-1.3.3
 
 EXTRACT_ONLY=		${DISTFILES:N*.gif}
 HAS_CONFIGURE=		YES
diff --git a/www/apache/files/md5 b/www/apache/files/md5
index 5c1cf827900..38194bdb0b3 100644
--- a/www/apache/files/md5
+++ b/www/apache/files/md5
@@ -1,5 +1,5 @@
-$NetBSD: md5,v 1.9 1998/12/03 17:23:52 tv Exp $
+$NetBSD: md5,v 1.10 1998/12/07 16:20:40 tv Exp $
 
 MD5 (apache_1.3.3.tar.gz) = bb6f14bbb369097a55969482d395d1ae
-MD5 (mod_ssl-2.1.2-1.3.3.tar.gz) = a054804ba2a895b1fc53727c9b52ce54
+MD5 (mod_ssl-2.1.3-1.3.3.tar.gz) = 76bd1f0d5f5c9623a71fea336312a753
 MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1
diff --git a/www/apache/patches/patch-af b/www/apache/patches/patch-af
index fa5913fdafd..a89a8f7845c 100644
--- a/www/apache/patches/patch-af
+++ b/www/apache/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.3 1998/12/04 17:23:20 tv Exp $
+$NetBSD: patch-af,v 1.4 1998/12/07 16:20:40 tv Exp $
 
 --- src/modules/standard/mod_include.c.orig	Thu Sep 24 10:06:42 1998
-+++ src/modules/standard/mod_include.c	Fri Dec  4 10:51:50 1998
++++ src/modules/standard/mod_include.c	Mon Dec  7 11:17:39 1998
 @@ -92,7 +92,11 @@
  #include "http_log.h"
  #include "http_main.h"
@@ -33,7 +33,27 @@ $NetBSD: patch-af,v 1.3 1998/12/04 17:23:20 tv Exp $
  			size_t length, int leave_name)
  {
      char ch;
-@@ -2090,6 +2095,16 @@
+@@ -666,7 +671,8 @@
+             parse_string(r, tag_val, parsed_string, sizeof(parsed_string), 0);
+             if (tag[0] == 'f') {
+                 /* be safe; only files in this directory or below allowed */
+-		if (!is_only_below(parsed_string)) {
++		if ((ap_allow_options(r) & OPT_INCNOEXEC) &&
++		    !is_only_below(parsed_string)) {
+                     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);
+ 
+@@ -2090,6 +2097,16 @@
      }
  }
  
@@ -42,7 +62,7 @@ $NetBSD: patch-af,v 1.3 1998/12/04 17:23:20 tv Exp $
 +    char cmdbuf[40] = "include::";
 +
 +    strncat(cmdbuf, cmd, 30);
-+    ap_hook_configure(cmdbuf, AP_HOOK_SIG5(int,ptr,ptr,ptr,ptr), AP_HOOK_DECLINE(-32767));
++    ap_hook_configure(cmdbuf, AP_HOOK_SIG5(int,ptr,ptr,ptr,ptr), AP_HOOK_TOPMOST);
 +    ap_hook_register(cmdbuf, func, NULL);
 +
 +    return 0;
@@ -50,14 +70,15 @@ $NetBSD: patch-af,v 1.3 1998/12/04 17:23:20 tv Exp $
  
  
  /* -------------------------- The main function --------------------------- */
-@@ -2214,6 +2229,12 @@
+@@ -2214,6 +2231,13 @@
              }
  #endif
              else {
 +		char cmdbuf[40] = "include::";
 +
 +		strncat(cmdbuf, directive, 30);
-+		if (ap_hook_call(cmdbuf, &ret, f, r, error, timefmt) == TRUE)
++		if ((ap_hook_status(cmdbuf) >= AP_HOOK_STATE_CONFIGURED) &&
++		    (ap_hook_call(cmdbuf, &ret, f, r, error, timefmt) == TRUE))
 +		    continue;
 +
                  ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
diff --git a/www/apache/patches/patch-am b/www/apache/patches/patch-am
new file mode 100644
index 00000000000..1461df8a604
--- /dev/null
+++ b/www/apache/patches/patch-am
@@ -0,0 +1,18 @@
+--- src/ap/ap_hook.c.orig	Mon Dec  7 10:31:53 1998
++++ src/ap/ap_hook.c	Mon Dec  7 10:32:48 1998
+@@ -705,6 +705,15 @@
+         *((int *)v_rc) = ((int(*)(void *, void *, void *, int))(hf->hf_ptr))(v1, v2, v3, v4);
+         rc = (*((int *)v_rc) != he->he_modeval.v_int);
+     }
++    else if (he->he_sig == AP_HOOK_SIG5(int, ptr, ptr, ptr, ptr)) {
++        /* Call: int func(ptr,ptr,ptr,int) */
++        void *v1 = va_arg(ap, va_type(ptr));
++        void *v2 = va_arg(ap, va_type(ptr));
++        void *v3 = va_arg(ap, va_type(ptr));
++        void *v4 = va_arg(ap, va_type(ptr));
++        *((int *)v_rc) = ((int(*)(void *, void *, void *, void *))(hf->hf_ptr))(v1, v2, v3, v4);
++        rc = (*((int *)v_rc) != he->he_modeval.v_int);
++    }
+     else if (he->he_sig == AP_HOOK_SIG6(int, ptr, ptr, ptr, ptr, int)) {
+         /* Call: int func(ptr,ptr,ptr,ptr,int) */
+         void *v1 = va_arg(ap, va_type(ptr));