From cfa00f01bbc24053f541604ac751cf0ad914c404 Mon Sep 17 00:00:00 2001 From: Will Andrews Date: Fri, 13 Apr 2001 04:43:48 +0000 Subject: Bring in Apache 2.0.16-beta. Just in time for the release... PR: 26410 Submitted by: Chang, Hye-Shik Repocopied by: asami --- www/apache22/files/FreeBSD.layout | 19 -- www/apache22/files/patch-Makefile.in | 123 +++++++++++++ www/apache22/files/patch-aa | 24 --- www/apache22/files/patch-ab | 84 --------- www/apache22/files/patch-ag | 66 ------- www/apache22/files/patch-ak | 19 -- www/apache22/files/patch-al | 24 --- www/apache22/files/patch-build:rules.mk | 14 ++ www/apache22/files/patch-config.layout | 25 +++ www/apache22/files/patch-configure | 32 ++++ www/apache22/files/patch-docs:conf:httpd-std.conf | 203 +++++++++++++++++++++ www/apache22/files/patch-include:httpd.h | 38 ++++ .../files/patch-srclib:apr-util:Makefile.in | 22 +++ www/apache22/files/patch-srclib:apr:Makefile.in | 22 +++ www/apache22/files/patch-support:apachectl.in | 24 +++ www/apache22/files/patch-support:apxs.in | 11 ++ .../files/patch-support:log_server_status.in | 24 +++ www/apache22/files/patch-util.c | 53 ------ 18 files changed, 538 insertions(+), 289 deletions(-) delete mode 100644 www/apache22/files/FreeBSD.layout create mode 100644 www/apache22/files/patch-Makefile.in delete mode 100644 www/apache22/files/patch-aa delete mode 100644 www/apache22/files/patch-ab delete mode 100644 www/apache22/files/patch-ag delete mode 100644 www/apache22/files/patch-ak delete mode 100644 www/apache22/files/patch-al create mode 100644 www/apache22/files/patch-build:rules.mk create mode 100644 www/apache22/files/patch-config.layout create mode 100644 www/apache22/files/patch-configure create mode 100644 www/apache22/files/patch-docs:conf:httpd-std.conf create mode 100644 www/apache22/files/patch-include:httpd.h create mode 100644 www/apache22/files/patch-srclib:apr-util:Makefile.in create mode 100644 www/apache22/files/patch-srclib:apr:Makefile.in create mode 100644 www/apache22/files/patch-support:apachectl.in create mode 100644 www/apache22/files/patch-support:apxs.in create mode 100644 www/apache22/files/patch-support:log_server_status.in delete mode 100644 www/apache22/files/patch-util.c (limited to 'www/apache22/files') diff --git a/www/apache22/files/FreeBSD.layout b/www/apache22/files/FreeBSD.layout deleted file mode 100644 index 5524e186e9c0..000000000000 --- a/www/apache22/files/FreeBSD.layout +++ /dev/null @@ -1,19 +0,0 @@ -# FreeBSD layout... - - prefix: /usr/local - exec_prefix: $prefix - bindir: $exec_prefix/bin - sbindir: $exec_prefix/sbin - libexecdir: $exec_prefix/libexec/apache - mandir: $prefix/man - sysconfdir: $prefix/etc/apache - datadir: $prefix/www - iconsdir: $datadir/icons - htdocsdir: $datadir/data - cgidir: $datadir/cgi-bin - includedir: $prefix/include/apache - localstatedir: /var - runtimedir: $localstatedir/run - logfiledir: $localstatedir/log - proxycachedir: $datadir/proxy - diff --git a/www/apache22/files/patch-Makefile.in b/www/apache22/files/patch-Makefile.in new file mode 100644 index 000000000000..341c8dfd087f --- /dev/null +++ b/www/apache22/files/patch-Makefile.in @@ -0,0 +1,123 @@ +--- Makefile.in.orig Wed Apr 4 02:03:35 2001 ++++ Makefile.in Sun Apr 8 06:06:58 2001 +@@ -16,7 +16,7 @@ + targets = $(PROGRAMS) $(other_targets) + phony_targets = $(srcdir)/buildmark.c + install_targets = install-conf install-htdocs install-icons install-other \ +- install-cgi install-include install-support install-suexec ++ install-cgi install-include install-support install-manpages install-suexec + DISTCLEAN_TARGETS = include/config_auto.h modules.c aclocal.m4 buildmk.stamp \ + configure generated_lists include/ap_config_auto.h \ + include/ap_config_auto.h.in include/ap_config_path.h install-sh \ +@@ -28,25 +28,32 @@ + install-conf: + @echo Installing configuration files + @test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir) ++ + @cd docs/conf; \ + for i in mime.types magic; do \ +- $(INSTALL_DATA) $$i $(sysconfdir); \ ++ $(INSTALL_DATA) $$i $(sysconfdir)/$$i.default; \ ++ test -f $(sysconfdir)/$$i || cp -fp $(sysconfdir)/$$i.default $(sysconfdir)/$$i; \ + done; \ + for i in *-std*; do \ + sed -e 's#@@ServerRoot@@#$(prefix)#g' \ + -e 's#@@Port@@#$(PORT)#g' \ +- < $$i > $(sysconfdir)/$$i; \ +- chmod 0644 $(sysconfdir)/$$i; \ ++ < $$i > $(sysconfdir)/$$i.default; \ ++ chmod 0644 $(sysconfdir)/$$i.default; \ ++ test -f $(sysconfdir)/$$i || cp -fp $(sysconfdir)/$$i.default $(sysconfdir)/$$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 $(sysconfdir)/$$file; then \ +- $(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \ ++ $(INSTALL_DATA) $(sysconfdir)/$$i.default $(sysconfdir)/$$file.default; \ ++ test -f $(sysconfdir)/$$file || cp -fp $(sysconfdir)/$$file.default $(sysconfdir)/$$file; \ + fi; \ + done + + htdocs-srcdir = docs/docroot ++htman-srcdir = docs/manual ++doc_prefix = $(prefix)/share/doc/apache ++man-srcdir = docs/man + + docs:: + mkdir -p ./docs/api +@@ -57,11 +64,14 @@ + + install-htdocs: + @echo Installing HTML documents +- @test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir) +- @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir)) +- @test -d $(htdocsdir)/manual || $(MKINSTALLDIRS) $(htdocsdir)/manual +- @test -d docs/manual && (cd docs/manual && cp -rp * $(htdocsdir)/manual) +- @(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;) ++ @test -d $(doc_prefix) || $(MKINSTALLDIRS) $(doc_prefix) ++ @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(doc_prefix)) ++ @test -d $(doc_prefix)/manual || $(MKINSTALLDIRS) $(doc_prefix)/manual ++ @test -d $(htman-srcdir) && (cd $(htman-srcdir) && cp -rp * $(doc_prefix)/manual) ++ @test -d $(htdocsdir) || ($(MKINSTALLDIRS) $(htdocsdir) && rm -rf $(htdocsdir)) ++ @test -d $(htdocsdir) || ln -s $(doc_prefix) $(htdocsdir) ++ @test -d $(htdocsdir).default || ln -s $(doc_prefix) $(htdocsdir).default ++ @(cd $(doc_prefix) && find . -name "CVS" -print | xargs rm -rf {} \;) + + install-icons: + @echo Installing icons +@@ -71,24 +81,27 @@ + + install-cgi: + @echo Installing CGIs +- @test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir) +- @(cd docs/cgi-examples && cp -rp * $(cgidir)) +- @(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;) ++ @test -d $(cgidir).default || $(MKINSTALLDIRS) $(cgidir).default ++ @(cd docs/cgi-examples && cp -rp * $(cgidir).default) ++ @test -d $(cgidir) || ln -s $(cgidir).default $(cgidir) ++ @(cd $(cgidir).default && find . -name "CVS" -print | xargs rm -rf {} \;) + + install-support: + @echo Installing Support Binaries + @test -d $(bindir) || $(MKINSTALLDIRS) $(bindir) +- @cp -p $(srcdir)/support/httpd.exp $(bindir) ++ @test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir) ++ @test -d $(libexecdir) || $(MKINSTALLDIRS) $(libexecdir) ++ @cp -p $(srcdir)/support/httpd.exp $(libexecdir) + @cp -p $(builddir)/support/htpasswd $(bindir) + @cp -p $(builddir)/support/htdigest $(bindir) +- @cp -p $(builddir)/support/rotatelogs $(bindir) +- @cp -p $(builddir)/support/logresolve $(bindir) +- @cp -p $(builddir)/support/ab $(bindir) +- @cp -p $(builddir)/support/apachectl $(bindir) +- chmod 755 $(bindir)/apachectl ++ @cp -p $(builddir)/support/rotatelogs $(sbindir) ++ @cp -p $(builddir)/support/logresolve $(sbindir) ++ @cp -p $(builddir)/support/ab $(sbindir) ++ @cp -p $(builddir)/support/apachectl $(sbindir) ++ chmod 755 $(sbindir)/apachectl + @if test -f $(builddir)/support/apxs; then \ +- cp -p $(builddir)/support/apxs $(bindir); \ +- chmod 755 $(bindir)/apxs; \ ++ cp -p $(builddir)/support/apxs $(sbindir); \ ++ chmod 755 $(sbindir)/apxs; \ + fi + + +@@ -117,6 +130,15 @@ + @cp -p $(srcdir)/srclib/apr-util/include/*.h $(includedir) + @cp -p $(srcdir)/os/$(OS_DIR)/*.h $(includedir) + @chmod 644 $(includedir)/*.h ++ ++install-manpages: ++ @echo Installing manual pages ++ @test -d $(mandir) || $(MKINSTALLDIRS) $(mandir) ++ @for sect in 1 8; do \ ++ test -d $(mandir)/man$$sect || $(MKINSTALLDIRS) $(mandir)/man$$sect; \ ++ test -d $(man-srcdir) && (cd $(man-srcdir) && cp -p *.$$sect $(mandir)/man$$sect); \ ++ done; ++ @(cd $(mandir) && find . -name "CVS" -print | xargs rm -rf {} \;) + + install-suexec: + @if test -f $(builddir)/support/suexec; then \ diff --git a/www/apache22/files/patch-aa b/www/apache22/files/patch-aa deleted file mode 100644 index 15cd58c27ef2..000000000000 --- a/www/apache22/files/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ ---- configure.orig Tue Jan 18 01:53:17 2000 -+++ configure Mon Jan 24 19:37:21 2000 -@@ -1232,8 +1232,8 @@ - echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid" - echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard" - echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock" -- echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log" -- echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log" -+ echo " DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log" -+ echo " DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log" - echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" - echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf" - echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" -@@ -1330,8 +1330,8 @@ - echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci - echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci - echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci --echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci --echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci -+echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci -+echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci - echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci - echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci - echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci diff --git a/www/apache22/files/patch-ab b/www/apache22/files/patch-ab deleted file mode 100644 index e4448f1e47ca..000000000000 --- a/www/apache22/files/patch-ab +++ /dev/null @@ -1,84 +0,0 @@ ---- Makefile.tmpl.orig Tue Jan 11 22:47:41 2000 -+++ Makefile.tmpl Mon Jan 24 19:50:42 2000 -@@ -123,6 +123,7 @@ - runtimedir = @runtimedir@ - logfiledir = @logfiledir@ - proxycachedir = @proxycachedir@ -+doc_prefix = $(prefix)/share/doc/apache - - libexecdir_relative = @libexecdir_relative@ - -@@ -266,9 +267,9 @@ - $(MKDIR) $(root)$(mandir)/man1 - $(MKDIR) $(root)$(mandir)/man8 - $(MKDIR) $(root)$(sysconfdir) -- $(MKDIR) $(root)$(htdocsdir) -+ $(MKDIR) $(root)$(doc_prefix) - $(MKDIR) $(root)$(iconsdir) -- $(MKDIR) $(root)$(cgidir) -+ $(MKDIR) $(root)$(cgidir).default - $(MKDIR) $(root)$(includedir) - $(MKDIR) $(root)$(includedir)/xml - $(MKDIR) $(root)$(runtimedir) -@@ -452,25 +453,33 @@ - # 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 \ -- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ -- else \ -- echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \ -+# -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ -+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ -+# else \ -+ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ - (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\ -- (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \ -- find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \ -- find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \ -- fi -- -@if [ -f $(root)$(cgidir)/printenv ]; then \ -- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ -- else \ -+ (cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \ -+ find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \ -+ find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \ -+# fi -+ if [ ! -d $(root)$(htdocsdir) ]; then \ -+ $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \ -+ fi -+ $(RM) $(root)$(htdocsdir).default -+ $(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default -+# -@if [ -f $(root)$(cgidir)/printenv ]; then \ -+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ -+# else \ - for script in printenv test-cgi; do \ - cat $(TOP)/cgi-bin/$${script} |\ - sed -e 's;^#!/.*perl;#!$(PERL);' \ - > $(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_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \ -+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \ - done; \ -+# fi -+ if [ ! -d $(root)$(cgidir) ]; then \ -+ $(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \ - fi - @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ - (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\ -@@ -509,10 +518,10 @@ - -e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \ - -e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \ - -e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \ -- -e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \ -- -e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \ -- -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \ -- -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \ -+ -e "s;logs/access_log;$(logfiledir)/$${target_prefix}httpd-access.log;" \ -+ -e "s;logs/error_log;$(logfiledir)/$${target_prefix}httpd-error.log;" \ -+ -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \ -+ -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \ - -e 's;conf/magic;$(sysconfdir)/magic;' \ - -e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \ - -e 's;User nobody;User $(conf_user);' \ diff --git a/www/apache22/files/patch-ag b/www/apache22/files/patch-ag deleted file mode 100644 index 80373fbcca63..000000000000 --- a/www/apache22/files/patch-ag +++ /dev/null @@ -1,66 +0,0 @@ ---- conf/httpd.conf-dist.orig Mon Feb 21 08:30:46 2000 -+++ conf/httpd.conf-dist Mon May 29 16:48:49 2000 -@@ -354,7 +354,22 @@ - # directory index. Separate multiple entries with spaces. - # - -- DirectoryIndex index.html -+ -+ -+ DirectoryIndex index.php index.php3 index.html -+ -+ -+ DirectoryIndex index.php3 index.html -+ -+ -+ -+ -+ DirectoryIndex index.php index.html -+ -+ -+ DirectoryIndex index.html -+ -+ - - - # -@@ -473,7 +488,7 @@ - # define per- access logfiles, transactions will be - # logged therein and *not* in this file. - # --CustomLog logs/access_log common -+#CustomLog logs/access_log common - - # - # If you would like to have agent and referer logfiles, uncomment the -@@ -486,7 +501,7 @@ - # If you prefer a single logfile with access, agent, and referer information - # (Combined Logfile Format) you can use the following directive. - # --#CustomLog logs/access_log combined -+CustomLog logs/access_log combined - - # - # Optionally add a line containing the server version and virtual host -@@ -708,13 +723,17 @@ - # For example, the PHP 3.x module (not part of the Apache distribution - see - # http://www.php.net) will typically use: - # -- #AddType application/x-httpd-php3 .php3 -- #AddType application/x-httpd-php3-source .phps -+ -+ AddType application/x-httpd-php3 .php3 -+ AddType application/x-httpd-php3-source .php3s -+ - # - # And for PHP 4.x, use: - # -- #AddType application/x-httpd-php .php -- #AddType application/x-httpd-php-source .phps -+ -+ AddType application/x-httpd-php .php -+ AddType application/x-httpd-php-source .phps -+ - - AddType application/x-tar .tgz - diff --git a/www/apache22/files/patch-ak b/www/apache22/files/patch-ak deleted file mode 100644 index 486f7ad159cf..000000000000 --- a/www/apache22/files/patch-ak +++ /dev/null @@ -1,19 +0,0 @@ ---- src/support/apachectl.orig Wed Apr 7 00:36:33 1999 -+++ src/support/apachectl Fri Sep 3 15:41:01 1999 -@@ -39,6 +39,8 @@ - # -------------------- -------------------- - # |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| - -+eval `limits -e -C daemon` >/dev/null 2>&1 -+ - ERROR=0 - ARGV="$@" - if [ "x$ARGV" = "x" ] ; then -@@ -82,6 +84,7 @@ - fi - if kill $PID ; then - echo "$0 $ARG: httpd stopped" -+ rm $PIDFILE - else - echo "$0 $ARG: httpd could not be stopped" - ERROR=4 diff --git a/www/apache22/files/patch-al b/www/apache22/files/patch-al deleted file mode 100644 index b355a697b4ab..000000000000 --- a/www/apache22/files/patch-al +++ /dev/null @@ -1,24 +0,0 @@ ---- src/support/log_server_status.orig Fri Jun 4 19:54:19 1999 -+++ src/support/log_server_status Fri Sep 3 15:53:16 1999 -@@ -67,10 +67,10 @@ - # - require 'sys/socket.ph'; - --$wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/19960312" -+$wherelog = "/var/log/httpd-status-"; - $server = "localhost"; # Name of server, could be "www.foo.com" - $port = "80"; # Port on server --$request = "/status/?auto"; # Request to send -+$request = "/server-status/?auto"; # Request to send - - sub tcp_connect - { -@@ -100,7 +100,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; diff --git a/www/apache22/files/patch-build:rules.mk b/www/apache22/files/patch-build:rules.mk new file mode 100644 index 000000000000..d5058a91d8ca --- /dev/null +++ b/www/apache22/files/patch-build:rules.mk @@ -0,0 +1,14 @@ +--- build/rules.mk.orig Sun Apr 8 01:06:22 2001 ++++ build/rules.mk Sun Apr 8 01:05:46 2001 +@@ -172,9 +172,9 @@ + all-p: $(targets) + install-p: $(targets) $(install_targets) + @if test -n '$(PROGRAMS)'; then \ +- test -d $(bindir) || $(MKINSTALLDIRS) $(bindir); \ ++ test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir); \ + for i in "$(PROGRAMS)"; do \ +- $(INSTALL_PROGRAM) $$i $(bindir); \ ++ $(INSTALL_PROGRAM) $$i $(sbindir); \ + done; \ + fi + diff --git a/www/apache22/files/patch-config.layout b/www/apache22/files/patch-config.layout new file mode 100644 index 000000000000..75a700c6a805 --- /dev/null +++ b/www/apache22/files/patch-config.layout @@ -0,0 +1,25 @@ +--- config.layout.orig Sat Apr 7 04:19:44 2001 ++++ config.layout Sat Apr 7 04:20:28 2001 +@@ -249,3 +249,22 @@ + logfiledir: $prefix/logs + proxycachedir: $prefix/proxy + ++ ++ ++ prefix: /usr/local ++ exec_prefix: $prefix ++ bindir: $exec_prefix/bin ++ sbindir: $exec_prefix/sbin ++ libexecdir: $exec_prefix/libexec/apache ++ mandir: $prefix/man ++ sysconfdir: $prefix/etc/apache ++ datadir: $prefix/www ++ iconsdir: $datadir/icons ++ htdocsdir: $datadir/data ++ cgidir: $datadir/cgi-bin ++ includedir: $prefix/include/apache ++ localstatedir: /var ++ runtimedir: $localstatedir/run ++ logfiledir: $localstatedir/log ++ proxycachedir: $datadir/proxy ++ diff --git a/www/apache22/files/patch-configure b/www/apache22/files/patch-configure new file mode 100644 index 000000000000..5419d37c531c --- /dev/null +++ b/www/apache22/files/patch-configure @@ -0,0 +1,32 @@ +--- configure.orig Wed Apr 4 12:45:36 2001 ++++ configure Sun Apr 8 03:25:31 2001 +@@ -3760,7 +3760,9 @@ + -e "s/[ ]*$/'/g" \ + $srcdir/config.layout > $pldconf + layout_name=$LAYOUT ++ prefix_backup=$prefix # poor patch to prevent override prefix arg with default + . $pldconf ++ prefix=$prefix_backup + rm $pldconf + for var in prefix exec_prefix bindir sbindir libexecdir mandir \ + sysconfdir datadir iconsdir htdocsdir cgidir includedir \ +@@ -9678,6 +9680,10 @@ + + + APACHE_VAR_SUBST="$APACHE_VAR_SUBST sysconfdir" ++ APACHE_VAR_SUBST="$APACHE_VAR_SUBST runtimedir" ++ APACHE_VAR_SUBST="$APACHE_VAR_SUBST logfiledir" ++ APACHE_VAR_SUBST="$APACHE_VAR_SUBST mandir" ++ APACHE_VAR_SUBST="$APACHE_VAR_SUBST libdir" + + + +@@ -9814,7 +9820,7 @@ + EOF + + cat >> confdefs.h <> confdefs.h < +-ScoreBoardFile logs/apache_runtime_status ++ScoreBoardFile /var/run/apache_runtime_status + + + # +@@ -182,6 +182,28 @@ + # + # Example: + # LoadModule foo_module modules/mod_foo.so ++#LoadModule auth_anon_module libexec/apache/mod_auth_anon.so ++#LoadModule auth_db_module libexec/apache/mod_auth_db.so ++#LoadModule auth_digest_module libexec/apache/mod_auth_digest.so ++#LoadModule cern_meta_module libexec/apache/mod_cern_meta.so ++#LoadModule cgid_module libexec/apache/mod_cgid.so ++#LoadModule dav_module libexec/apache/mod_dav.so ++#LoadModule dav_fs_module libexec/apache/mod_dav_fs.so ++#LoadModule digest_module libexec/apache/mod_digest.so ++#LoadModule expires_module libexec/apache/mod_expires.so ++#LoadModule file_cache_module libexec/apache/mod_file_cache.so ++#LoadModule headers_module libexec/apache/mod_headers.so ++#LoadModule imap_module libexec/apache/mod_imap.so ++#LoadModule include_module libexec/apache/mod_include.so ++#LoadModule info_module libexec/apache/mod_info.so ++#LoadModule mime_magic_module libexec/apache/mod_mime_magic.so ++#LoadModule optional_fn_export_module libexec/apache/mod_optional_fn_export.so ++#LoadModule optional_fn_import_module libexec/apache/mod_optional_fn_import.so ++#LoadModule rewrite_module libexec/apache/mod_rewrite.so ++#LoadModule speling_module libexec/apache/mod_speling.so ++#LoadModule status_module libexec/apache/mod_status.so ++#LoadModule unique_id_module libexec/apache/mod_unique_id.so ++#LoadModule usertrack_module libexec/apache/mod_usertrack.so + + ### Section 2: 'Main' server configuration + # +@@ -221,7 +243,7 @@ + # don't use Group #-1 on these systems! + # + User nobody +-Group #-1 ++Group nogroup + + # + # ServerAdmin: Your address, where problems with the server should be +@@ -249,7 +271,7 @@ + # documents. By default, all requests are taken from this directory, but + # symbolic links and aliases may be used to point to other locations. + # +-DocumentRoot "@@ServerRoot@@/htdocs" ++DocumentRoot "@@ServerRoot@@/www/data" + + # + # Each directory to which Apache has access, can be configured with respect +@@ -274,7 +296,7 @@ + # + # This should be changed to whatever you set DocumentRoot to. + # +- ++ + + # + # This may also be "None", "All", or any combination of "Indexes", +@@ -326,7 +348,22 @@ + # DirectoryIndex: Name of the file or files to use as a pre-written HTML + # directory index. Separate multiple entries with spaces. + # +-DirectoryIndex index.html ++ ++ ++ DirectoryIndex index.php index.php3 index.html ++ ++ ++ DirectoryIndex index.php3 index.html ++ ++ ++ ++ ++ DirectoryIndex index.php index.html ++ ++ ++ DirectoryIndex index.html ++ ++ + + # + # AccessFileName: The name of the file to look for in each directory +@@ -372,7 +409,7 @@ + # TypesConfig describes where the mime.types file (or equivalent) is + # to be found. + # +-TypesConfig conf/mime.types ++TypesConfig etc/apache/mime.types + + # + # DefaultType is the default MIME type the server will use for a document +@@ -397,7 +434,7 @@ + # module is part of the server. + # + +- MIMEMagicFile conf/magic ++ MIMEMagicFile etc/apache/magic + + + # +@@ -417,7 +454,7 @@ + # logged here. If you *do* define an error logfile for a + # container, that host's errors will be logged there and not here. + # +-ErrorLog logs/error_log ++ErrorLog /var/log/httpd-error.log + + # + # LogLevel: Control the number of messages logged to the error_log. +@@ -442,7 +479,7 @@ + # define per- access logfiles, transactions will be + # logged therein and *not* in this file. + # +-CustomLog logs/access_log common ++#CustomLog logs/access_log common + + # + # If you would like to have agent and referer logfiles, uncomment the +@@ -455,7 +492,7 @@ + # If you prefer a single logfile with access, agent, and referer information + # (Combined Logfile Format) you can use the following directive. + # +-#CustomLog logs/access_log combined ++CustomLog /var/log/httpd-access.log combined + + # + # Optionally add a line containing the server version and virtual host +@@ -474,9 +511,9 @@ + # require it to be present in the URL. So "/icons" isn't aliased in this + # example, only "/icons/".. + # +-Alias /icons/ "@@ServerRoot@@/icons/" ++Alias /icons/ "@@ServerRoot@@/www/icons/" + +- ++ + Options Indexes MultiViews + AllowOverride None + Order allow,deny +@@ -491,7 +528,7 @@ + # The same rules about trailing "/" apply to ScriptAlias directives as to + # Alias. + # +-ScriptAlias /cgi-bin/ "@@ServerRoot@@/cgi-bin/" ++ScriptAlias /cgi-bin/ "@@ServerRoot@@/www/cgi-bin/" + + + # +@@ -505,7 +542,7 @@ + # "@@ServerRoot@@/cgi-bin" should be changed to whatever your ScriptAliased + # CGI directory exists, if you have that configured. + # +- ++ + AllowOverride None + Options None + Order allow,deny +@@ -657,6 +694,7 @@ + AddLanguage ja .ja + AddLanguage pl .po + AddLanguage kr .kr ++AddLanguage ko .kr + AddLanguage pt .pt + AddLanguage no .no + AddLanguage pt-br .pt-br +@@ -741,8 +779,17 @@ + # For example, the PHP3 module (not part of the Apache distribution - see + # http://www.php.net) will typically use: + # +-#AddType application/x-httpd-php3 .php3 +-#AddType application/x-httpd-php3-source .phps ++ ++ AddType application/x-httpd-php3 .php3 ++ AddType application/x-httpd-php3-source .php3s ++ ++# ++# And for PHP 4.x, use: ++# ++ ++ AddType application/x-httpd-php .php ++ AddType application/x-httpd-php-source .phps ++ + + AddType application/x-tar .tgz + diff --git a/www/apache22/files/patch-include:httpd.h b/www/apache22/files/patch-include:httpd.h new file mode 100644 index 000000000000..9f8fdf34997b --- /dev/null +++ b/www/apache22/files/patch-include:httpd.h @@ -0,0 +1,38 @@ +--- include/httpd.h.orig Sat Apr 7 09:11:19 2001 ++++ include/httpd.h Sat Apr 7 09:08:43 2001 +@@ -127,7 +127,7 @@ + /* Set default for OS/2 file system */ + #define DOCUMENT_LOCATION HTTPD_ROOT "/docs" + #else +-#define DOCUMENT_LOCATION HTTPD_ROOT "/htdocs" ++#define DOCUMENT_LOCATION HTTPD_ROOT "/www/data" + #endif + #endif /* DOCUMENT_LOCATION */ + +@@ -144,7 +144,7 @@ + #if defined(OS2) || defined(WIN32) + #define DEFAULT_ERRORLOG "logs/error.log" + #else +-#define DEFAULT_ERRORLOG "logs/error_log" ++#define DEFAULT_ERRORLOG "/var/log/httpd-error.log" + #endif + #endif /* DEFAULT_ERRORLOG */ + +@@ -160,7 +160,7 @@ + + /* The name of the server config file */ + #ifndef SERVER_CONFIG_FILE +-#define SERVER_CONFIG_FILE "conf/httpd.conf" ++#define SERVER_CONFIG_FILE "etc/apache/httpd.conf" + #endif + + /* Whether we should enable rfc1413 identity checking */ +@@ -247,7 +247,7 @@ + + /* 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 "etc/apache/mime.types" + #endif + + /* diff --git a/www/apache22/files/patch-srclib:apr-util:Makefile.in b/www/apache22/files/patch-srclib:apr-util:Makefile.in new file mode 100644 index 000000000000..652901dae28a --- /dev/null +++ b/www/apache22/files/patch-srclib:apr-util:Makefile.in @@ -0,0 +1,22 @@ +--- srclib/apr-util/Makefile.in.orig Wed Apr 4 12:27:42 2001 ++++ srclib/apr-util/Makefile.in Sun Apr 8 03:34:15 2001 +@@ -22,8 +22,8 @@ + + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ ++libdir=$(prefix)/lib ++includedir=$(prefix)/include/apache + + delete-lib: + @if test -f $(TARGET_LIB); then \ +@@ -43,7 +43,7 @@ + if [ ! -d $(libdir) ]; then \ + @APR_SOURCE_DIR@/build/mkdir.sh $(libdir); \ + fi; \ +- libtool --mode=install cp $(TARGET_LIB) $(libdir) ++ ../../libtool --mode=install cp $(TARGET_LIB) $(libdir) + + $(TARGET_LIB): + @objects="`find $(SUBDIRS) -name '*.lo'`" ; \ diff --git a/www/apache22/files/patch-srclib:apr:Makefile.in b/www/apache22/files/patch-srclib:apr:Makefile.in new file mode 100644 index 000000000000..4c0292f73af8 --- /dev/null +++ b/www/apache22/files/patch-srclib:apr:Makefile.in @@ -0,0 +1,22 @@ +--- srclib/apr/Makefile.in.orig Wed Apr 4 05:32:06 2001 ++++ srclib/apr/Makefile.in Sun Apr 8 03:33:43 2001 +@@ -37,8 +37,8 @@ + + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ ++libdir=$(prefix)/lib ++includedir=$(prefix)/include/apache + + delete-lib: + @if test -f $(TARGET_LIB); then \ +@@ -58,7 +58,7 @@ + if [ ! -d $(libdir) ]; then \ + ./build/mkdir.sh $(libdir); \ + fi; \ +- libtool --mode=install cp $(TARGET_LIB) $(libdir) ++ ../../libtool --mode=install cp $(TARGET_LIB) $(libdir) + + $(TARGET_LIB): + @for i in $(SUBDIRS); do objects="$$objects $$i/*.lo"; done ; \ diff --git a/www/apache22/files/patch-support:apachectl.in b/www/apache22/files/patch-support:apachectl.in new file mode 100644 index 000000000000..739a622d74de --- /dev/null +++ b/www/apache22/files/patch-support:apachectl.in @@ -0,0 +1,24 @@ +--- support/apachectl.in.orig Fri Feb 16 13:26:53 2001 ++++ support/apachectl.in Sun Apr 8 03:49:34 2001 +@@ -25,10 +25,10 @@ + # -------------------- -------------------- + # + # the path to your PID file +-PIDFILE=@prefix@/logs/httpd.pid ++PIDFILE=/var/run/httpd.pid + # + # the path to your httpd binary, including options if necessary +-HTTPD='@prefix@/bin/httpd' ++HTTPD='@prefix@/sbin/httpd' + # + # a command that outputs a formatted text version of the HTML at the + # url given on the command line. Designed for lynx, however other +@@ -41,6 +41,8 @@ + # + # -------------------- -------------------- + # |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| ++ ++eval `limits -e -C daemon` >/dev/null 2>&1 + + ERROR=0 + ARGV="$@" diff --git a/www/apache22/files/patch-support:apxs.in b/www/apache22/files/patch-support:apxs.in new file mode 100644 index 000000000000..70ca84075675 --- /dev/null +++ b/www/apache22/files/patch-support:apxs.in @@ -0,0 +1,11 @@ +--- support/apxs.in.orig Sat Apr 7 11:56:15 2001 ++++ support/apxs.in Sat Apr 7 11:55:28 2001 +@@ -73,7 +73,7 @@ + my $prefix = "$CFG_PREFIX"; + my $CFG_EXEC_PREFIX = "@exec_prefix@"; + my $exec_prefix = "$CFG_EXEC_PREFIX"; +-my $CFG_SBINDIR = "@bindir@"; ++my $CFG_SBINDIR = "@sbindir@"; + my $CFG_INCLUDEDIR = "@includedir@"; + my $CFG_LIBEXECDIR = "@libexecdir@"; + my $CFG_SYSCONFDIR = "@sysconfdir@"; diff --git a/www/apache22/files/patch-support:log_server_status.in b/www/apache22/files/patch-support:log_server_status.in new file mode 100644 index 000000000000..3549aa89f8c5 --- /dev/null +++ b/www/apache22/files/patch-support:log_server_status.in @@ -0,0 +1,24 @@ +--- support/log_server_status.in.orig Mon Mar 12 08:40:47 2001 ++++ support/log_server_status.in Sat Apr 7 05:45:42 2001 +@@ -63,10 +63,10 @@ + # + require 'sys/socket.ph'; + +-$wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/19960312" ++$wherelog = "/var/log/httpd-status-"; + $server = "localhost"; # Name of server, could be "www.foo.com" + $port = "80"; # Port on server +-$request = "/status/?auto"; # Request to send ++$request = "/server-status/?auto"; # Request to send + + sub tcp_connect + { +@@ -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; diff --git a/www/apache22/files/patch-util.c b/www/apache22/files/patch-util.c deleted file mode 100644 index 60f218221799..000000000000 --- a/www/apache22/files/patch-util.c +++ /dev/null @@ -1,53 +0,0 @@ -=================================================================== -RCS file: /home/cvs/apache-1.3/src/main/util.c,v -retrieving revision 1.194 -retrieving revision 1.197 -diff -u -r1.194 -r1.197 ---- src/main/util.c 2001/02/01 10:06:37 1.194 -+++ src/main/util.c 2001/03/30 17:37:54 1.197 -@@ -2013,12 +2013,14 @@ - int x; - - if (!strchr(p->h_name, '.')) { -- for (x = 0; p->h_aliases[x]; ++x) { -- if (strchr(p->h_aliases[x], '.') && -- (!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name)))) -- return ap_pstrdup(a, p->h_aliases[x]); -- } -- return NULL; -+ if (p->h_aliases) { -+ for (x = 0; p->h_aliases[x]; ++x) { -+ if (p->h_aliases[x] && strchr(p->h_aliases[x], '.') && -+ (!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name)))) -+ return ap_pstrdup(a, p->h_aliases[x]); -+ } -+ } -+ return NULL; - } - return ap_pstrdup(a, (void *) p->h_name); - } -@@ -2040,7 +2042,6 @@ - ap_log_error(APLOG_MARK, APLOG_WARNING, NULL, - "%s: gethostname() failed to determine ServerName\n", - ap_server_argv0); -- server_hostname = ap_pstrdup(a, "127.0.0.1"); - } - else - { -@@ -2048,14 +2049,14 @@ - if ((!(p = gethostbyname(str))) - || (!(server_hostname = find_fqdn(a, p)))) { - /* Recovery - return the default servername by IP: */ -- if (p->h_addr_list[0]) { -+ if (p && p->h_addr_list && p->h_addr_list[0]) { - ap_snprintf(str, sizeof(str), "%pA", p->h_addr_list[0]); - server_hostname = ap_pstrdup(a, str); - /* We will drop through to report the IP-named server */ - } - } - else -- /* Since we found a fdqn, return it with no logged message. */ -+ /* Since we found a fqdn, return it with no logged message. */ - return server_hostname; - } - -- cgit v1.2.3