diff options
author | tv <tv> | 1998-12-04 17:23:19 +0000 |
---|---|---|
committer | tv <tv> | 1998-12-04 17:23:19 +0000 |
commit | bb45b1084e12b18667eb75ec2a5a2f295bada7d9 (patch) | |
tree | 92c21f9ecbc91503eabca20253656ec9347f520b /www/apache | |
parent | 21f869002a61ee8d83913dda8b44a73b5a075d57 (diff) | |
download | pkgsrc-bb45b1084e12b18667eb75ec2a5a2f295bada7d9.tar.gz |
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.
Diffstat (limited to 'www/apache')
-rw-r--r-- | www/apache/Makefile | 6 | ||||
-rw-r--r-- | www/apache/files/ap_include_extern.h | 5 | ||||
-rw-r--r-- | www/apache/patches/patch-aa | 21 | ||||
-rw-r--r-- | www/apache/patches/patch-af | 8 | ||||
-rw-r--r-- | www/apache/patches/patch-ak | 14 |
5 files changed, 35 insertions, 19 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile index 7b30b3eae82..a7dc9147e0c 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 1998/12/03 22:26:52 tv Exp $ +# $NetBSD: Makefile,v 1.27 1998/12/04 17:23:19 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 @@ -9,7 +9,7 @@ # DISTNAME= apache_1.3.3 -PKGNAME= apache-1.3.3.1 +PKGNAME= apache-1.3.3.2 CATEGORIES= www MASTER_SITES= http://www.apache.org/dist/ \ http://www.engelschall.com/sw/mod_ssl/distrib/ \ @@ -21,7 +21,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= cjs@netbsd.org HOMEPAGE= http://www.apache.org/ -CONFLICTS= apache-1.3.[012] apache-*modssl-* +CONFLICTS= apache-1.3.[012] apache-*modssl-* apache-1.3.3.[01] SSL_DISTNAME= mod_ssl-2.1.2-1.3.3 diff --git a/www/apache/files/ap_include_extern.h b/www/apache/files/ap_include_extern.h index 6d820c47f8a..2e4c3d84918 100644 --- a/www/apache/files/ap_include_extern.h +++ b/www/apache/files/ap_include_extern.h @@ -1,4 +1,4 @@ -/* $NetBSD: ap_include_extern.h,v 1.2 1998/12/03 22:26:53 tv Exp $ */ +/* $NetBSD: ap_include_extern.h,v 1.3 1998/12/04 17:23:19 tv Exp $ */ /* ==================================================================== * Copyright (c) 1998 The Apache Group. All rights reserved. * @@ -67,7 +67,8 @@ * mod_include source code. */ -typedef int (*ap_include_extern_func)(FILE *, request_rec *, const char *); +typedef int (*ap_include_extern_func)(FILE *fp, request_rec *r, + const char *error, const char *timefmt); /* The const char * argument is the command word used to find this hook. */ API_EXPORT(int) ap_include_register_extern(const char *, ap_include_extern_func); 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 = ''; |