From a29e7d6317bc6121ef716556ac8bf43ad3a890f6 Mon Sep 17 00:00:00 2001 From: jlam Date: Tue, 12 Sep 2000 14:17:31 +0000 Subject: Update build to work with mod_ssl-2.6.6-1.3.12 to keep in sync with ap-ssl. EAPI didn't change so no need to change Apache's version number. Also standardize package builds to have Apache listen on ports 80/443 regardless of UID of user that builds the package, and make MAINTAINER point to me. --- www/apache/Makefile | 14 +++--- www/apache/files/md5 | 4 +- www/apache/files/patch-sum | 20 ++++----- www/apache/patches/patch-aa | 12 ++--- www/apache/patches/patch-ab | 56 +++++++++--------------- www/apache/patches/patch-ac | 38 ++++++++++++++++ www/apache/patches/patch-ad | 20 +++++++++ www/apache/patches/patch-ae | 99 +++++++++++++++++++++++++++++++++++------ www/apache/patches/patch-af | 104 ++++++++------------------------------------ www/apache/patches/patch-ag | 18 ++++++++ www/apache/patches/patch-ah | 26 +++++------ www/apache/patches/patch-ai | 14 ++++++ www/apache/patches/patch-aj | 22 ---------- www/apache/patches/patch-ak | 14 ------ www/apache/patches/patch-al | 13 ------ www/apache/patches/patch-am | 20 --------- 16 files changed, 255 insertions(+), 239 deletions(-) create mode 100644 www/apache/patches/patch-ac create mode 100644 www/apache/patches/patch-ad create mode 100644 www/apache/patches/patch-ag create mode 100644 www/apache/patches/patch-ai delete mode 100644 www/apache/patches/patch-aj delete mode 100644 www/apache/patches/patch-ak delete mode 100644 www/apache/patches/patch-al delete mode 100644 www/apache/patches/patch-am (limited to 'www/apache') diff --git a/www/apache/Makefile b/www/apache/Makefile index cac1c4e8bf3..ccc979237b2 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2000/09/06 06:17:55 jlam Exp $ +# $NetBSD: Makefile,v 1.49 2000/09/12 14:17:31 jlam 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 @@ -17,12 +17,12 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${SSL_DISTNAME}${EXTRACT_SUFX} \ sitedrivenby.gif -MAINTAINER= tron@netbsd.org +MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.apache.org/ CONFLICTS= apache-*modssl-* apache6-* -SSL_DISTNAME= mod_ssl-2.6.3-1.3.12 +SSL_DISTNAME= mod_ssl-2.6.6-1.3.12 EXTRACT_ONLY= ${DISTFILES:N*.gif} HAS_CONFIGURE= # defined @@ -37,6 +37,7 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} --libexecdir=${PREFIX}/lib/httpd \ CONFIGURE_ARGS+= --enable-rule=EAPI --enable-module=most \ --disable-module=ssl --enable-module=auth_db \ --disable-module=auth_dbm +CONFIGURE_ARGS+= --with-port=80 CONFIGURE_ARGS+= --with-perl=${PERL5} CONFIGURE_ENV+= OPTIM="${OPTIM}" @@ -47,10 +48,13 @@ SUEXEC_PATH= /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin CONFIGURE_ARGS+= --enable-suexec --suexec-caller=www \ --suexec-safepath='${SUEXEC_PATH}' PLIST_SRC= ${PKGDIR}/PLIST.suexec +.else +CONFIGURE_ARGS+= --disable-suexec .endif .if !defined(NOPIC) -CONFIGURE_ARGS+= --enable-module=so --enable-shared=proxy +CONFIGURE_ARGS+= --enable-module=so # requires dlopen() +CONFIGURE_ARGS+= --enable-shared=proxy PLIST_SRC+= ${PKGDIR}/PLIST.shared .else CONFIGURE_ARGS+= --disable-module=proxy @@ -88,7 +92,7 @@ pre-patch: ${WRKDIR}/${SSL_DISTNAME}/pkg.sslmod/sslmod.patch \ ${WRKDIR}/${SSL_DISTNAME}/pkg.sslsup/sslsup.patch \ | ${PATCH} ${PATCH_ARGS} - cd ${WRKSRC} && ${TAIL} +156 \ + cd ${WRKSRC} && ${TAIL} +148 \ ${WRKDIR}/${SSL_DISTNAME}/pkg.ssldoc/ssldoc.patch \ | ${PATCH} ${PATCH_ARGS} diff --git a/www/apache/files/md5 b/www/apache/files/md5 index 47adccbbdbe..32784ab260a 100644 --- a/www/apache/files/md5 +++ b/www/apache/files/md5 @@ -1,5 +1,5 @@ -$NetBSD: md5,v 1.14 2000/04/21 02:16:23 explorer Exp $ +$NetBSD: md5,v 1.15 2000/09/12 14:17:32 jlam Exp $ MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2 -MD5 (mod_ssl-2.6.3-1.3.12.tar.gz) = b66b034d91079dcc7749de8f7ab98573 +MD5 (mod_ssl-2.6.6-1.3.12.tar.gz) = 573b4d89c1f203216a55fb5c2aece009 MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1 diff --git a/www/apache/files/patch-sum b/www/apache/files/patch-sum index f63c87637ef..e7f1e659db3 100644 --- a/www/apache/files/patch-sum +++ b/www/apache/files/patch-sum @@ -1,11 +1,11 @@ -$NetBSD: patch-sum,v 1.8 2000/09/06 05:52:48 jlam Exp $ +$NetBSD: patch-sum,v 1.9 2000/09/12 14:17:32 jlam Exp $ -MD5 (patch-aa) = bc5b9953696e7f125962e96bb68ef49c -MD5 (patch-ab) = e69e8ebe30b31b5f5846123dc7d8c035 -MD5 (patch-ae) = 2cd742f756f4cf2b9aa420ece607b069 -MD5 (patch-af) = ef50e09f4691dd62b0671761f1a864c4 -MD5 (patch-ah) = 84442daefda2e2afc68caf6c41daaffa -MD5 (patch-aj) = 6eb62fe34fd7cf71cfb57347f066815d -MD5 (patch-ak) = 856c246b3484e181f1f64b59113acaf6 -MD5 (patch-al) = e5472cc7cfcf3f01b311204311870c21 -MD5 (patch-am) = 1ecf62d9594b2ca51e291096443dfbb2 +MD5 (patch-aa) = 0051d044e6e1c4a6cdfd793d8b69ffb6 +MD5 (patch-ab) = e14fea44aad40628c7aaad9f0cf60d82 +MD5 (patch-ac) = cba94ba78c7fe69e4016bdf7ba1902c8 +MD5 (patch-ad) = 40f2b9c12d7ef36bbc842480af61b833 +MD5 (patch-ae) = 7e394585ccd02038ce16484fd9b0e8c9 +MD5 (patch-af) = 40600e577259ca9afc36f1ff2aa1a9f9 +MD5 (patch-ag) = 6c7b5fd3185385e0b5309cb707516d18 +MD5 (patch-ah) = e27e529142e5ee6fc1be0f965e5510e0 +MD5 (patch-ai) = 650417c389d59a1e5b9aa4fcf611093d diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa index 1ee22e81ed0..609648fedbd 100644 --- a/www/apache/patches/patch-aa +++ b/www/apache/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.11 1999/11/21 22:09:28 tron Exp $ +$NetBSD: patch-aa,v 1.12 2000/09/12 14:17:32 jlam Exp $ ---- Makefile.tmpl.orig Mon Sep 27 18:03:16 1999 -+++ Makefile.tmpl Mon Sep 27 18:03:18 1999 -@@ -371,34 +371,6 @@ +--- Makefile.tmpl.orig Thu Sep 7 01:19:50 2000 ++++ Makefile.tmpl +@@ -382,34 +382,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}; \ @@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.11 1999/11/21 22:09:28 tron Exp $ done; \ fi @echo "<=== [programs]" -@@ -524,12 +496,13 @@ +@@ -535,12 +507,13 @@ find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \ find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \ fi @@ -52,7 +52,7 @@ $NetBSD: patch-aa,v 1.11 1999/11/21 22:09:28 tron 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}; \ -@@ -546,7 +519,7 @@ +@@ -557,7 +530,7 @@ # and initial config files while preserving existing ones. install-config: @echo "===> [config: Installing Apache configuration files]" diff --git a/www/apache/patches/patch-ab b/www/apache/patches/patch-ab index f632938757a..baba26c38fc 100644 --- a/www/apache/patches/patch-ab +++ b/www/apache/patches/patch-ab @@ -1,38 +1,22 @@ -$NetBSD: patch-ab,v 1.6 2000/01/31 16:35:37 christos Exp $ +$NetBSD: patch-ab,v 1.7 2000/09/12 14:17:32 jlam Exp $ ---- htdocs/index.html.en.orig Sat Nov 20 16:29:40 1999 -+++ htdocs/index.html.en Sun Jan 30 17:00:58 2000 -@@ -28,11 +28,29 @@ +--- conf/httpd.conf-dist.orig Thu Sep 7 01:19:50 2000 ++++ conf/httpd.conf-dist +@@ -199,7 +199,16 @@ + # the order below without expert advice. + # + # Example: +-# LoadModule foo_module libexec/mod_foo.so ++# LoadModule foo_module lib/httpd/mod_foo.so ++ ++ ++### Uncomment the following if you wish to use SSL and you need RSAREF: ### ++#LoadFile !librsaref.so ++LoadFile !libcrypto.so ++LoadFile !libssl.so ++LoadModule ssl_module lib/httpd/mod_ssl.so ++AddModule mod_ssl.c ++ - -

--The Apache documentation has been included with this distribution. -- -+The Apache documentation -+has been included with this distribution.
-+If the mod_ssl SSL extension has been installed, read the -+SSL documentation -+carefully. -+

-+

-+Information on the NetBSD multiplatform operating system can be found -+at NetBSD's homepage on the net. -+

-

--You are free to use the image below on an Apache-powered web server. Thanks for using Apache! -+The Webmaster of this site is free to use the images below on -+an Apache/NetBSD-powered Web server. Thanks for using -+Apache on -+NetBSD! -+

- --
-+
-+ -+Site driven by NetBSD - NetBSD rocks! -+
- - + # + # ExtendedStatus controls whether Apache will generate "full" status diff --git a/www/apache/patches/patch-ac b/www/apache/patches/patch-ac new file mode 100644 index 00000000000..03a4f9c92ec --- /dev/null +++ b/www/apache/patches/patch-ac @@ -0,0 +1,38 @@ +$NetBSD: patch-ac,v 1.3 2000/09/12 14:17:32 jlam Exp $ + +--- htdocs/index.html.en.orig Sat Nov 20 16:29:40 1999 ++++ htdocs/index.html.en +@@ -28,11 +28,29 @@ + + +

+-The Apache documentation has been included with this distribution. +- ++The Apache documentation ++has been included with this distribution.
++If the mod_ssl SSL extension has been installed, read the ++SSL documentation ++carefully. ++

++

++Information on the NetBSD multiplatform operating system can be found ++at NetBSD's homepage on the net. ++

+

+-You are free to use the image below on an Apache-powered web server. Thanks for using Apache! ++The Webmaster of this site is free to use the images below on ++an Apache/NetBSD-powered Web server. Thanks for using ++Apache on ++NetBSD! ++

+ +-
++
++ ++Site driven by NetBSD - NetBSD rocks! ++
+ + diff --git a/www/apache/patches/patch-ad b/www/apache/patches/patch-ad new file mode 100644 index 00000000000..d589b0b653c --- /dev/null +++ b/www/apache/patches/patch-ad @@ -0,0 +1,20 @@ +$NetBSD: patch-ad,v 1.5 2000/09/12 14:17:32 jlam Exp $ + +--- src/ap/ap_hook.c.orig Thu Sep 7 01:19:46 2000 ++++ src/ap/ap_hook.c +@@ -740,6 +740,15 @@ + *((int *)v_rc) = ((int(*)(void *, void *, void *, int, void *))(hf->hf_ptr))(v1, v2, v3, v4, v5); + 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,ptr) */ ++ 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)); diff --git a/www/apache/patches/patch-ae b/www/apache/patches/patch-ae index c62896b6ab3..eed25315c3a 100644 --- a/www/apache/patches/patch-ae +++ b/www/apache/patches/patch-ae @@ -1,14 +1,87 @@ -$NetBSD: patch-ae,v 1.1 1998/12/03 17:23:53 tv Exp $ +$NetBSD: patch-ae,v 1.2 2000/09/12 14:17:32 jlam Exp $ ---- src/support/apachectl.orig Thu Dec 3 08:23:16 1998 -+++ src/support/apachectl Thu Dec 3 08:23:49 1998 -@@ -27,6 +27,9 @@ - # the path to your httpd binary, including options if necessary - HTTPD='/usr/local/apache/src/httpd' - # -+# shared object search path -+LD_LIBRARY_PATH= -+export LD_LIBRARY_PATH - # a command that outputs a formatted text version of the HTML at the - # url given on the command line. Designed for lynx, however other - # programs may work. +--- src/modules/standard/mod_include.c.orig Wed Feb 2 15:44:03 2000 ++++ src/modules/standard/mod_include.c +@@ -92,7 +92,11 @@ + #include "http_log.h" + #include "http_main.h" + #include "util_script.h" ++#include "ap_include_extern.h" ++#include "ap_hook.h" + #endif ++#define get_tag ap_include_get_tag ++#define parse_string ap_include_parse_string + + #define STARTING_SEQUENCE "" +@@ -351,7 +355,8 @@ + * the tag value is html decoded if dodecode is non-zero + */ + +-static char *get_tag(pool *p, FILE *in, char *tag, int tagbuf_len, int dodecode) ++API_EXPORT(char *) ++ap_include_get_tag(pool *p, FILE *in, char *tag, int tagbuf_len, int dodecode) + { + char *t = tag, *tag_val, c, term; + +@@ -470,7 +475,7 @@ + /* + * Do variable substitution on strings + */ +-static void parse_string(request_rec *r, const char *in, char *out, ++API_EXPORT(void) ap_include_parse_string(request_rec *r, const char *in, char *out, + size_t length, int leave_name) + { + char ch; +@@ -663,7 +668,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"; + } +@@ -1075,7 +1081,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); + + if (rr->status == HTTP_OK && rr->finfo.st_mode != 0) { +@@ -2154,6 +2162,16 @@ + } + } + ++API_EXPORT(int) ++ap_include_register_extern(const char *cmd, ap_include_extern_func func) { ++ char cmdbuf[40] = "include::"; ++ ++ strncat(cmdbuf, cmd, 30); ++ ap_hook_configure(cmdbuf, AP_HOOK_SIG5(int,ptr,ptr,ptr,ptr), AP_HOOK_TOPMOST); ++ ap_hook_register(cmdbuf, func, NULL); ++ ++ return 0; ++} + + + /* -------------------------- The main function --------------------------- */ +@@ -2278,6 +2296,13 @@ + } + #endif + else { ++ char cmdbuf[40] = "include::"; ++ ++ strncat(cmdbuf, directive, 30); ++ 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, + "unknown directive \"%s\" " + "in parsed doc %s", diff --git a/www/apache/patches/patch-af b/www/apache/patches/patch-af index 9cb08f242d6..a9ac584adb2 100644 --- a/www/apache/patches/patch-af +++ b/www/apache/patches/patch-af @@ -1,87 +1,21 @@ -$NetBSD: patch-af,v 1.5 1999/11/21 22:09:28 tron Exp $ +$NetBSD: patch-af,v 1.6 2000/09/12 14:17:32 jlam Exp $ ---- 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" - #include "util_script.h" -+#include "ap_include_extern.h" -+#include "ap_hook.h" - #endif -+#define get_tag ap_include_get_tag -+#define parse_string ap_include_parse_string +--- src/modules/standard/mod_so.c.orig Thu Sep 7 01:28:46 2000 ++++ src/modules/standard/mod_so.c +@@ -307,7 +307,15 @@ + ap_os_dso_handle_t handle; + char *file; - #define STARTING_SEQUENCE "" -@@ -354,7 +358,8 @@ - * the tag value is html decoded if dodecode is non-zero - */ - --static char *get_tag(pool *p, FILE *in, char *tag, int tagbuf_len, int dodecode) -+API_EXPORT(char *) -+ap_include_get_tag(pool *p, FILE *in, char *tag, int tagbuf_len, int dodecode) - { - char *t = tag, *tag_val, c, term; - -@@ -473,7 +478,7 @@ - /* - * Do variable substitution on strings - */ --static void parse_string(request_rec *r, const char *in, char *out, -+API_EXPORT(void) ap_include_parse_string(request_rec *r, const char *in, char *out, - size_t length, int leave_name) - { - char ch; -@@ -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"; - } -@@ -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); - - if (rr->status == HTTP_OK && rr->finfo.st_mode != 0) { -@@ -2135,6 +2143,16 @@ - } - } - -+API_EXPORT(int) -+ap_include_register_extern(const char *cmd, ap_include_extern_func func) { -+ char cmdbuf[40] = "include::"; -+ -+ strncat(cmdbuf, cmd, 30); -+ ap_hook_configure(cmdbuf, AP_HOOK_SIG5(int,ptr,ptr,ptr,ptr), AP_HOOK_TOPMOST); -+ ap_hook_register(cmdbuf, func, NULL); -+ -+ return 0; -+} - - - /* -------------------------- The main function --------------------------- */ -@@ -2259,6 +2277,13 @@ - } - #endif - else { -+ char cmdbuf[40] = "include::"; -+ -+ strncat(cmdbuf, directive, 30); -+ 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, - "unknown directive \"%s\" " - "in parsed doc %s", +- file = ap_server_root_relative(cmd->pool, filename); ++ /* ++ * XXX Hack: If the filename starts with '!', then just as dlopen() ++ * XXX without translating to a pathname relative to ServerRoot. ++ */ ++ if (filename[0] == '!') { ++ file = filename + 1; ++ } else { ++ file = ap_server_root_relative(cmd->pool, filename); ++ } + + if (!(handle = ap_os_dso_load(file))) { + const char *my_error = ap_os_dso_error(); diff --git a/www/apache/patches/patch-ag b/www/apache/patches/patch-ag new file mode 100644 index 00000000000..aae9bc10a41 --- /dev/null +++ b/www/apache/patches/patch-ag @@ -0,0 +1,18 @@ +$NetBSD: patch-ag,v 1.4 2000/09/12 14:17:32 jlam Exp $ + +--- src/os/unix/os.c.orig Sat Jan 15 11:01:09 2000 ++++ src/os/unix/os.c +@@ -129,7 +129,12 @@ + #elif defined(HAVE_DYLD) + NSUnLinkModule(handle,FALSE); + +-#else ++/* ++ * Work around Apache dlclose() bug, where shared objects may be ++ * dlclose()d before their cleanup procedures are called. ++ * Fixes mod_perl vs. CGI interaction bug. ++ */ ++#elif 0 + dlclose(handle); + #endif + diff --git a/www/apache/patches/patch-ah b/www/apache/patches/patch-ah index 3028ee5c944..9e86aa92e6d 100644 --- a/www/apache/patches/patch-ah +++ b/www/apache/patches/patch-ah @@ -1,14 +1,14 @@ -$NetBSD: patch-ah,v 1.2 1999/11/27 22:52:09 rh Exp $ +$NetBSD: patch-ah,v 1.3 2000/09/12 14:17:33 jlam Exp $ ---- src/modules/standard/mod_so.c.orig Sat Nov 27 23:46:32 1999 -+++ src/modules/standard/mod_so.c Sat Nov 27 23:46:34 1999 -@@ -306,6 +306,9 @@ - ap_os_dso_handle_t handle; - char *file; - -+/* XXX Hack: ask dlopen() without translating for ServerRoot. */ -+ if (filename[0] == '!') file = filename + 1; -+ else - file = ap_server_root_relative(cmd->pool, filename); - - if (!(handle = ap_os_dso_load(file))) { +--- src/support/apachectl.orig Thu Sep 7 01:19:50 2000 ++++ src/support/apachectl +@@ -27,6 +27,9 @@ + # the path to your httpd binary, including options if necessary + HTTPD='/usr/local/apache/src/httpd' + # ++# shared object search path ++LD_LIBRARY_PATH= ++export LD_LIBRARY_PATH + # a command that outputs a formatted text version of the HTML at the + # url given on the command line. Designed for lynx, however other + # programs may work. diff --git a/www/apache/patches/patch-ai b/www/apache/patches/patch-ai new file mode 100644 index 00000000000..eb7417cb769 --- /dev/null +++ b/www/apache/patches/patch-ai @@ -0,0 +1,14 @@ +$NetBSD: patch-ai,v 1.3 2000/09/12 14:17:33 jlam Exp $ + +--- src/support/apxs.pl.orig Thu Sep 7 01:19:50 2000 ++++ src/support/apxs.pl +@@ -424,8 +424,7 @@ + my $t = $f; + $t =~ s|^.+/([^/]+)$|$1|; + 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 diff --git a/www/apache/patches/patch-aj b/www/apache/patches/patch-aj deleted file mode 100644 index bfb78c667a0..00000000000 --- a/www/apache/patches/patch-aj +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aj,v 1.4 2000/09/06 05:52:49 jlam Exp $ - ---- conf/httpd.conf-dist.orig Sat Nov 27 23:46:36 1999 -+++ conf/httpd.conf-dist Sat Nov 27 23:46:36 1999 -@@ -199,7 +199,16 @@ - # the order below without expert advice. - # - # Example: --# LoadModule foo_module libexec/mod_foo.so -+# LoadModule foo_module lib/httpd/mod_foo.so -+ -+ -+### Uncomment the following if you wish to use SSL and you need RSAREF: ### -+#LoadFile !librsaref.so -+LoadFile !libcrypto.so -+LoadFile !libssl.so -+LoadModule ssl_module lib/httpd/mod_ssl.so -+AddModule mod_ssl.c -+ - - # - # ExtendedStatus controls whether Apache will generate "full" status diff --git a/www/apache/patches/patch-ak b/www/apache/patches/patch-ak deleted file mode 100644 index 219a14864c4..00000000000 --- a/www/apache/patches/patch-ak +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ak,v 1.3 2000/01/31 16:35:37 christos Exp $ - ---- src/support/apxs.pl.orig Sun Jan 30 17:04:24 2000 -+++ src/support/apxs.pl Sun Jan 30 17:05:33 2000 -@@ -424,8 +424,7 @@ - my $t = $f; - $t =~ s|^.+/([^/]+)$|$1|; - 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 diff --git a/www/apache/patches/patch-al b/www/apache/patches/patch-al deleted file mode 100644 index 3e55333823a..00000000000 --- a/www/apache/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.2 1999/11/27 22:52:09 rh Exp $ - ---- src/os/unix/os.c.orig Sat Nov 27 23:46:39 1999 -+++ src/os/unix/os.c Sat Nov 27 23:46:40 1999 -@@ -126,7 +126,7 @@ - #elif defined(HAVE_DYLD) - NSUnLinkModule(handle,FALSE); - --#else -+#elif 0 - dlclose(handle); - #endif - diff --git a/www/apache/patches/patch-am b/www/apache/patches/patch-am deleted file mode 100644 index fcd43871cd5..00000000000 --- a/www/apache/patches/patch-am +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-am,v 1.4 1999/11/27 22:52:09 rh Exp $ - ---- src/ap/ap_hook.c.orig Sat Nov 27 23:46:41 1999 -+++ src/ap/ap_hook.c Sat Nov 27 23:46:43 1999 -@@ -740,6 +740,15 @@ - *((int *)v_rc) = ((int(*)(void *, void *, void *, int, void *))(hf->hf_ptr))(v1, v2, v3, v4, v5); - 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,ptr) */ -+ 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)); -- cgit v1.2.3