diff options
Diffstat (limited to 'www/apache21/files')
20 files changed, 617 insertions, 0 deletions
diff --git a/www/apache21/files/apache.sh b/www/apache21/files/apache.sh new file mode 100644 index 000000000000..87300ba82a54 --- /dev/null +++ b/www/apache21/files/apache.sh @@ -0,0 +1,73 @@ +#!/bin/sh +# +# $FreeBSD: /tmp/pcvs/ports/www/apache21/files/Attic/apache.sh,v 1.7 2004-12-11 18:06:04 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} -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/apache21/files/apache21libs.sh b/www/apache21/files/apache21libs.sh new file mode 100644 index 000000000000..67fe5c302561 --- /dev/null +++ b/www/apache21/files/apache21libs.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +case "$1" in + start) + /sbin/ldconfig -m %%PREFIX%%/lib/apache2 + ;; + stop) + ;; + *) + echo "" + echo "Usage: `basename $0` { start | stop }" + echo "" + exit 64 + ;; +esac diff --git a/www/apache21/files/exp-windowsupdate.patch b/www/apache21/files/exp-windowsupdate.patch new file mode 100644 index 000000000000..3f1306777100 --- /dev/null +++ b/www/apache21/files/exp-windowsupdate.patch @@ -0,0 +1,11 @@ +--- 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/apache21/files/patch-Makefile.in b/www/apache21/files/patch-Makefile.in new file mode 100644 index 000000000000..1cd16ef183e7 --- /dev/null +++ b/www/apache21/files/patch-Makefile.in @@ -0,0 +1,113 @@ +--- Makefile.in.orig Thu Dec 2 08:34:20 2004 ++++ Makefile.in Sat Dec 11 16:39:40 2004 +@@ -36,10 +36,13 @@ + if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ + $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \ + fi; \ ++ cp -f $$i $$i-dist; \ ++ $(INSTALL_DATA) $$i-dist $(DESTDIR)$(sysconfdir); \ + done; \ + for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \ + cd $$j ; \ + 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 +60,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; \ +@@ -108,44 +114,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 +191,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/apache21/files/patch-config.layout b/www/apache21/files/patch-config.layout new file mode 100644 index 000000000000..3724aa43c9a4 --- /dev/null +++ b/www/apache21/files/patch-config.layout @@ -0,0 +1,25 @@ +--- 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/apache21/files/patch-configure.in b/www/apache21/files/patch-configure.in new file mode 100644 index 000000000000..6d77c65b7f07 --- /dev/null +++ b/www/apache21/files/patch-configure.in @@ -0,0 +1,35 @@ +--- configure.in.orig Thu Mar 18 08:36:52 2004 ++++ configure.in Fri Jul 2 11:44:25 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 --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir --datadir=$datadir --with-installbuilddir=$installbuilddir], + [--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" +@@ -96,7 +96,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 --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir], + [--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" +@@ -545,8 +545,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/apache21/files/patch-docs:conf:httpd-std.conf.in b/www/apache21/files/patch-docs:conf:httpd-std.conf.in new file mode 100644 index 000000000000..150c922152f7 --- /dev/null +++ b/www/apache21/files/patch-docs:conf:httpd-std.conf.in @@ -0,0 +1,94 @@ +--- docs/conf/httpd-std.conf.in.orig Sat Nov 20 21:16:24 2004 ++++ docs/conf/httpd-std.conf.in Sat Dec 11 16:49:35 2004 +@@ -68,7 +68,7 @@ + # + #<IfModule !mpm_netware.c> + #<IfModule !perchild.c> +-#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 mod_userdir.c> + 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> + + # +@@ -1082,3 +1098,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/apache21/files/patch-docs:conf:ssl-std.conf.in b/www/apache21/files/patch-docs:conf:ssl-std.conf.in new file mode 100644 index 000000000000..cf0bbeab218d --- /dev/null +++ b/www/apache21/files/patch-docs:conf:ssl-std.conf.in @@ -0,0 +1,24 @@ +$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/apache21/files/patch-srclib:apr-util:Makefile.in b/www/apache21/files/patch-srclib:apr-util:Makefile.in new file mode 100644 index 000000000000..76805db43fcc --- /dev/null +++ b/www/apache21/files/patch-srclib:apr-util:Makefile.in @@ -0,0 +1,15 @@ +--- srclib/apr-util/Makefile.in.orig Wed Nov 17 02:12:20 2004 ++++ srclib/apr-util/Makefile.in Sat Dec 11 18:20:07 2004 +@@ -55,11 +55,10 @@ + 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) + $(INSTALL_DATA) $(top_srcdir)/include/*.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) $(top_blddir)/include/*.h $(DESTDIR)$(includedir) +- $(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/apache21/files/patch-srclib:apr-util:config.layout b/www/apache21/files/patch-srclib:apr-util:config.layout new file mode 100644 index 000000000000..222e91d975bc --- /dev/null +++ b/www/apache21/files/patch-srclib:apr-util:config.layout @@ -0,0 +1,10 @@ +--- srclib/apr-util/config.layout.orig Tue Jan 7 13:13:09 2003 ++++ srclib/apr-util/config.layout Tue Apr 1 18:36:16 2003 +@@ -229,3 +229,7 @@ + infodir: ${exec_prefix}/share/info + libsuffix -${APRUTIL_MAJOR_VERSION} + </Layout> ++ ++<Layout FreeBSD> ++ libsuffix: ++</Layout> diff --git a/www/apache21/files/patch-srclib:apr-util:xml:expat:buildconf.sh b/www/apache21/files/patch-srclib:apr-util:xml:expat:buildconf.sh new file mode 100644 index 000000000000..c4922c1573b9 --- /dev/null +++ b/www/apache21/files/patch-srclib:apr-util:xml:expat:buildconf.sh @@ -0,0 +1,20 @@ +--- 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/apache21/files/patch-srclib:apr-utils:build:dbm.m4 b/www/apache21/files/patch-srclib:apr-utils:build:dbm.m4 new file mode 100644 index 000000000000..78b4b2c57d59 --- /dev/null +++ b/www/apache21/files/patch-srclib:apr-utils:build:dbm.m4 @@ -0,0 +1,55 @@ +--- srclib/apr-util/build/dbm.m4.orig Wed Nov 17 02:12:20 2004 ++++ srclib/apr-util/build/dbm.m4 Sat Dec 11 17:08:31 2004 +@@ -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 diff --git a/www/apache21/files/patch-srclib:apr:Makefile.in b/www/apache21/files/patch-srclib:apr:Makefile.in new file mode 100644 index 000000000000..4a9bbf0d3684 --- /dev/null +++ b/www/apache21/files/patch-srclib:apr:Makefile.in @@ -0,0 +1,16 @@ +--- srclib/apr/Makefile.in.orig Wed Nov 17 02:07:02 2004 ++++ srclib/apr/Makefile.in Sat Dec 11 18:19:36 2004 +@@ -67,12 +67,11 @@ + + 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) + $(INSTALL_DATA) $(top_srcdir)/include/apr_*.h $(DESTDIR)$(includedir) + $(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/apache21/files/patch-srclib:apr:build:buildcheck.sh b/www/apache21/files/patch-srclib:apr:build:buildcheck.sh new file mode 100644 index 000000000000..1262a9422284 --- /dev/null +++ b/www/apache21/files/patch-srclib:apr:build:buildcheck.sh @@ -0,0 +1,11 @@ +--- srclib/apr/build/buildcheck.sh.orig Sun Jun 6 23:19:19 2004 ++++ srclib/apr/build/buildcheck.sh Sat Dec 11 16:57:18 2004 +@@ -38,7 +38,7 @@ + # output is multiline from 1.5 onwards + + # Require libtool 1.3.3 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/apache21/files/patch-srclib:apr:buildconf b/www/apache21/files/patch-srclib:apr:buildconf new file mode 100644 index 000000000000..d3483efcc7eb --- /dev/null +++ b/www/apache21/files/patch-srclib:apr:buildconf @@ -0,0 +1,29 @@ +--- 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/apache21/files/patch-srclib:apr:config.layout b/www/apache21/files/patch-srclib:apr:config.layout new file mode 100644 index 000000000000..5c52779635fc --- /dev/null +++ b/www/apache21/files/patch-srclib:apr:config.layout @@ -0,0 +1,10 @@ +--- srclib/apr/config.layout.orig Tue Jan 7 13:06:50 2003 ++++ srclib/apr/config.layout Tue Apr 1 18:36:51 2003 +@@ -229,3 +229,7 @@ + infodir: ${exec_prefix}/share/info + libsuffix: -${APR_MAJOR_VERSION} + </Layout> ++ ++<Layout FreeBSD> ++ libsuffix: ++</Layout> diff --git a/www/apache21/files/patch-srclib:apr:threadproc:unix:procsup.c b/www/apache21/files/patch-srclib:apr:threadproc:unix:procsup.c new file mode 100644 index 000000000000..13c663af7bd4 --- /dev/null +++ b/www/apache21/files/patch-srclib:apr:threadproc:unix:procsup.c @@ -0,0 +1,18 @@ +--- 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/apache21/files/patch-support:apachectl.in b/www/apache21/files/patch-support:apachectl.in new file mode 100644 index 000000000000..7c5c3238e955 --- /dev/null +++ b/www/apache21/files/patch-support:apachectl.in @@ -0,0 +1,11 @@ +--- 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/apache21/files/patch-support:apxs.in b/www/apache21/files/patch-support:apxs.in new file mode 100644 index 000000000000..db8081fa4fc5 --- /dev/null +++ b/www/apache21/files/patch-support:apxs.in @@ -0,0 +1,12 @@ +--- 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/apache21/files/patch-support:log_server_status.in b/www/apache21/files/patch-support:log_server_status.in new file mode 100644 index 000000000000..136bafb9ff1a --- /dev/null +++ b/www/apache21/files/patch-support:log_server_status.in @@ -0,0 +1,20 @@ +--- 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; |