summaryrefslogtreecommitdiff
path: root/www/apache24/patches
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache24/patches')
-rw-r--r--www/apache24/patches/patch-aa146
-rw-r--r--www/apache24/patches/patch-ab15
-rw-r--r--www/apache24/patches/patch-ac12
-rw-r--r--www/apache24/patches/patch-ad31
-rw-r--r--www/apache24/patches/patch-ae59
-rw-r--r--www/apache24/patches/patch-ag16
-rw-r--r--www/apache24/patches/patch-ai19
-rw-r--r--www/apache24/patches/patch-al31
-rw-r--r--www/apache24/patches/patch-am13
-rw-r--r--www/apache24/patches/patch-aw15
10 files changed, 357 insertions, 0 deletions
diff --git a/www/apache24/patches/patch-aa b/www/apache24/patches/patch-aa
new file mode 100644
index 00000000000..661187eaa04
--- /dev/null
+++ b/www/apache24/patches/patch-aa
@@ -0,0 +1,146 @@
+$NetBSD: patch-aa,v 1.1.1.1 2012/04/13 18:50:49 ryoon Exp $
+
+--- Makefile.in.orig 2012-01-22 23:30:14.000000000 +0000
++++ Makefile.in
+@@ -4,7 +4,7 @@ CLEAN_SUBDIRS = test
+
+ PROGRAM_NAME = $(progname)
+ PROGRAM_SOURCES = modules.c
+-PROGRAM_LDADD = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(PCRE_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
++PROGRAM_LDADD = buildmark.o $(HTTPD_LDFLAGS) $(DL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(PCRE_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS) $(DL_LIBS)
+ PROGRAM_PRELINK = $(COMPILE) -c $(top_srcdir)/server/buildmark.c
+ PROGRAM_DEPENDENCIES = \
+ server/libmain.la \
+@@ -14,7 +14,7 @@ PROGRAM_DEPENDENCIES = \
+
+ sbin_PROGRAMS = $(PROGRAM_NAME)
+ TARGETS = $(sbin_PROGRAMS) $(shared_build) $(other_targets)
+-INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \
++INSTALL_TARGETS = install-htdocs install-error install-icons \
+ install-other install-cgi install-include install-suexec install-build \
+ install-man
+
+@@ -31,8 +31,8 @@ include $(top_srcdir)/build/program.mk
+
+ install-conf:
+ @echo Installing configuration files
+- @$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/extra
+- @$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original/extra
++ @$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)
++ @$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/extra
+ @cd $(top_srcdir)/docs/conf; \
+ for i in mime.types magic; do \
+ if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
+@@ -78,7 +78,8 @@ install-conf:
+ -e 's#@@SSLPort@@#$(SSLPORT)#g' \
+ < $$i; \
+ fi \
+- ) > $(DESTDIR)$(sysconfdir)/original/$$i; \
++ ) > $(DESTDIR)$(sysconfdir)/$$i; \
++ if false; then \
+ chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \
+ file=$$i; \
+ if [ "$$i" = "httpd.conf" ]; then \
+@@ -88,13 +89,16 @@ install-conf:
+ $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \
+ fi; \
+ fi; \
++ fi; \
+ done ; \
+ done ; \
+ if test -f "$(builddir)/envvars-std"; then \
+ cp -p envvars-std $(DESTDIR)$(sbindir); \
++ if false; then \
+ if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+ cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+ fi ; \
++ fi ; \
+ fi
+
+ # Create a sanitized config_vars.mk
+@@ -112,7 +116,7 @@ install-build: build/config_vars.out
+ $(top_srcdir)/build/instdso.sh; do \
+ $(INSTALL_PROGRAM) $$f $(DESTDIR)$(installbuilddir); \
+ done
+- @$(INSTALL_DATA) build/config_vars.out $(DESTDIR)$(installbuilddir)/config_vars.mk
++ #@$(INSTALL_DATA) build/config_vars.out $(DESTDIR)$(installbuilddir)/config_vars.mk
+ @rm build/config_vars.out
+
+ htdocs-srcdir = $(top_srcdir)/docs/docroot
+@@ -137,48 +141,28 @@ dox:
+ doxygen $(top_srcdir)/docs/doxygen.conf
+
+ install-htdocs:
+- -@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
+- echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
+- else \
+ echo Installing HTML documents ; \
+- $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
+- if test -d $(htdocs-srcdir) && test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
+- $(RSYNC) --exclude .svn -rlpt --numeric-ids $(htdocs-srcdir)/ $(DESTDIR)$(htdocsdir)/; \
+- else \
+- test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
+- cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
+- fi; \
+- fi
++ $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
++ test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && \
++ @PAX@ -rwppm . $(DESTDIR)$(htdocsdir))
+
+ install-error:
+- -@if [ -d $(DESTDIR)$(errordir) ]; then \
+- echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
+- else \
+ echo Installing error documents ; \
+ $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
+- cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
+- test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
+- fi
++ cd $(top_srcdir)/docs/error && \
++ @PAX@ -rwppm . $(DESTDIR)$(errordir)
+
+ install-icons:
+- -@if [ -d $(DESTDIR)$(iconsdir) ]; then \
+- echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
+- else \
+ echo Installing icons ; \
+ $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
+- cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
+- test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
+- fi
++ cd $(top_srcdir)/docs/icons && \
++ @PAX@ -rwppm . $(DESTDIR)$(iconsdir)
+
+ install-cgi:
+- -@if [ -d $(DESTDIR)$(cgidir) ];then \
+- echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
+- else \
+ echo Installing CGIs ; \
+ $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
+- cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
+- test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
+- fi
++ cd $(top_srcdir)/docs/cgi-examples && \
++ @PAX@ -rwppm . $(DESTDIR)$(cgidir)
+
+ install-other:
+ @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
+@@ -227,14 +211,10 @@ install-man:
+ @test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
+ @test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
+ @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
+- @cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
+- @cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
+- @if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
+- $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \
+- else \
+- cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \
+- cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
+- fi
++ $(BSD_INSTALL_MAN) $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
++ $(BSD_INSTALL_MAN) $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
++ cd $(top_srcdir)/docs/manual && \
++ @PAX@ -rwppm . $(DESTDIR)$(manualdir)
+
+ install-suexec:
+ @if test -f $(builddir)/support/suexec; then \
diff --git a/www/apache24/patches/patch-ab b/www/apache24/patches/patch-ab
new file mode 100644
index 00000000000..63967838faf
--- /dev/null
+++ b/www/apache24/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1.1.1 2012/04/13 18:50:49 ryoon Exp $
+
+PR#27567
+
+--- server/mpm_common.c.orig 2011-12-05 00:08:01.000000000 +0000
++++ server/mpm_common.c
+@@ -256,7 +256,7 @@ AP_DECLARE(gid_t) ap_gname2id(const char
+ #ifndef HAVE_INITGROUPS
+ int initgroups(const char *name, gid_t basegid)
+ {
+-#if defined(_OSD_POSIX) || defined(OS2) || defined(WIN32) || defined(NETWARE)
++#if defined(_OSD_POSIX) || defined(OS2) || defined(WIN32) || defined(NETWARE) || defined(__INTERIX)
+ return 0;
+ #else
+ gid_t groups[NGROUPS_MAX];
diff --git a/www/apache24/patches/patch-ac b/www/apache24/patches/patch-ac
new file mode 100644
index 00000000000..c3b0dc55430
--- /dev/null
+++ b/www/apache24/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1.1.1 2012/04/13 18:50:49 ryoon Exp $
+
+--- configure.orig 2012-02-13 13:41:00.000000000 +0000
++++ configure
+@@ -31766,7 +31766,6 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+
+
+-perlbin=`$ac_aux_dir/PrintPath perl`
+ if test "x$perlbin" = "x"; then
+ perlbin="/replace/with/path/to/perl/interpreter"
+ fi
diff --git a/www/apache24/patches/patch-ad b/www/apache24/patches/patch-ad
new file mode 100644
index 00000000000..d454f06266b
--- /dev/null
+++ b/www/apache24/patches/patch-ad
@@ -0,0 +1,31 @@
+$NetBSD: patch-ad,v 1.1.1.1 2012/04/13 18:50:49 ryoon Exp $
+
+--- config.layout.orig 2012-02-02 12:05:28.000000000 +0000
++++ config.layout
+@@ -347,3 +347,26 @@
+ proxycachedir: ${localstatedir}/proxy
+ </Layout>
+
++# NetBSD (pkgsrc) layout
++<Layout NetBSD>
++ prefix: @PREFIX@
++ exec_prefix: ${prefix}
++ bindir: ${exec_prefix}/bin
++ sbindir: ${exec_prefix}/sbin
++ libexecdir: ${exec_prefix}/lib/httpd
++ mandir: ${prefix}/man
++ sysconfdir: @SYSCONFDIR@
++ datadir: ${prefix}/share/httpd
++ installbuilddir: ${datadir}/build
++ errordir: ${datadir}/error
++ iconsdir: ${datadir}/icons
++ htdocsdir: ${datadir}/htdocs
++ manualdir: ${datadir}/manual
++ cgidir: ${exec_prefix}/libexec/cgi-bin
++ includedir: ${prefix}/include/httpd
++ localstatedir: @VARBASE@
++ runtimedir: ${localstatedir}/run
++ logfiledir: ${localstatedir}/log/httpd
++ proxycachedir: ${localstatedir}/db/httpd/proxy
++</Layout>
++
diff --git a/www/apache24/patches/patch-ae b/www/apache24/patches/patch-ae
new file mode 100644
index 00000000000..6503a95b32b
--- /dev/null
+++ b/www/apache24/patches/patch-ae
@@ -0,0 +1,59 @@
+$NetBSD: patch-ae,v 1.1.1.1 2012/04/13 18:50:49 ryoon Exp $
+
+--- docs/conf/httpd.conf.in.orig 2012-02-06 16:55:22.000000000 +0000
++++ docs/conf/httpd.conf.in
+@@ -361,42 +361,42 @@ LogLevel warn
+ # necessary.
+
+ # Server-pool management (MPM specific)
+-#Include @rel_sysconfdir@/extra/httpd-mpm.conf
++#Include @rel_sysconfdir@/httpd-mpm.conf
+
+ # Multi-language error messages
+-#Include @rel_sysconfdir@/extra/httpd-multilang-errordoc.conf
++#Include @rel_sysconfdir@/httpd-multilang-errordoc.conf
+
+ # Fancy directory listings
+-#Include @rel_sysconfdir@/extra/httpd-autoindex.conf
++#Include @rel_sysconfdir@/httpd-autoindex.conf
+
+ # Language settings
+-#Include @rel_sysconfdir@/extra/httpd-languages.conf
++#Include @rel_sysconfdir@/httpd-languages.conf
+
+ # User home directories
+-#Include @rel_sysconfdir@/extra/httpd-userdir.conf
++#Include @rel_sysconfdir@/httpd-userdir.conf
+
+ # Real-time info on requests and configuration
+-#Include @rel_sysconfdir@/extra/httpd-info.conf
++#Include @rel_sysconfdir@/httpd-info.conf
+
+ # Virtual hosts
+-#Include @rel_sysconfdir@/extra/httpd-vhosts.conf
++#Include @rel_sysconfdir@/httpd-vhosts.conf
+
+ # Local access to the Apache HTTP Server Manual
+-#Include @rel_sysconfdir@/extra/httpd-manual.conf
++#Include @rel_sysconfdir@/httpd-manual.conf
+
+ # Distributed authoring and versioning (WebDAV)
+-#Include @rel_sysconfdir@/extra/httpd-dav.conf
++#Include @rel_sysconfdir@/httpd-dav.conf
+
+ # Various default settings
+-#Include @rel_sysconfdir@/extra/httpd-default.conf
++#Include @rel_sysconfdir@/httpd-default.conf
+
+ # Configure mod_proxy_html to understand HTML4/XHTML1
+ <IfModule proxy_html_module>
+-Include @rel_sysconfdir@/extra/proxy-html.conf
++Include @rel_sysconfdir@/proxy-html.conf
+ </IfModule>
+
+ # Secure (SSL/TLS) connections
+-#Include @rel_sysconfdir@/extra/httpd-ssl.conf
++#Include @rel_sysconfdir@/httpd-ssl.conf
+ #
+ # Note: The following must must be present to support
+ # starting without SSL on platforms with no /dev/random equivalent
diff --git a/www/apache24/patches/patch-ag b/www/apache24/patches/patch-ag
new file mode 100644
index 00000000000..3a2bd780c36
--- /dev/null
+++ b/www/apache24/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1.1.1 2012/04/13 18:50:49 ryoon Exp $
+
+--- support/Makefile.in.orig 2011-12-20 14:57:46.000000000 +0000
++++ support/Makefile.in
+@@ -31,9 +31,11 @@ install:
+ done
+ @if test -f "$(builddir)/envvars-std"; then \
+ cp -p envvars-std $(DESTDIR)$(sbindir); \
++ if false; then \
+ if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+ cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+ fi ; \
++ fi ; \
+ fi
+
+ htpasswd_OBJECTS = htpasswd.lo
diff --git a/www/apache24/patches/patch-ai b/www/apache24/patches/patch-ai
new file mode 100644
index 00000000000..4e10f4237f7
--- /dev/null
+++ b/www/apache24/patches/patch-ai
@@ -0,0 +1,19 @@
+$NetBSD: patch-ai,v 1.1.1.1 2012/04/13 18:50:49 ryoon Exp $
+
+--- support/apxs.in.orig 2010-06-22 17:12:44.000000000 +0000
++++ support/apxs.in
+@@ -352,8 +352,12 @@ if ($apr_major_version < 2) {
+ }
+ }
+
+-my $libtool = `$apr_config --apr-libtool`;
+-chomp($libtool);
++my $libtool = $ENV{'APR_LIBTOOL'};
++unless ($libtool) {
++ $libtool = `@LOCALBASE@/bin/apr-1-config --installbuilddir`;
++ chomp($libtool);
++ $libtool = "$libtool/libtool";
++}
+
+ my $apr_includedir = `$apr_config --includes`;
+ chomp($apr_includedir);
diff --git a/www/apache24/patches/patch-al b/www/apache24/patches/patch-al
new file mode 100644
index 00000000000..4541e971d8a
--- /dev/null
+++ b/www/apache24/patches/patch-al
@@ -0,0 +1,31 @@
+$NetBSD: patch-al,v 1.1.1.1 2012/04/13 18:50:49 ryoon Exp $
+
+--- include/httpd.h.orig 2012-02-04 10:04:59.000000000 +0000
++++ include/httpd.h
+@@ -126,7 +126,7 @@ extern "C" {
+ #if defined(OS2) || defined(WIN32)
+ #define DEFAULT_ERRORLOG "logs/error.log"
+ #else
+-#define DEFAULT_ERRORLOG "logs/error_log"
++#define DEFAULT_ERRORLOG DEFAULT_REL_LOGFILEDIR "/error.log"
+ #endif
+ #endif /* DEFAULT_ERRORLOG */
+
+@@ -142,7 +142,7 @@ extern "C" {
+
+ /** The name of the server config file */
+ #ifndef SERVER_CONFIG_FILE
+-#define SERVER_CONFIG_FILE "conf/httpd.conf"
++#define SERVER_CONFIG_FILE DEFAULT_REL_SYSCONFDIR "/httpd.conf"
+ #endif
+
+ /** The default path for CGI scripts if none is currently set */
+@@ -220,7 +220,7 @@ extern "C" {
+
+ /** The name of the MIME types file */
+ #ifndef AP_TYPES_CONFIG_FILE
+-#define AP_TYPES_CONFIG_FILE "conf/mime.types"
++#define AP_TYPES_CONFIG_FILE DEFAULT_REL_SYSCONFDIR "/mime.types"
+ #endif
+
+ /*
diff --git a/www/apache24/patches/patch-am b/www/apache24/patches/patch-am
new file mode 100644
index 00000000000..978df9062a8
--- /dev/null
+++ b/www/apache24/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1.1.1 2012/04/13 18:50:49 ryoon Exp $
+
+--- include/scoreboard.h.orig 2012-02-01 13:36:37.000000000 +0000
++++ include/scoreboard.h
+@@ -40,7 +40,7 @@ extern "C" {
+
+ /* Scoreboard file, if there is one */
+ #ifndef DEFAULT_SCOREBOARD
+-#define DEFAULT_SCOREBOARD "logs/apache_runtime_status"
++#define DEFAULT_SCOREBOARD DEFAULT_REL_RUNTIMEDIR "logs/apache_runtime_status"
+ #endif
+
+ /* Scoreboard info on a process is, for now, kept very brief ---
diff --git a/www/apache24/patches/patch-aw b/www/apache24/patches/patch-aw
new file mode 100644
index 00000000000..3b50c441a3b
--- /dev/null
+++ b/www/apache24/patches/patch-aw
@@ -0,0 +1,15 @@
+$NetBSD: patch-aw,v 1.1.1.1 2012/04/13 18:50:49 ryoon Exp $
+
+--- modules/metadata/mod_mime_magic.c.orig 2011-12-05 00:08:01.000000000 +0000
++++ modules/metadata/mod_mime_magic.c
+@@ -106,6 +106,10 @@
+ #include <utime.h>
+ #endif
+
++#ifdef __QNX__ /* naming conflict with <malloc.h> */
++#define mcheck mod_mime_magic_mcheck
++#endif
++
+ /*
+ * data structures and related constants
+ */
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-26 02:10:14 +0000