diff options
Diffstat (limited to 'www/apache22/files')
22 files changed, 0 insertions, 700 deletions
diff --git a/www/apache22/files/apache.sh b/www/apache22/files/apache.sh deleted file mode 100644 index f305bf576143..000000000000 --- a/www/apache22/files/apache.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/www/apache22/files/Attic/apache.sh,v 1.8 2005-01-11 13:45:05 clement Exp $ -# - -# PROVIDE: apache21 -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: FreeBSD shutdown - -# -# Add the following lines to /etc/rc.conf to enable apache21: -# apache21_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable apache21 -# apache21ssl_enable (bool): Set to "NO" by default. -# Set it to "YES" to start apache with SSL -# (if <IfDefined SSL> exists in httpd.conf) -# apache21limits_enable (bool):Set to "NO" by default. -# Set it to yes to run `limits $limits_args` -# just before apache starts. -# apache21_flags (str): Set to "" by default. -# Extra flags passed to start command. -# apache21limits_args (str): Default to "-e -C daemon" -# Arguments of pre-start limits run. -# -. %%RC_SUBR%% - -name="apache21" -rcvar=`set_rcvar` - -start_precmd="apache21_precmd" -restart_precmd="apache21_checkconfig" -reload_precmd="apache21_checkconfig" -command="%%PREFIX%%/sbin/httpd" -pidfile="/var/run/httpd.pid" -required_files=%%PREFIX%%/etc/apache21/httpd.conf - -[ -z "$apache21_enable" ] && apache21_enable="NO" -[ -z "$apache21ssl_enable" ] && apache21ssl_enable="NO" -[ -z "$apache21_flags" ] && apache21_flags="" -[ -z "$apache21limits_enable" ] && apache21limits_enable="NO" -[ -z "$apache21limits_args" ] && apache21limits_args="-e -C daemon" - -load_rc_config $name - -checkyesno apache21ssl_enable && \ - apache21_flags="-DSSL $apache21_flags" - -apache21_checkconfig() -{ - echo "Performing sanity check on apache21 configuration:" - ${command} ${apache21_flags} -t -} - -apache21_precmd() -{ - if test -f %%PREFIX%%/sbin/envvars - then - . %%PREFIX%%/sbin/envvars - fi - if checkyesno apache21limits_enable - then - eval `/usr/bin/limits ${apache21limits_args}` 2>/dev/null - else - return 0 - fi - -} - -sig_reload=SIGUSR1 - -extra_commands="reload" -run_rc_command "$1" diff --git a/www/apache22/files/exp-windowsupdate.patch b/www/apache22/files/exp-windowsupdate.patch deleted file mode 100644 index 3f1306777100..000000000000 --- a/www/apache22/files/exp-windowsupdate.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- server/protocol.c.orig Tue Jun 29 08:21:28 2004 -+++ server/protocol.c Tue Jun 29 08:21:50 2004 -@@ -1248,7 +1248,7 @@ - * We can only set a C-L in the response header if we haven't already - * sent any buckets on to the next output filter for this request. - */ -- if (ctx->data_sent == 0 && eos) { -+ if (ctx->data_sent == 0 && eos && !r->header_only) { - ap_set_content_length(r, r->bytes_sent); - } - diff --git a/www/apache22/files/patch-Makefile.in b/www/apache22/files/patch-Makefile.in deleted file mode 100644 index 382e3f0cbc5f..000000000000 --- a/www/apache22/files/patch-Makefile.in +++ /dev/null @@ -1,152 +0,0 @@ ---- Makefile.in.orig Thu Dec 2 08:34:20 2004 -+++ Makefile.in Sat Dec 18 11:51:59 2004 -@@ -31,15 +31,22 @@ - if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) ; \ - fi ; \ -+ if [ ! -d $(DESTDIR)$(EXAMPLESDIR) ]; then \ -+ $(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) ; \ -+ fi ; \ - cd $(top_srcdir)/docs/conf; \ - for i in mime.types magic; do \ - if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ - $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \ - fi; \ -+ cp -f $$i $$i-dist; \ -+ $(INSTALL_DATA) $$i-dist $(DESTDIR)$(EXAMPLESDIR); \ - done; \ - for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \ - cd $$j ; \ -+ [ -f `echo "$$i"|sed 's,\.in$$,_nonex,g'` ] || continue; \ - for i in *-std*.conf; do \ -+ [ -f `echo "$$i"|sed 's,\.in$$,_nonex,g'` ] || continue; \ - ( \ - n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \ - if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \ -@@ -57,6 +64,9 @@ - if test "x$$j" = "xssl"; then \ - echo "<IfDefine SSL>"; \ - fi; \ -+ if [ `echo "$$j" | egrep 'cgid|cache|dav|digest|proxy'` ]; then \ -+ echo -n "#"; \ -+ fi; \ - if test $$j != "^EOL^"; then \ - echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ - fi; \ -@@ -70,23 +80,18 @@ - -e 's#@@Port@@#$(PORT)#g' \ - < $$i; \ - fi \ -- ) > $(DESTDIR)$(sysconfdir)/$$i; \ -- chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \ -- file=`echo $$i|sed s/-std//`; \ -+ ) > $(DESTDIR)$(EXAMPLESDIR)/$$i; \ -+ chmod 0644 $(DESTDIR)$(EXAMPLESDIR)/$$i; \ -+ chmod 0644 $(DESTDIR)$(EXAMPLESDIR)/$$i; \ -+ file=`echo $$i|sed s/-std//`; \ - if [ "$$file" = "httpd.conf" ]; then \ - file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \ - fi; \ - if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \ -- $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \ -+ $(INSTALL_DATA) $(DESTDIR)$(EXAMPLESDIR)/$$i $(DESTDIR)$(sysconfdir)/$$file; \ - fi; \ - done ; \ -- done ; \ -- if test -f "$(builddir)/envvars-std"; then \ -- cp -p envvars-std $(DESTDIR)$(sbindir); \ -- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \ -- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ -- fi ; \ -- fi -+ done ; - - install-build: - @echo Installing build system files -@@ -108,44 +113,40 @@ - 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) ; \ -- 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 -+.if !defined(NO_WWWDATA) -+ @echo Installing HTML documents -+ @test -d $(DESTDIR)$(htdocsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)-dist -+ @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR) $(htdocsdir)-dist) -+ @test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir)-dist $(DESTDIR)$(htdocsdir) -+ -@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir)-dist && find . -name "CVS" -print | xargs rm -rf -+.endif - - 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 -+.if !defined(NO_ERROR) -+ @echo Installing error documents -+ @test -d $(DESTDIR)$(errordir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(errordir)-dist -+ cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir)-dist -+ -@test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir)-dist && find . -name "CVS" -print | xargs rm -rf -+ @test -e $(DESTDIR)$(errordir) || ln -sf $(DESTDIR)$(errordir)-dist $(DESTDIR)$(errordir) -+.endif - - 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 -+.if !defined(NO_ICONS) -+ @echo Installing icons -+ @test -d $(DESTDIR)$(iconsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir)-dist -+ cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir)-dist -+ -@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir)-dist && find . -name "CVS" -print | xargs rm -rf -+ @test -e $(DESTDIR)$(iconsdir) || ln -sf $(DESTDIR)$(iconsdir)-dist $(DESTDIR)$(iconsdir) -+.endif - - 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 -+.if !defined(NO_CGI) -+ @echo Installing CGIs -+ @test -d $(DESTDIR)$(cgidir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)-dist -+ cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist -+ -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf -+ @test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir) -+.endif - - install-other: - @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) -@@ -189,11 +190,13 @@ - @test -d $(DESTDIR)$(mandir) || $(MKINSTALLDIRS) $(DESTDIR)$(mandir) - @test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1 - @test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8 -+.if !defined(NOPORTDOCS) - @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 - @(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 -+.endif - - install-suexec: - @if test -f $(builddir)/support/suexec; then \ diff --git a/www/apache22/files/patch-config.layout b/www/apache22/files/patch-config.layout deleted file mode 100644 index 3724aa43c9a4..000000000000 --- a/www/apache22/files/patch-config.layout +++ /dev/null @@ -1,25 +0,0 @@ ---- config.layout.orig Sun Nov 21 19:50:36 2004 -+++ config.layout Sat Dec 11 17:56:14 2004 -@@ -281,17 +281,17 @@ - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin - libdir: ${exec_prefix}/lib -- libexecdir: ${exec_prefix}/libexec/apache2 -+ libexecdir: ${exec_prefix}/libexec/apache21 - mandir: ${prefix}/man -- sysconfdir: ${prefix}/etc/apache2 -+ sysconfdir: ${prefix}/etc/apache21 - datadir: ${prefix}/www -- installbuilddir: ${prefix}/share/apache2/build -+ installbuilddir: ${prefix}/share/apache21/build - errordir: ${datadir}/error - iconsdir: ${datadir}/icons - htdocsdir: ${datadir}/data -- manualdir: ${prefix}/share/doc/apache2 -+ manualdir: ${prefix}/share/doc/apache21 - cgidir: ${datadir}/cgi-bin -- includedir: ${prefix}/include/apache2 -+ includedir: ${prefix}/include/apache21 - localstatedir: /var - runtimedir: ${localstatedir}/run - logfiledir: ${localstatedir}/log diff --git a/www/apache22/files/patch-configure.in b/www/apache22/files/patch-configure.in deleted file mode 100644 index e36f5d9ac795..000000000000 --- a/www/apache22/files/patch-configure.in +++ /dev/null @@ -1,35 +0,0 @@ ---- configure.in.orig Sun Nov 21 19:50:36 2004 -+++ configure.in Mon Dec 13 10:43:16 2004 -@@ -69,7 +69,7 @@ - - if test "$apr_found" = "reconfig"; then - APR_SUBDIR_CONFIG(srclib/apr, -- [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir], -+ [$apache_apr_flags --prefix=$prefix], - [--enable-layout=*|\'--enable-layout=*]) - dnl We must be the first to build and the last to be cleaned - AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS" -@@ -97,7 +97,7 @@ - - if test "$apu_found" = "reconfig"; then - APR_SUBDIR_CONFIG(srclib/apr-util, -- [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir], -+ [--with-apr=../apr --prefix=$prefix], - [--enable-layout=*|\'--enable-layout=*]) - dnl We must be the last to build and the first to be cleaned - AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util" -@@ -549,8 +549,14 @@ - [Root directory of the Apache install area]) - AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf", - [Location of the config file, relative to the Apache root directory]) -+AC_DEFINE_UNQUOTED(DEFAULT_ERRORLOG, "${rel_logfiledir}/httpd-error.log", -+ [Location of error log file]) -+AC_DEFINE_UNQUOTED(DEFAULT_SCOREBOARD, "${rel_runtimedir}/apache_runtime_status", -+ [Location of ScoreBoard file]) - AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types", - [Location of the MIME types config file, relative to the Apache root directory]) -+AC_DEFINE_UNQUOTED(DOCUMENT_LOCATION, "${rel_htdocsdir}", -+ [Location of document root]) - AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR", - [Location of the source for the current MPM]) - diff --git a/www/apache22/files/patch-docs:conf:httpd-std.conf.in b/www/apache22/files/patch-docs:conf:httpd-std.conf.in deleted file mode 100644 index 1147ce18c192..000000000000 --- a/www/apache22/files/patch-docs:conf:httpd-std.conf.in +++ /dev/null @@ -1,94 +0,0 @@ ---- docs/conf/httpd-std.conf.in.orig Tue Feb 8 23:31:56 2005 -+++ docs/conf/httpd-std.conf.in Wed Feb 23 11:06:23 2005 -@@ -68,7 +68,7 @@ - # - #<IfModule !mpm_netware_module> - #<IfModule !mpm_perchild_module> --#ScoreBoardFile @rel_logfiledir@/apache_runtime_status -+#ScoreBoardFile @rel_runtimedir@/apache_runtime_status - #</IfModule> - #</IfModule> - -@@ -264,8 +264,8 @@ - # when the value of (unsigned)Group is above 60000; - # don't use Group #-1 on these systems! - # --User nobody --Group #-1 -+User %%WWWOWN%% -+Group %%WWWGRP%% - </IfModule> - </IfModule> - -@@ -315,7 +315,6 @@ - # features. - # - <Directory /> -- Options FollowSymLinks - AllowOverride None - Order deny,allow - Deny from all -@@ -369,6 +368,23 @@ - # - <IfModule userdir_module> - UserDir public_html -+ UserDir disabled %%FTPUSERS%% -+# -+# Control access to UserDir directories. The following is an example -+# for a site where these directories are restricted to read-only. -+# -+ <Directory /home/*/public_html> -+ AllowOverride FileInfo AuthConfig Limit Indexes -+ Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec -+ <Limit GET POST OPTIONS PROPFIND> -+ Order allow,deny -+ Allow from all -+ </Limit> -+ <LimitExcept GET POST OPTIONS PROPFIND> -+ Order deny,allow -+ Deny from all -+ </LimitExcept> -+ </Directory> - </IfModule> - - # -@@ -481,7 +497,7 @@ - # logged here. If you *do* define an error logfile for a <VirtualHost> - # container, that host's errors will be logged there and not here. - # --ErrorLog @rel_logfiledir@/error_log -+ErrorLog @rel_logfiledir@/httpd-error.log - - # - # LogLevel: Control the number of messages logged to the error_log. -@@ -510,20 +526,20 @@ - # define per-<VirtualHost> access logfiles, transactions will be - # logged therein and *not* in this file. - # -- CustomLog @rel_logfiledir@/access_log common -+ #CustomLog @rel_logfiledir@/httpd-access.log common - - # - # If you would like to have agent and referer logfiles, uncomment the - # following directives. - # -- #CustomLog @rel_logfiledir@/referer_log referer -- #CustomLog @rel_logfiledir@/agent_log agent -+ #CustomLog @rel_logfiledir@/httpd-referer.log referer -+ #CustomLog @rel_logfiledir@/httpd-agent.log agent - - # - # If you prefer a single logfile with access, agent, and referer information - # (Combined Logfile Format) you can use the following directive. - # -- #CustomLog @rel_logfiledir@/access_log combined -+ CustomLog @rel_logfiledir@/httpd-access.log combined - </IfModule> - - # -@@ -1071,3 +1087,5 @@ - # ErrorLog @rel_logfiledir@/dummy-host.example.com-error_log - # CustomLog @rel_logfiledir@/dummy-host.example.com-access_log common - #</VirtualHost> -+ -+Include @rel_sysconfdir@/Includes/*.conf diff --git a/www/apache22/files/patch-docs:conf:ssl-std.conf.in b/www/apache22/files/patch-docs:conf:ssl-std.conf.in deleted file mode 100644 index cf0bbeab218d..000000000000 --- a/www/apache22/files/patch-docs:conf:ssl-std.conf.in +++ /dev/null @@ -1,24 +0,0 @@ -$FreeBSD$ - ---- docs/conf/ssl-std.conf.in.orig Mon Oct 13 16:14:10 2003 -+++ docs/conf/ssl-std.conf.in Mon Oct 13 16:15:17 2003 -@@ -88,8 +88,8 @@ - DocumentRoot "@exp_htdocsdir@" - ServerName www.example.com:443 - ServerAdmin you@example.com --ErrorLog @exp_logfiledir@/error_log --TransferLog @exp_logfiledir@/access_log -+ErrorLog @exp_logfiledir@/httpd-error.log -+TransferLog @exp_logfiledir@/httpd-access.log - - # SSL Engine Switch: - # Enable/Disable SSL for this virtual host. -@@ -240,7 +240,7 @@ - # Per-Server Logging: - # The home of a custom SSL log file. Use this when you want a - # compact non-error SSL logfile on a virtual host basis. --CustomLog @exp_logfiledir@/ssl_request_log \ -+CustomLog @exp_logfiledir@/httpd-ssl_request.log \ - "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" - - </VirtualHost> diff --git a/www/apache22/files/patch-srclib:apr-util:Makefile.in b/www/apache22/files/patch-srclib:apr-util:Makefile.in deleted file mode 100644 index d0e295d2c6df..000000000000 --- a/www/apache22/files/patch-srclib:apr-util:Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ ---- srclib/apr-util/Makefile.in.orig Sun Nov 28 19:59:35 2004 -+++ srclib/apr-util/Makefile.in Wed Feb 23 11:26:13 2005 -@@ -54,12 +54,11 @@ - sed 's,^\(location=\).*$$,\1installed,' < $(APU_CONFIG) > $@ - - install: $(TARGET_LIB) apu-config.out -- $(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \ -+ $(APR_MKDIR) $(DESTDIR)$(includedir) \ - $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) - for f in $(top_srcdir)/include/*.h $(top_blddir)/include/*.h; do \ - $(INSTALL_DATA) $${f} $(DESTDIR)$(includedir); \ - done -- $(INSTALL_DATA) apr-util.pc $(DESTDIR)$(libdir)/pkgconfig/$(APRUTIL_PCFILE) - list='$(INSTALL_SUBDIRS)'; for i in $$list; do \ - ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \ - done diff --git a/www/apache22/files/patch-srclib:apr-util:build:dbm.m4 b/www/apache22/files/patch-srclib:apr-util:build:dbm.m4 deleted file mode 100644 index 70fe1ef96154..000000000000 --- a/www/apache22/files/patch-srclib:apr-util:build:dbm.m4 +++ /dev/null @@ -1,66 +0,0 @@ ---- srclib/apr-util/build/dbm.m4.orig Wed Nov 17 02:12:20 2004 -+++ srclib/apr-util/build/dbm.m4 Mon Jan 17 21:22:47 2005 -@@ -298,8 +298,8 @@ - fi - APU_CHECK_BERKELEY_DB(1, -1, -1, - "$places", -- "db_185.h", -- "db" -+ "db.h", -+ "c" - ) - if test "$apu_have_db" = "1"; then - apu_db_version=185 -@@ -341,7 +341,7 @@ - APU_CHECK_BERKELEY_DB(3, -1, -1, - "$places", - "db3/db.h db.h", -- "db3 db" -+ "db3" - ) - if test "$apu_have_db" = "1"; then - apu_db_version=3 -@@ -361,8 +361,8 @@ - fi - APU_CHECK_BERKELEY_DB("4", "0", "-1", - "$places", -- "db4/db.h db.h", -- "db-4.0 db4 db" -+ "db4/db.h", -+ "db4" - ) - if test "$apu_have_db" = "1"; then - apu_db_version=4 -@@ -382,8 +382,8 @@ - fi - APU_CHECK_BERKELEY_DB("4", "1", "-1", - "$places", -- "db41/db.h db4/db.h db.h", -- "db-4.1 db41 db4 db" -+ "db41/dh.h", -+ "db-41" - ) - if test "$apu_have_db" = "1"; then - apu_db_version=4 -@@ -403,8 +403,8 @@ - fi - APU_CHECK_BERKELEY_DB("4", "2", "-1", - "$places", -- "db42/db.h db4/db.h db.h", -- "db-4.2 db42 db4 db" -+ "db42/db.h", -+ "db-4.2" - ) - if test "$apu_have_db" = "1"; then - apu_db_version=4 -@@ -422,8 +422,8 @@ - fi - APU_CHECK_BERKELEY_DB("4", "3", "-1", - "$places", -- "db43/db.h db4/db.h db.h", -- "db-4.3 db43 db4 db" -+ "db43/db.h", -+ "db-4.3" - ) - if test "$apu_have_db" = "1"; then - apu_db_version=4 diff --git a/www/apache22/files/patch-srclib:apr-util:config.layout b/www/apache22/files/patch-srclib:apr-util:config.layout deleted file mode 100644 index ad1f4e176a59..000000000000 --- a/www/apache22/files/patch-srclib:apr-util:config.layout +++ /dev/null @@ -1,11 +0,0 @@ ---- srclib/apr-util/config.layout.orig Thu Oct 2 16:29:48 2003 -+++ srclib/apr-util/config.layout Mon Dec 13 10:17:45 2004 -@@ -229,4 +229,8 @@ - infodir: ${exec_prefix}/share/info - libsuffix -${APRUTIL_MAJOR_VERSION} - installbuilddir: ${prefix}/usr/share/apache2/build -+ -+<Layout FreeBSD> -+ includedir: ${prefix}/include/apr-${APR_MAJOR_VERSION} -+ libsuffix: - </Layout> diff --git a/www/apache22/files/patch-srclib:apr-util:xml:expat:buildconf.sh b/www/apache22/files/patch-srclib:apr-util:xml:expat:buildconf.sh deleted file mode 100644 index c4922c1573b9..000000000000 --- a/www/apache22/files/patch-srclib:apr-util:xml:expat:buildconf.sh +++ /dev/null @@ -1,20 +0,0 @@ ---- srclib/apr-util/xml/expat/buildconf.sh.orig Wed Nov 17 02:12:20 2004 -+++ srclib/apr-util/xml/expat/buildconf.sh Sat Dec 11 17:04:11 2004 -@@ -3,7 +3,7 @@ - # - # Find libtoolize - # --libtoolize=`conftools/PrintPath glibtoolize libtoolize libtoolize15 libtoolize14` -+libtoolize=${LIBTOOLIZE} - if [ "x$libtoolize" = "x" ]; then - echo "libtoolize not found in path" - exit 1 -@@ -33,7 +33,7 @@ - ltfile=libtool.m4 - else - ltpath=`dirname $libtoolize` -- ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4} -+ ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/libtool${LIBTOOL_VERSION}.m4} - fi - echo "Incorporating $ltfile into aclocal.m4 ..." - echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4 diff --git a/www/apache22/files/patch-srclib:apr:Makefile.in b/www/apache22/files/patch-srclib:apr:Makefile.in deleted file mode 100644 index 0ca7f3f529c3..000000000000 --- a/www/apache22/files/patch-srclib:apr:Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ ---- srclib/apr/Makefile.in.orig Sun Nov 28 20:00:49 2004 -+++ srclib/apr/Makefile.in Wed Feb 23 11:10:47 2005 -@@ -67,14 +67,13 @@ - - install: $(TARGET_LIB) apr-config.out build/apr_rules.out - $(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \ -- $(DESTDIR)$(libdir)/pkgconfig $(DESTDIR)$(includedir) -+ $(DESTDIR)$(includedir) - $(INSTALL_DATA) $(top_blddir)/include/apr.h $(DESTDIR)$(includedir) - for f in $(top_srcdir)/include/apr_*.h; do \ - $(INSTALL_DATA) $${f} $(DESTDIR)$(includedir); \ - done - $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir) - $(INSTALL_DATA) apr.exp $(DESTDIR)$(libdir)/apr.exp -- $(INSTALL_DATA) apr.pc $(DESTDIR)$(libdir)/pkgconfig/$(APR_PCFILE) - for f in libtool shlibtool; do \ - if test -f $${f}; then $(INSTALL) -m 755 $${f} $(DESTDIR)$(installbuilddir); fi; \ - done diff --git a/www/apache22/files/patch-srclib:apr:build:apr_hints.m4 b/www/apache22/files/patch-srclib:apr:build:apr_hints.m4 deleted file mode 100644 index 6a1445ddfb6d..000000000000 --- a/www/apache22/files/patch-srclib:apr:build:apr_hints.m4 +++ /dev/null @@ -1,16 +0,0 @@ ---- srclib/apr/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004 -+++ srclib/apr/build/apr_hints.m4 Wed Oct 27 11:25:32 2004 -@@ -137,11 +137,7 @@ - ;; - *-freebsd*) - APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE]) -- if test -x /sbin/sysctl; then -- os_version=`/sbin/sysctl -n kern.osreldate` -- else -- os_version=000000 -- fi -+ os_version="%%OSVERSION%%" - # 502102 is when libc_r switched to libpthread (aka libkse). - if test $os_version -ge "502102"; then - apr_cv_pthreads_cflags="none" - diff --git a/www/apache22/files/patch-srclib:apr:build:buildcheck.sh b/www/apache22/files/patch-srclib:apr:build:buildcheck.sh deleted file mode 100644 index ca7b49943294..000000000000 --- a/www/apache22/files/patch-srclib:apr:build:buildcheck.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- srclib/apr/build/buildcheck.sh.orig Fri Jan 14 11:16:31 2005 -+++ srclib/apr/build/buildcheck.sh Wed Feb 23 11:16:25 2005 -@@ -38,7 +38,7 @@ - # output is multiline from 1.5 onwards - - # Require libtool 1.4 or newer --libtool=`build/PrintPath glibtool libtool libtool15 libtool14` -+libtool=${LIBTOOL} - lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` - if test -z "$lt_pversion"; then - echo "buildconf: libtool not found." diff --git a/www/apache22/files/patch-srclib:apr:buildconf b/www/apache22/files/patch-srclib:apr:buildconf deleted file mode 100644 index d3483efcc7eb..000000000000 --- a/www/apache22/files/patch-srclib:apr:buildconf +++ /dev/null @@ -1,29 +0,0 @@ ---- srclib/apr/buildconf.orig Thu Jul 1 23:21:59 2004 -+++ srclib/apr/buildconf Sat Dec 11 17:11:22 2004 -@@ -22,7 +22,7 @@ - # - build/buildcheck.sh || exit 1 - --libtoolize=`build/PrintPath glibtoolize libtoolize libtoolize15 libtoolize14` -+libtoolize=${LIBTOOLIZE} - if [ "x$libtoolize" = "x" ]; then - echo "libtoolize not found in path" - exit 1 -@@ -46,7 +46,7 @@ - ltfile=`pwd`/libtool.m4 - else - ltpath=`dirname $libtoolize` -- ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4} -+ ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/${LIBTOOL_VERSION}.m4} - fi - - if [ ! -f $ltfile ]; then -@@ -54,7 +54,7 @@ - exit 1 - fi - --echo "buildconf: Using libtool.m4 at ${ltfile}." -+echo "buildconf: Using libtool${LIBTOOL_VERSION}.m4 at ${ltfile}." - - cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 - diff --git a/www/apache22/files/patch-srclib:apr:config.layout b/www/apache22/files/patch-srclib:apr:config.layout deleted file mode 100644 index 87903810ee1b..000000000000 --- a/www/apache22/files/patch-srclib:apr:config.layout +++ /dev/null @@ -1,11 +0,0 @@ ---- srclib/apr/config.layout.orig Wed Jun 30 15:16:54 2004 -+++ srclib/apr/config.layout Mon Dec 13 10:17:16 2004 -@@ -229,3 +229,8 @@ - infodir: ${exec_prefix}/share/info - libsuffix: -${APR_MAJOR_VERSION} - </Layout> -+ -+<Layout FreeBSD> -+ includedir: ${prefix}/include/apr-${APR_MAJOR_VERSION} -+ libsuffix: -+</Layout> diff --git a/www/apache22/files/patch-srclib:apr:threadproc:unix:procsup.c b/www/apache22/files/patch-srclib:apr:threadproc:unix:procsup.c deleted file mode 100644 index 13c663af7bd4..000000000000 --- a/www/apache22/files/patch-srclib:apr:threadproc:unix:procsup.c +++ /dev/null @@ -1,18 +0,0 @@ ---- srclib/apr/threadproc/unix/procsup.c.orig Mon Apr 8 22:08:18 2002 -+++ srclib/apr/threadproc/unix/procsup.c Sun Jul 21 08:45:44 2002 -@@ -59,6 +59,7 @@ - int x; - - chdir("/"); -+#ifndef FREEBSD_THREAD_HACK - #if !defined(MPE) && !defined(OS2) && !defined(TPF) && !defined(BEOS) - /* Don't detach for MPE because child processes can't survive the death of - * the parent. */ -@@ -89,6 +90,7 @@ - if (setpgid(0, 0) == -1) { - return errno; - } -+#endif - #endif - - /* close out the standard file descriptors */ diff --git a/www/apache22/files/patch-support:Makefile.in b/www/apache22/files/patch-support:Makefile.in deleted file mode 100644 index 930f282597a4..000000000000 --- a/www/apache22/files/patch-support:Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ ---- support/Makefile.in.orig Tue Dec 21 09:31:12 2004 -+++ support/Makefile.in Tue Dec 21 09:31:39 2004 -@@ -23,10 +23,7 @@ - fi ; \ - done - @if test -f "$(builddir)/envvars-std"; then \ -- cp -p envvars-std $(DESTDIR)$(sbindir); \ -- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \ -- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ -- fi ; \ -+ cp -p envvars-std $(DESTDIR)$(sbindir)/envvars; \ - fi - - htpasswd_OBJECTS = htpasswd.lo diff --git a/www/apache22/files/patch-support:apachectl.in b/www/apache22/files/patch-support:apachectl.in deleted file mode 100644 index 7c5c3238e955..000000000000 --- a/www/apache22/files/patch-support:apachectl.in +++ /dev/null @@ -1,11 +0,0 @@ ---- support/apachectl.in.orig Thu Sep 16 09:28:54 2004 -+++ support/apachectl.in Thu Sep 16 09:29:14 2004 -@@ -63,7 +63,7 @@ - ULIMIT_MAX_FILES="@APACHECTL_ULIMIT@" - # -------------------- -------------------- - # |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| -- -+eval `limits -e -C daemon` >/dev/null 2>&1 - # Set the maximum number of file descriptors allowed per child process. - if [ "x$ULIMIT_MAX_FILES" != "x" ] ; then - $ULIMIT_MAX_FILES diff --git a/www/apache22/files/patch-support:apxs.in b/www/apache22/files/patch-support:apxs.in deleted file mode 100644 index db8081fa4fc5..000000000000 --- a/www/apache22/files/patch-support:apxs.in +++ /dev/null @@ -1,12 +0,0 @@ ---- support/apxs.in.orig Mon Nov 29 10:24:23 2004 -+++ support/apxs.in Mon Nov 29 10:25:05 2004 -@@ -629,8 +629,7 @@ - if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) { - print FP $content; - close(FP); -- system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf $CFG_SYSCONFDIR/$CFG_TARGET.conf.bak && " . -- "cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " . -+ system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " . - "rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new"); - } else { - notice("unable to open configuration file"); diff --git a/www/apache22/files/patch-support:envvars-std.in b/www/apache22/files/patch-support:envvars-std.in deleted file mode 100644 index 61480348ae5d..000000000000 --- a/www/apache22/files/patch-support:envvars-std.in +++ /dev/null @@ -1,13 +0,0 @@ ---- support/envvars-std.in.orig Fri Dec 17 14:39:21 2004 -+++ support/envvars-std.in Fri Dec 17 14:41:06 2004 -@@ -21,3 +21,10 @@ - export @SHLIBPATH_VAR@ - # - @OS_SPECIFIC_VARS@ -+ -+ENVVARS_DIR=%%PREFIX%%/etc/apache21/envvars.d -+ -+for envvars_file in $(ls ${ENVVARS_DIR}/*.env 2>/dev/null) -+do -+ . ${envvars_file} -+done diff --git a/www/apache22/files/patch-support:log_server_status.in b/www/apache22/files/patch-support:log_server_status.in deleted file mode 100644 index 136bafb9ff1a..000000000000 --- a/www/apache22/files/patch-support:log_server_status.in +++ /dev/null @@ -1,20 +0,0 @@ ---- support/log_server_status.in.orig Tue Jun 18 23:21:53 2002 -+++ support/log_server_status.in Tue Jun 18 23:23:08 2002 -@@ -63,7 +63,7 @@ - # - require 'sys/socket.ph'; - --$wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/19960312" -+$wherelog = "@logfiledir@/httpd-status-"; # Logs will be like "/var/log/httpd-status-19960312.log" - $server = "localhost"; # Name of server, could be "www.foo.com" - $port = "80"; # Port on server - $request = "/status/?auto"; # Request to send -@@ -96,7 +96,7 @@ - chomp($date); - ($day,$time)=split(/:/,$date); - $res=&tcp_connect($server,$port); -- open(OUT,">>$wherelog$day"); -+ open(OUT,">>$wherelog$day.log"); - if ($res) { - print OUT "$time:-1:-1:-1:-1:$res\n"; - exit 1; |