Bump version to `1.3.3.2' - add `timefmt' argument to

ap_include_extern_func's (needed for a couple upcoming XSSI-extending
modules).  Also fix apxs to use `install' and fix the cgi-bin
`preservation' while we're here.

3 files changed, 29 insertions, 14 deletions

diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa
index 5b2b98df384..5891deb6c58 100644
--- a/www/apache/patches/patch-aa
+++ b/www/apache/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.6 1998/12/03 17:23:52 tv Exp $
+$NetBSD: patch-aa,v 1.7 1998/12/04 17:23:20 tv Exp $
 
---- Makefile.tmpl.orig	Thu Dec  3 07:42:35 1998
-+++ Makefile.tmpl	Thu Dec  3 08:22:10 1998
+--- Makefile.tmpl.orig	Fri Dec  4 11:41:42 1998
++++ Makefile.tmpl	Fri Dec  4 11:47:53 1998
 @@ -275,7 +275,7 @@
  	$(MKDIR) $(root)$(sysconfdir)/ssl.key
  	$(MKDIR) $(root)$(datadir)/htdocs
@@ -19,27 +19,28 @@ $NetBSD: patch-aa,v 1.6 1998/12/03 17:23:52 tv Exp $
  		< $(TOP)/$(SRC)/support/apachectl > $(TOP)/$(SRC)/.apaci.install.tmp && \
  		$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sbindir)/apachectl
  	$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.1 $(root)$(mandir)/man1/apachectl.1
-@@ -413,15 +414,15 @@
+@@ -413,17 +414,13 @@
  		find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \
  		find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \
  	fi
 -	-@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
 -		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
-+	-@if [ -f $(root)$(prefix)/libexec/cgi-bin/printenv ]; then \
-+		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(prefix)/libexec/cgi-bin/]"; \
- 	else \
+-	else \
  		for script in printenv test-cgi; do \
  			cat $(TOP)/cgi-bin/$${script} |\
  			sed -e 's;^#!/.*perl;#!$(PERL);' \
          		> $(TOP)/$(SRC)/.apaci.install.tmp; \
 -			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin/$${script}"; \
 -			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \
+-		done; \
+-	fi
 +			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(prefix)/libexec/cgi-bin/$${script}"; \
 +			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(prefix)/libexec/cgi-bin/$${script}; \
- 		done; \
- 	fi
++		done;
  	@echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
-@@ -450,7 +451,7 @@
+ 	(cd $(TOP)/icons/ && $(TAR) cf - *) |\
+ 	(cd $(root)$(datadir)/icons/ && $(TAR) xf -); \
+@@ -450,7 +447,7 @@
  			-e 's;@@ServerRoot@@/conf/ssl.key;$(sysconfdir)/ssl.key;' \
  			-e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
  			-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
diff --git a/www/apache/patches/patch-af b/www/apache/patches/patch-af
index b16c6c88b6c..fa5913fdafd 100644
--- a/www/apache/patches/patch-af
+++ b/www/apache/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.2 1998/12/03 22:26:53 tv Exp $
+$NetBSD: patch-af,v 1.3 1998/12/04 17:23:20 tv Exp $
 
 --- src/modules/standard/mod_include.c.orig	Thu Sep 24 10:06:42 1998
-+++ src/modules/standard/mod_include.c	Thu Dec  3 17:24:12 1998
++++ src/modules/standard/mod_include.c	Fri Dec  4 10:51:50 1998
 @@ -92,7 +92,11 @@
  #include "http_log.h"
  #include "http_main.h"
@@ -42,7 +42,7 @@ $NetBSD: patch-af,v 1.2 1998/12/03 22:26:53 tv Exp $
 +    char cmdbuf[40] = "include::";
 +
 +    strncat(cmdbuf, cmd, 30);
-+    ap_hook_configure(cmdbuf, AP_HOOK_SIG4(int,ptr,ptr,ptr), AP_HOOK_DECLINE(-32767));
++    ap_hook_configure(cmdbuf, AP_HOOK_SIG5(int,ptr,ptr,ptr,ptr), AP_HOOK_DECLINE(-32767));
 +    ap_hook_register(cmdbuf, func, NULL);
 +
 +    return 0;
@@ -57,7 +57,7 @@ $NetBSD: patch-af,v 1.2 1998/12/03 22:26:53 tv Exp $
 +		char cmdbuf[40] = "include::";
 +
 +		strncat(cmdbuf, directive, 30);
-+		if (ap_hook_call(cmdbuf, &ret, f, r, error) == TRUE)
++		if (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-ak b/www/apache/patches/patch-ak
new file mode 100644
index 00000000000..d223f973929
--- /dev/null
+++ b/www/apache/patches/patch-ak
@@ -0,0 +1,14 @@
+$NetBSD: patch-ak,v 1.1 1998/12/04 17:24:33 tv 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 @@
+         }
+         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");
+ 
+         #   determine module symbolname and filename
+         my $filename = '';