summaryrefslogtreecommitdiff
path: root/www/apache6/patches
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache6/patches')
-rw-r--r--www/apache6/patches/patch-aa56
-rw-r--r--www/apache6/patches/patch-ab18
-rw-r--r--www/apache6/patches/patch-ac37
-rw-r--r--www/apache6/patches/patch-ae53
-rw-r--r--www/apache6/patches/patch-af21
-rw-r--r--www/apache6/patches/patch-ah14
-rw-r--r--www/apache6/patches/patch-ai14
-rw-r--r--www/apache6/patches/patch-aj37
-rw-r--r--www/apache6/patches/patch-ak13
9 files changed, 0 insertions, 263 deletions
diff --git a/www/apache6/patches/patch-aa b/www/apache6/patches/patch-aa
deleted file mode 100644
index 6ea0f149a6f..00000000000
--- a/www/apache6/patches/patch-aa
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2003/09/12 08:26:46 itojun Exp $
-
---- Makefile.tmpl.orig 2003-04-28 22:32:12.000000000 +0900
-+++ Makefile.tmpl 2003-09-12 17:20:50.000000000 +0900
-@@ -328,20 +328,7 @@
- file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
- echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
- $(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \
-- name=`$(TOP)/$(AUX)/fmn.sh $(TOP)/$(SRC)/$${mod}`; \
-- echo dummy | awk '{ printf("LoadModule %-18s %s\n", modname, modpath); }' \
-- modname="$${name}" modpath="$(libexecdir_relative)$${file}" >>$(SRC)/.apaci.install.conf; \
- done; \
-- echo "" >>$(SRC)/.apaci.install.conf; \
-- echo "# Reconstruction of the complete module list from all available modules" >>$(SRC)/.apaci.install.conf; \
-- echo "# (static and shared ones) to achieve correct module execution order." >>$(SRC)/.apaci.install.conf; \
-- echo "# [WHENEVER YOU CHANGE THE LOADMODULE SECTION ABOVE UPDATE THIS, TOO]" >>$(SRC)/.apaci.install.conf; \
-- echo "ClearModuleList" >>$(SRC)/.apaci.install.conf; \
-- egrep "^[ ]*(Add|Shared)Module" $(SRC)/Configuration.apaci |\
-- sed -e 's:SharedModule:AddModule:' \
-- -e 's:modules/[^/]*/::' \
-- -e 's:[ ]lib: mod_:' \
-- -e 's:\.[dsoam].*$$:.c:' >>$(SRC)/.apaci.install.conf; \
- fi
- @echo "<=== [programs]"
-
-@@ -459,7 +446,7 @@
- # icons and distributed CGI scripts.
- install-data:
- @echo "===> [data: Installing initial data files]"
-- -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
-+ -@if false; then \
- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
- else \
- echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
-@@ -481,9 +468,10 @@
- for script in printenv test-cgi; do \
- cat $(TOP)/cgi-bin/$${script} |\
- sed -e 's;^#!/.*perl;#!$(PERL);' \
-+ -e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib:$(prefix)/lib:/usr/local/lib;' \
- > $(TOP)/$(SRC)/.apaci.install.tmp; \
-- echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
-- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
-+ echo "$(INSTALL_SCRIPT) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
-+ $(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
- done; \
- fi
- @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
-@@ -497,7 +485,7 @@
- # and initial config files while preserving existing ones.
- install-config:
- @echo "===> [config: Installing Apache configuration files]"
-- -@for conf in httpd.conf access.conf srm.conf; do \
-+ -@for conf in httpd.conf; do \
- if [ .$$conf = .httpd.conf ]; then \
- target_conf="$(TARGET).conf"; \
- else \
diff --git a/www/apache6/patches/patch-ab b/www/apache6/patches/patch-ab
deleted file mode 100644
index 1ace2958e90..00000000000
--- a/www/apache6/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2001/10/08 13:23:37 martti Exp $
-
---- conf/httpd.conf-dist.orig Sun May 13 19:59:49 2001
-+++ conf/httpd.conf-dist Mon Oct 8 14:28:52 2001
-@@ -197,7 +197,12 @@
- # the order below without expert advice.
- #
- # Example:
--# LoadModule foo_module libexec/mod_foo.so
-+# LoadModule foo_module lib/httpd/mod_foo.so
-+
-+<IfDefine SSL>
-+LoadModule ssl_module lib/httpd/mod_ssl.so
-+AddModule mod_ssl.c
-+</IfDefine>
-
- #
- # ExtendedStatus controls whether Apache will generate "full" status
diff --git a/www/apache6/patches/patch-ac b/www/apache6/patches/patch-ac
deleted file mode 100644
index 67a2aac8c55..00000000000
--- a/www/apache6/patches/patch-ac
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2001/10/08 13:23:37 martti Exp $
-
---- htdocs/index.html.en.orig Fri May 4 02:00:38 2001
-+++ htdocs/index.html.en Mon Oct 8 14:33:54 2001
-@@ -27,12 +27,31 @@
-
- <hr width="50%" size="8" />
- <p>The Apache <a href="manual/">documentation</a> has been included
-+this distribution. If the <STRONG>mod_ssl</STRONG> SSL extension has
-+been installed, then please carefully read the
-+<a href="manual/mod/mod_ssl/index.html">SSL documentation</a>.</p>
- with this distribution.</p>
-
-+<p>Information on the NetBSD multi-platform operating system can be found at
-+<a href="http://www.netbsd.org/">The NetBSD Project homepage</a></p>
-+
- <p>You are free to use the image below on an Apache-powered web
- server. Thanks for using Apache!</p>
-
--<div align="center"><img src="apache_pb.gif" alt="" /></div>
-+<p>Please feel free to use the images below on an Apache/NetBSD-powered web
-+server. Thanks for using
-+<a href="http://www.apache.org/">Apache</a> on
-+<a href="http://www.netbsd.org/">NetBSD</a>!</p>
-+
-+<div align="CENTER">
-+ <a href="http://www.apache.org/">
-+ <img src="apache_pb.gif" border=0 alt="Powered by Apache">
-+ </a>
-+ <a href="http://www.netbsd.org/">
-+ <img src="sitedrivenby.gif" border=0 alt="Site driven by NetBSD">
-+ </a>
-+</div>
-+
- </body>
- </html>
-
diff --git a/www/apache6/patches/patch-ae b/www/apache6/patches/patch-ae
deleted file mode 100644
index a5e0becf241..00000000000
--- a/www/apache6/patches/patch-ae
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2001/02/06 10:58:18 itojun Exp $
-
---- src/modules/standard/mod_include.c.orig Tue Jan 16 02:05:42 2001
-+++ src/modules/standard/mod_include.c Tue Feb 6 19:49:25 2001
-@@ -94,6 +94,8 @@
- #include "http_main.h"
- #include "util_script.h"
- #endif
-+#define get_tag ap_include_get_tag
-+#define parse_string ap_include_parse_string
-
- #define STARTING_SEQUENCE "<!--#"
- #define ENDING_SEQUENCE "-->"
-@@ -352,7 +354,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;
-
-@@ -471,7 +474,8 @@
- /*
- * 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;
-@@ -669,7 +673,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";
- }
-@@ -1081,7 +1086,8 @@
- "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) {
diff --git a/www/apache6/patches/patch-af b/www/apache6/patches/patch-af
deleted file mode 100644
index 015ef18c00c..00000000000
--- a/www/apache6/patches/patch-af
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-af,v 1.4 2001/10/08 13:23:37 martti Exp $
-
---- src/modules/standard/mod_so.c.orig Tue Feb 27 04:59:53 2001
-+++ src/modules/standard/mod_so.c Mon Oct 8 14:34:14 2001
-@@ -308,7 +308,15 @@
- return err;
- }
-
-- file = ap_server_root_relative(cmd->pool, filename);
-+ /*
-+ * If the filename starts with '!', then just dlopen() it without
-+ * translating it 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/apache6/patches/patch-ah b/www/apache6/patches/patch-ah
deleted file mode 100644
index 2b01bb66249..00000000000
--- a/www/apache6/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2001/02/06 10:58:19 itojun Exp $
-
---- 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/apache6/patches/patch-ai b/www/apache6/patches/patch-ai
deleted file mode 100644
index 96acd7c90ae..00000000000
--- a/www/apache6/patches/patch-ai
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2001/10/22 18:10:29 jlam Exp $
-
---- src/support/apxs.pl.orig Sat Jun 9 01:06:57 2001
-+++ src/support/apxs.pl Sat Jun 9 01:11:28 2001
-@@ -459,8 +459,7 @@
- if ($^O ne "MSWin32") {
- $t =~ s|^.+/([^/]+)$|$1|;
- if ($opt_i) {
-- push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
-- push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
-+ push(@cmds, "@INSTALL@ $f $CFG_LIBEXECDIR/$t");
- }
- }
- else {
diff --git a/www/apache6/patches/patch-aj b/www/apache6/patches/patch-aj
deleted file mode 100644
index 00beb943acb..00000000000
--- a/www/apache6/patches/patch-aj
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-aj,v 1.6 2001/10/17 07:47:54 martti Exp $
-
---- htdocs/index.html.fr.orig Wed Jun 27 08:38:39 2001
-+++ htdocs/index.html.fr Tue Oct 16 22:29:50 2001
-@@ -36,12 +36,28 @@
- <hr width="50%" size="8">
-
- <p>La <a href="manual/">documentation</a> Apache est incluse dans cette
--distribution.</p>
-+distribution. Si l'extension SSL <STRONG>mod_ssl</STRONG> a \xe9t\xe9
-+install\xe9e, lisez alors attentivement la
-+<a href="manual/mod/mod_ssl/index.html">documentation SSL</a>.</p>
-+
-+<p>Des informations sur le syst\xe8me d'exploitation multi-plateforme NetBSD
-+peuvent &ecirc;tre trouv\xe9es sur
-+<a href="http://www.netbsd.org/">la homepage du projet NetBSD</a>.</p>
-+
-+<p>Le webmaster de ce site peut librement utiliser les images ci-dessous sur u
-
--<p>Le webmaster de ce site peut librement utiliser l'image ci-dessous sur un
--site web utilisant le logiciel Apache. Merci d'avoir choisi Apache&nbsp;!</p>
-+site web utilisant les logiciels Apache et NetBSD. Merci d'avoir choisi
-+<a href="http://www.apache.org/">Apache</a> sur
-+<a href="http://www.netbsd.org/">NetBSD</a>&nbsp;!</p>
-
--<div align="CENTER"><img src="apache_pb.gif" alt=""></div>
-+<div align="CENTER">
-+ <a href="http://www.apache.org/">
-+ <img src="apache_pb.gif" BORDER="0" alt="Powered by Apache">
-+ </a>
-+ <a href="http://www.netbsd.org/">
-+ <img src="sitedrivenby.gif" BORDER="0" alt="Site driven by NetBSD">
-+ </a>
-+</div>
-
- </body>
- </html>
diff --git a/www/apache6/patches/patch-ak b/www/apache6/patches/patch-ak
deleted file mode 100644
index d4d262229bc..00000000000
--- a/www/apache6/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.5 2001/10/16 04:11:07 jlam Exp $
-
---- src/Makefile.tmpl.orig Sun Oct 14 22:14:29 2001
-+++ src/Makefile.tmpl
-@@ -2,7 +2,7 @@
- CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
- LIBS=$(EXTRA_LIBS) $(LIBS1)
- INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
--LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-+LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) $(LINK_LIBGCC_LDFLAGS)
-
- OBJS= \
- modules.o \
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-18 15:20:07 +0000