diff options
30 files changed, 950 insertions, 1265 deletions
diff --git a/www/apache13/Makefile b/www/apache13/Makefile index 4c35dd579665..fa4826d25231 100644 --- a/www/apache13/Makefile +++ b/www/apache13/Makefile @@ -3,30 +3,30 @@ # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@nagual.pp.ru # -# $Id: Makefile,v 1.63 1998/10/19 12:48:55 smace Exp $ +# $Id: Makefile,v 1.64 1999/01/13 02:47:32 scrappy Exp $ # -DISTNAME= apache_1.3.3 -PKGNAME= apache-1.3.3 +DISTNAME= apache_1.3.4 +PKGNAME= apache-1.3.4 CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ -#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.3/ - MAINTAINER= ache@freebsd.org Y2K= http://www.apache.org/docs/misc/FAQ.html#year2000 + # # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance # GNU_CONFIGURE= yes CONFIGURE_ARGS= \ + --with-layout=GNU \ --sysconfdir=${PREFIX}/etc/apache \ --includedir=${PREFIX}/include/apache \ - --logfiledir=/var/log \ - --runtimedir=/var/run \ + --localstatedir=/var \ --datadir=${PREFIX}/www \ + --suexec-docroot=${PREFIX}/www/data \ --proxycachedir=${PREFIX}/www/proxy \ --libexecdir=${PREFIX}/libexec/apache \ --without-confadjust \ diff --git a/www/apache13/distinfo b/www/apache13/distinfo index 810fe93364ba..1ec9f3e89a85 100644 --- a/www/apache13/distinfo +++ b/www/apache13/distinfo @@ -1 +1 @@ -MD5 (apache_1.3.3.tar.gz) = bb6f14bbb369097a55969482d395d1ae +MD5 (apache_1.3.4.tar.gz) = eab1d93bc17e7d9fcf87dc9fa744a9d3 diff --git a/www/apache13/files/patch-aa b/www/apache13/files/patch-aa index 95661a056d8d..1a054409abf9 100644 --- a/www/apache13/files/patch-aa +++ b/www/apache13/files/patch-aa @@ -1,40 +1,24 @@ -*** configure.orig Thu Sep 17 12:07:53 1998 ---- configure Thu Sep 24 03:57:33 1998 -*************** -*** 870,877 **** - echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" - echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" - echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" -! echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log" -! echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log" - echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" - echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" - echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" ---- 870,877 ---- - echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" - echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" - echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" -! 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}httpd.conf" - echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" -*************** -*** 935,942 **** - echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci - echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci - echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.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 '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci - echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci - echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci ---- 935,942 ---- - echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci - echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci - echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$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}httpd.conf\"'" >>$src/apaci - echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci +--- configure.orig Sat Jan 2 16:19:41 1999 ++++ configure Fri Jan 15 00:44:01 1999 +@@ -1012,8 +1012,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" +@@ -1091,8 +1091,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/apache13/files/patch-ab b/www/apache13/files/patch-ab index 50e0de52fc30..0639f2c81376 100644 --- a/www/apache13/files/patch-ab +++ b/www/apache13/files/patch-ab @@ -1,152 +1,94 @@ -*** Makefile.tmpl.orig Sat Sep 19 16:41:48 1998 ---- Makefile.tmpl Thu Sep 24 04:07:49 1998 -*************** -*** 107,112 **** ---- 107,113 ---- - runtimedir = @runtimedir@ - logfiledir = @logfiledir@ - proxycachedir = @proxycachedir@ -+ doc_prefix = $(prefix)/share/doc/apache - - libexecdir_relative = @libexecdir_relative@ - -*************** -*** 167,173 **** - -DGID_MIN=$(suexec_gidmin) \ - -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ - -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ -! -DDOC_ROOT=\"$(datadir)/htdocs\" \ - -DSAFE_PATH=\"$(suexec_safepath)\" \ - ' \ - suexec; \ ---- 168,174 ---- - -DGID_MIN=$(suexec_gidmin) \ - -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ - -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ -! -DDOC_ROOT=\"$(datadir)/data\" \ - -DSAFE_PATH=\"$(suexec_safepath)\" \ - ' \ - suexec; \ -*************** -*** 224,232 **** - $(MKDIR) $(root)$(mandir)/man1 - $(MKDIR) $(root)$(mandir)/man8 - $(MKDIR) $(root)$(sysconfdir) -! $(MKDIR) $(root)$(datadir)/htdocs - $(MKDIR) $(root)$(datadir)/icons -! $(MKDIR) $(root)$(datadir)/cgi-bin - $(MKDIR) $(root)$(includedir) - $(MKDIR) $(root)$(runtimedir) - $(MKDIR) $(root)$(logfiledir) ---- 225,233 ---- - $(MKDIR) $(root)$(mandir)/man1 - $(MKDIR) $(root)$(mandir)/man8 - $(MKDIR) $(root)$(sysconfdir) -! $(MKDIR) $(root)$(doc_prefix) - $(MKDIR) $(root)$(datadir)/icons -! $(MKDIR) $(root)$(datadir)/cgi-bin.default - $(MKDIR) $(root)$(includedir) - $(MKDIR) $(root)$(runtimedir) - $(MKDIR) $(root)$(logfiledir) -*************** -*** 340,365 **** - # icons and distributed CGI scripts. - install-data: - @echo "===> [data: Installing initial data files]" -! -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ -! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ -! else \ -! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \ - (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\ -! (cd $(root)$(datadir)/htdocs/ && $(TAR) xf -); \ -! find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \ -! find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \ -! fi -! -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ -! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ -! 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)$(datadir)/cgi-bin/$${script}"; \ -! $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \ - done; \ -! fi - @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ - (cd $(TOP)/icons/ && $(TAR) cf - *) |\ - (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \ ---- 341,373 ---- - # icons and distributed CGI scripts. - install-data: - @echo "===> [data: Installing initial data files]" -! # -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ -! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ -! # else \ -! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ - (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\ -! (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)$(datadir)/data ]; then \ -! $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data; \ -! fi -! $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data.default -! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ -! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ -! # 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)$(datadir)/cgi-bin.default/$${script}"; \ -! $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin.default/$${script}; \ - done; \ -! # fi -! if [ ! -d $(root)$(datadir)/cgi-bin ]; then \ -! $(LN) -sf $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ -! fi - @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ - (cd $(TOP)/icons/ && $(TAR) cf - *) |\ - (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \ -*************** -*** 378,384 **** - echo ""; \ - cat $(TOP)/conf/$${conf}-dist ) |\ - sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ -! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \ - -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ - -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ - -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ ---- 386,392 ---- - echo ""; \ - cat $(TOP)/conf/$${conf}-dist ) |\ - sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ -! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \ - -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ - -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ - -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ -*************** -*** 386,395 **** - -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ - -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \ - -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \ -! -e 's;logs/access_log;$(logfiledir)/access_log;' \ -! -e 's;logs/error_log;$(logfiledir)/error_log;' \ -! -e 's;logs/referer_log;$(logfiledir)/referer_log;' \ -! -e 's;logs/agent_log;$(logfiledir)/agent_log;' \ - -e 's;conf/magic;$(sysconfdir)/magic;' \ - -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ - -e 's;Group #-1;Group $(conf_group);' \ ---- 394,403 ---- - -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ - -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \ - -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \ -! -e 's;logs/access_log;$(logfiledir)/httpd-access.log;' \ -! -e 's;logs/error_log;$(logfiledir)/httpd-error.log;' \ -! -e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \ -! -e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \ - -e 's;conf/magic;$(sysconfdir)/magic;' \ - -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ - -e 's;Group #-1;Group $(conf_group);' \ +--- Makefile.tmpl.orig Thu Jan 7 14:50:45 1999 ++++ Makefile.tmpl Fri Jan 15 02:39:17 1999 +@@ -110,6 +110,7 @@ + runtimedir = @runtimedir@ + logfiledir = @logfiledir@ + proxycachedir = @proxycachedir@ ++doc_prefix = $(prefix)/share/doc/apache + + libexecdir_relative = @libexecdir_relative@ + +@@ -239,9 +240,9 @@ + $(MKDIR) $(root)$(mandir)/man1 + $(MKDIR) $(root)$(mandir)/man8 + $(MKDIR) $(root)$(sysconfdir) +- $(MKDIR) $(root)$(datadir)/htdocs ++ $(MKDIR) $(root)$(doc_prefix) + $(MKDIR) $(root)$(datadir)/icons +- $(MKDIR) $(root)$(datadir)/cgi-bin ++ $(MKDIR) $(root)$(datadir)/cgi-bin.default + $(MKDIR) $(root)$(includedir) + $(MKDIR) $(root)$(runtimedir) + $(MKDIR) $(root)$(logfiledir) +@@ -363,25 +364,33 @@ + # icons and distributed CGI scripts. + install-data: + @echo "===> [data: Installing initial data files]" +- -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ +- else \ +- echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \ ++# -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ ++# else \ ++ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ + (cd $(TOP)/htdocs/ && $(TAR) -hcf - *) |\ +- (cd $(root)$(datadir)/htdocs/ && $(TAR) -xf -); \ +- find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \ +- find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \ +- fi +- -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ +- 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)$(datadir)/data ]; then \ ++ $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data; \ ++ fi ++ $(RM) $(root)$(datadir)/data.default ++ $(LN) -s $(root)$(doc_prefix) $(root)$(datadir)/data.default ++# -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ++# 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)$(datadir)/cgi-bin/$${script}"; \ +- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \ +- done; \ ++ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin.default/$${script}"; \ ++ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin.default/$${script}; \ ++ done; ++# fi ++ if [ ! -d $(root)$(datadir)/cgi-bin ]; then \ ++ $(LN) -sf $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ + fi + @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ + (cd $(TOP)/icons/ && $(TAR) -hcf - *) |\ +@@ -411,7 +420,7 @@ + echo ""; \ + cat $(TOP)/conf/$${conf}-dist ) |\ + sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ +- -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \ ++ -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \ + -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ + -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ + -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ +@@ -419,10 +428,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)/httpd-access.log;' \ ++ -e 's;logs/error_log;$(logfiledir)/httpd-error.log;' \ ++ -e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \ ++ -e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \ + -e 's;conf/magic;$(sysconfdir)/magic;' \ + -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ + -e 's;Group #-1;Group $(conf_group);' \ diff --git a/www/apache13/files/patch-ag b/www/apache13/files/patch-ag index 11aedaa76270..fe3b9579cd7f 100644 --- a/www/apache13/files/patch-ag +++ b/www/apache13/files/patch-ag @@ -1,53 +1,29 @@ -*** conf/httpd.conf-dist.orig Thu May 7 01:12:39 1998 ---- conf/httpd.conf-dist Fri Jun 5 19:34:17 1998 -*************** -*** 50,56 **** - # don't use Group #-1 on these systems! - - User nobody -! Group #-1 - - # ServerAdmin: Your address, where problems with the server should be - # e-mailed. ---- 50,56 ---- - # don't use Group #-1 on these systems! - - User nobody -! Group nogroup - - # ServerAdmin: Your address, where problems with the server should be - # e-mailed. -*************** -*** 94,100 **** - # The location of the access logfile (Common Logfile Format). - # If this does not start with /, ServerRoot is prepended to it. - -! CustomLog logs/access_log common - - # If you would like to have an agent and referer logfile uncomment the - # following directives. ---- 94,100 ---- - # The location of the access logfile (Common Logfile Format). - # If this does not start with /, ServerRoot is prepended to it. - -! #CustomLog logs/access_log common - - # If you would like to have an agent and referer logfile uncomment the - # following directives. -*************** -*** 105,111 **** - # 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 - - # PidFile: The file the server should log its pid to - PidFile logs/httpd.pid ---- 105,111 ---- - # 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 - - # PidFile: The file the server should log its pid to - PidFile logs/httpd.pid +--- conf/httpd.conf-dist.orig Sat Dec 12 20:04:29 1998 ++++ conf/httpd.conf-dist Fri Jan 15 01:08:36 1999 +@@ -241,7 +241,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 +@@ -459,7 +459,7 @@ + # define per-<VirtualHost> 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 +@@ -472,7 +472,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 diff --git a/www/apache13/pkg-plist b/www/apache13/pkg-plist index 3579a0e937ce..5e978c82e3c5 100644 --- a/www/apache13/pkg-plist +++ b/www/apache13/pkg-plist @@ -31,6 +31,7 @@ include/apache/http_request.h include/apache/http_vhost.h include/apache/httpd.h include/apache/multithread.h +include/apache/os-inline.c include/apache/os.h include/apache/rfc1413.h include/apache/scoreboard.h @@ -83,6 +84,7 @@ share/doc/apache/manual/images/mod_rewrite_fig2.fig share/doc/apache/manual/images/mod_rewrite_fig2.gif share/doc/apache/manual/images/sub.gif share/doc/apache/manual/index.html +share/doc/apache/manual/install-tpf.html share/doc/apache/manual/install.html share/doc/apache/manual/invoking.html share/doc/apache/manual/keepalive.html @@ -164,10 +166,12 @@ share/doc/apache/manual/new_features_1_1.html share/doc/apache/manual/new_features_1_2.html share/doc/apache/manual/new_features_1_3.html share/doc/apache/manual/process-model.html +share/doc/apache/manual/readme-tpf.html share/doc/apache/manual/sections.html share/doc/apache/manual/sourcereorg.html share/doc/apache/manual/stopping.html share/doc/apache/manual/suexec.html +share/doc/apache/manual/suexec_1_2.html share/doc/apache/manual/unixware.html share/doc/apache/manual/upgrading_to_1_3.html share/doc/apache/manual/vhosts/details.html @@ -247,6 +251,36 @@ www/icons/right.gif www/icons/screw1.gif www/icons/screw2.gif www/icons/script.gif +www/icons/small/README.txt +www/icons/small/back.gif +www/icons/small/binary.gif +www/icons/small/binhex.gif +www/icons/small/blank.gif +www/icons/small/broken.gif +www/icons/small/burst.gif +www/icons/small/comp1.gif +www/icons/small/comp2.gif +www/icons/small/compressed.gif +www/icons/small/continued.gif +www/icons/small/dir.gif +www/icons/small/dir2.gif +www/icons/small/forward.gif +www/icons/small/generic.gif +www/icons/small/generic2.gif +www/icons/small/generic3.gif +www/icons/small/image.gif +www/icons/small/image2.gif +www/icons/small/index.gif +www/icons/small/key.gif +www/icons/small/movie.gif +www/icons/small/rainbow.gif +www/icons/small/sound.gif +www/icons/small/sound2.gif +www/icons/small/tar.gif +www/icons/small/text.gif +www/icons/small/transfer.gif +www/icons/small/unknown.gif +www/icons/small/uu.gif www/icons/sound1.gif www/icons/sound2.gif www/icons/sphere1.gif @@ -272,6 +306,7 @@ www/icons/world2.gif @dirrm share/doc/apache/manual @dirrm share/doc/apache @dirrm www/cgi-bin.default +@dirrm www/icons/small @dirrm www/icons @dirrm www/proxy @dirrm www diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 4c35dd579665..fa4826d25231 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -3,30 +3,30 @@ # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@nagual.pp.ru # -# $Id: Makefile,v 1.63 1998/10/19 12:48:55 smace Exp $ +# $Id: Makefile,v 1.64 1999/01/13 02:47:32 scrappy Exp $ # -DISTNAME= apache_1.3.3 -PKGNAME= apache-1.3.3 +DISTNAME= apache_1.3.4 +PKGNAME= apache-1.3.4 CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ -#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.3/ - MAINTAINER= ache@freebsd.org Y2K= http://www.apache.org/docs/misc/FAQ.html#year2000 + # # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance # GNU_CONFIGURE= yes CONFIGURE_ARGS= \ + --with-layout=GNU \ --sysconfdir=${PREFIX}/etc/apache \ --includedir=${PREFIX}/include/apache \ - --logfiledir=/var/log \ - --runtimedir=/var/run \ + --localstatedir=/var \ --datadir=${PREFIX}/www \ + --suexec-docroot=${PREFIX}/www/data \ --proxycachedir=${PREFIX}/www/proxy \ --libexecdir=${PREFIX}/libexec/apache \ --without-confadjust \ diff --git a/www/apache2/distinfo b/www/apache2/distinfo index 810fe93364ba..1ec9f3e89a85 100644 --- a/www/apache2/distinfo +++ b/www/apache2/distinfo @@ -1 +1 @@ -MD5 (apache_1.3.3.tar.gz) = bb6f14bbb369097a55969482d395d1ae +MD5 (apache_1.3.4.tar.gz) = eab1d93bc17e7d9fcf87dc9fa744a9d3 diff --git a/www/apache2/files/patch-aa b/www/apache2/files/patch-aa index 95661a056d8d..1a054409abf9 100644 --- a/www/apache2/files/patch-aa +++ b/www/apache2/files/patch-aa @@ -1,40 +1,24 @@ -*** configure.orig Thu Sep 17 12:07:53 1998 ---- configure Thu Sep 24 03:57:33 1998 -*************** -*** 870,877 **** - echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" - echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" - echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" -! echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log" -! echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log" - echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" - echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" - echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" ---- 870,877 ---- - echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" - echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" - echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" -! 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}httpd.conf" - echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" -*************** -*** 935,942 **** - echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci - echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci - echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.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 '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci - echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci - echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci ---- 935,942 ---- - echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci - echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci - echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$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}httpd.conf\"'" >>$src/apaci - echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci +--- configure.orig Sat Jan 2 16:19:41 1999 ++++ configure Fri Jan 15 00:44:01 1999 +@@ -1012,8 +1012,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" +@@ -1091,8 +1091,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/apache2/files/patch-ab b/www/apache2/files/patch-ab index 50e0de52fc30..0639f2c81376 100644 --- a/www/apache2/files/patch-ab +++ b/www/apache2/files/patch-ab @@ -1,152 +1,94 @@ -*** Makefile.tmpl.orig Sat Sep 19 16:41:48 1998 ---- Makefile.tmpl Thu Sep 24 04:07:49 1998 -*************** -*** 107,112 **** ---- 107,113 ---- - runtimedir = @runtimedir@ - logfiledir = @logfiledir@ - proxycachedir = @proxycachedir@ -+ doc_prefix = $(prefix)/share/doc/apache - - libexecdir_relative = @libexecdir_relative@ - -*************** -*** 167,173 **** - -DGID_MIN=$(suexec_gidmin) \ - -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ - -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ -! -DDOC_ROOT=\"$(datadir)/htdocs\" \ - -DSAFE_PATH=\"$(suexec_safepath)\" \ - ' \ - suexec; \ ---- 168,174 ---- - -DGID_MIN=$(suexec_gidmin) \ - -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ - -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ -! -DDOC_ROOT=\"$(datadir)/data\" \ - -DSAFE_PATH=\"$(suexec_safepath)\" \ - ' \ - suexec; \ -*************** -*** 224,232 **** - $(MKDIR) $(root)$(mandir)/man1 - $(MKDIR) $(root)$(mandir)/man8 - $(MKDIR) $(root)$(sysconfdir) -! $(MKDIR) $(root)$(datadir)/htdocs - $(MKDIR) $(root)$(datadir)/icons -! $(MKDIR) $(root)$(datadir)/cgi-bin - $(MKDIR) $(root)$(includedir) - $(MKDIR) $(root)$(runtimedir) - $(MKDIR) $(root)$(logfiledir) ---- 225,233 ---- - $(MKDIR) $(root)$(mandir)/man1 - $(MKDIR) $(root)$(mandir)/man8 - $(MKDIR) $(root)$(sysconfdir) -! $(MKDIR) $(root)$(doc_prefix) - $(MKDIR) $(root)$(datadir)/icons -! $(MKDIR) $(root)$(datadir)/cgi-bin.default - $(MKDIR) $(root)$(includedir) - $(MKDIR) $(root)$(runtimedir) - $(MKDIR) $(root)$(logfiledir) -*************** -*** 340,365 **** - # icons and distributed CGI scripts. - install-data: - @echo "===> [data: Installing initial data files]" -! -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ -! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ -! else \ -! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \ - (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\ -! (cd $(root)$(datadir)/htdocs/ && $(TAR) xf -); \ -! find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \ -! find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \ -! fi -! -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ -! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ -! 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)$(datadir)/cgi-bin/$${script}"; \ -! $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \ - done; \ -! fi - @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ - (cd $(TOP)/icons/ && $(TAR) cf - *) |\ - (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \ ---- 341,373 ---- - # icons and distributed CGI scripts. - install-data: - @echo "===> [data: Installing initial data files]" -! # -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ -! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ -! # else \ -! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ - (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\ -! (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)$(datadir)/data ]; then \ -! $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data; \ -! fi -! $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data.default -! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ -! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ -! # 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)$(datadir)/cgi-bin.default/$${script}"; \ -! $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin.default/$${script}; \ - done; \ -! # fi -! if [ ! -d $(root)$(datadir)/cgi-bin ]; then \ -! $(LN) -sf $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ -! fi - @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ - (cd $(TOP)/icons/ && $(TAR) cf - *) |\ - (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \ -*************** -*** 378,384 **** - echo ""; \ - cat $(TOP)/conf/$${conf}-dist ) |\ - sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ -! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \ - -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ - -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ - -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ ---- 386,392 ---- - echo ""; \ - cat $(TOP)/conf/$${conf}-dist ) |\ - sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ -! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \ - -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ - -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ - -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ -*************** -*** 386,395 **** - -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ - -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \ - -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \ -! -e 's;logs/access_log;$(logfiledir)/access_log;' \ -! -e 's;logs/error_log;$(logfiledir)/error_log;' \ -! -e 's;logs/referer_log;$(logfiledir)/referer_log;' \ -! -e 's;logs/agent_log;$(logfiledir)/agent_log;' \ - -e 's;conf/magic;$(sysconfdir)/magic;' \ - -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ - -e 's;Group #-1;Group $(conf_group);' \ ---- 394,403 ---- - -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ - -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \ - -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \ -! -e 's;logs/access_log;$(logfiledir)/httpd-access.log;' \ -! -e 's;logs/error_log;$(logfiledir)/httpd-error.log;' \ -! -e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \ -! -e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \ - -e 's;conf/magic;$(sysconfdir)/magic;' \ - -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ - -e 's;Group #-1;Group $(conf_group);' \ +--- Makefile.tmpl.orig Thu Jan 7 14:50:45 1999 ++++ Makefile.tmpl Fri Jan 15 02:39:17 1999 +@@ -110,6 +110,7 @@ + runtimedir = @runtimedir@ + logfiledir = @logfiledir@ + proxycachedir = @proxycachedir@ ++doc_prefix = $(prefix)/share/doc/apache + + libexecdir_relative = @libexecdir_relative@ + +@@ -239,9 +240,9 @@ + $(MKDIR) $(root)$(mandir)/man1 + $(MKDIR) $(root)$(mandir)/man8 + $(MKDIR) $(root)$(sysconfdir) +- $(MKDIR) $(root)$(datadir)/htdocs ++ $(MKDIR) $(root)$(doc_prefix) + $(MKDIR) $(root)$(datadir)/icons +- $(MKDIR) $(root)$(datadir)/cgi-bin ++ $(MKDIR) $(root)$(datadir)/cgi-bin.default + $(MKDIR) $(root)$(includedir) + $(MKDIR) $(root)$(runtimedir) + $(MKDIR) $(root)$(logfiledir) +@@ -363,25 +364,33 @@ + # icons and distributed CGI scripts. + install-data: + @echo "===> [data: Installing initial data files]" +- -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ +- else \ +- echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \ ++# -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ ++# else \ ++ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ + (cd $(TOP)/htdocs/ && $(TAR) -hcf - *) |\ +- (cd $(root)$(datadir)/htdocs/ && $(TAR) -xf -); \ +- find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \ +- find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \ +- fi +- -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ +- 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)$(datadir)/data ]; then \ ++ $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data; \ ++ fi ++ $(RM) $(root)$(datadir)/data.default ++ $(LN) -s $(root)$(doc_prefix) $(root)$(datadir)/data.default ++# -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ++# 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)$(datadir)/cgi-bin/$${script}"; \ +- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \ +- done; \ ++ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin.default/$${script}"; \ ++ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin.default/$${script}; \ ++ done; ++# fi ++ if [ ! -d $(root)$(datadir)/cgi-bin ]; then \ ++ $(LN) -sf $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ + fi + @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ + (cd $(TOP)/icons/ && $(TAR) -hcf - *) |\ +@@ -411,7 +420,7 @@ + echo ""; \ + cat $(TOP)/conf/$${conf}-dist ) |\ + sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ +- -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \ ++ -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \ + -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ + -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ + -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ +@@ -419,10 +428,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)/httpd-access.log;' \ ++ -e 's;logs/error_log;$(logfiledir)/httpd-error.log;' \ ++ -e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \ ++ -e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \ + -e 's;conf/magic;$(sysconfdir)/magic;' \ + -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ + -e 's;Group #-1;Group $(conf_group);' \ diff --git a/www/apache2/files/patch-ag b/www/apache2/files/patch-ag index 11aedaa76270..fe3b9579cd7f 100644 --- a/www/apache2/files/patch-ag +++ b/www/apache2/files/patch-ag @@ -1,53 +1,29 @@ -*** conf/httpd.conf-dist.orig Thu May 7 01:12:39 1998 ---- conf/httpd.conf-dist Fri Jun 5 19:34:17 1998 -*************** -*** 50,56 **** - # don't use Group #-1 on these systems! - - User nobody -! Group #-1 - - # ServerAdmin: Your address, where problems with the server should be - # e-mailed. ---- 50,56 ---- - # don't use Group #-1 on these systems! - - User nobody -! Group nogroup - - # ServerAdmin: Your address, where problems with the server should be - # e-mailed. -*************** -*** 94,100 **** - # The location of the access logfile (Common Logfile Format). - # If this does not start with /, ServerRoot is prepended to it. - -! CustomLog logs/access_log common - - # If you would like to have an agent and referer logfile uncomment the - # following directives. ---- 94,100 ---- - # The location of the access logfile (Common Logfile Format). - # If this does not start with /, ServerRoot is prepended to it. - -! #CustomLog logs/access_log common - - # If you would like to have an agent and referer logfile uncomment the - # following directives. -*************** -*** 105,111 **** - # 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 - - # PidFile: The file the server should log its pid to - PidFile logs/httpd.pid ---- 105,111 ---- - # 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 - - # PidFile: The file the server should log its pid to - PidFile logs/httpd.pid +--- conf/httpd.conf-dist.orig Sat Dec 12 20:04:29 1998 ++++ conf/httpd.conf-dist Fri Jan 15 01:08:36 1999 +@@ -241,7 +241,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 +@@ -459,7 +459,7 @@ + # define per-<VirtualHost> 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 +@@ -472,7 +472,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 diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist index 3579a0e937ce..5e978c82e3c5 100644 --- a/www/apache2/pkg-plist +++ b/www/apache2/pkg-plist @@ -31,6 +31,7 @@ include/apache/http_request.h include/apache/http_vhost.h include/apache/httpd.h include/apache/multithread.h +include/apache/os-inline.c include/apache/os.h include/apache/rfc1413.h include/apache/scoreboard.h @@ -83,6 +84,7 @@ share/doc/apache/manual/images/mod_rewrite_fig2.fig share/doc/apache/manual/images/mod_rewrite_fig2.gif share/doc/apache/manual/images/sub.gif share/doc/apache/manual/index.html +share/doc/apache/manual/install-tpf.html share/doc/apache/manual/install.html share/doc/apache/manual/invoking.html share/doc/apache/manual/keepalive.html @@ -164,10 +166,12 @@ share/doc/apache/manual/new_features_1_1.html share/doc/apache/manual/new_features_1_2.html share/doc/apache/manual/new_features_1_3.html share/doc/apache/manual/process-model.html +share/doc/apache/manual/readme-tpf.html share/doc/apache/manual/sections.html share/doc/apache/manual/sourcereorg.html share/doc/apache/manual/stopping.html share/doc/apache/manual/suexec.html +share/doc/apache/manual/suexec_1_2.html share/doc/apache/manual/unixware.html share/doc/apache/manual/upgrading_to_1_3.html share/doc/apache/manual/vhosts/details.html @@ -247,6 +251,36 @@ www/icons/right.gif www/icons/screw1.gif www/icons/screw2.gif www/icons/script.gif +www/icons/small/README.txt +www/icons/small/back.gif +www/icons/small/binary.gif +www/icons/small/binhex.gif +www/icons/small/blank.gif +www/icons/small/broken.gif +www/icons/small/burst.gif +www/icons/small/comp1.gif +www/icons/small/comp2.gif +www/icons/small/compressed.gif +www/icons/small/continued.gif +www/icons/small/dir.gif +www/icons/small/dir2.gif +www/icons/small/forward.gif +www/icons/small/generic.gif +www/icons/small/generic2.gif +www/icons/small/generic3.gif +www/icons/small/image.gif +www/icons/small/image2.gif +www/icons/small/index.gif +www/icons/small/key.gif +www/icons/small/movie.gif +www/icons/small/rainbow.gif +www/icons/small/sound.gif +www/icons/small/sound2.gif +www/icons/small/tar.gif +www/icons/small/text.gif +www/icons/small/transfer.gif +www/icons/small/unknown.gif +www/icons/small/uu.gif www/icons/sound1.gif www/icons/sound2.gif www/icons/sphere1.gif @@ -272,6 +306,7 @@ www/icons/world2.gif @dirrm share/doc/apache/manual @dirrm share/doc/apache @dirrm www/cgi-bin.default +@dirrm www/icons/small @dirrm www/icons @dirrm www/proxy @dirrm www diff --git a/www/apache20/Makefile b/www/apache20/Makefile index 4c35dd579665..fa4826d25231 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -3,30 +3,30 @@ # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@nagual.pp.ru # -# $Id: Makefile,v 1.63 1998/10/19 12:48:55 smace Exp $ +# $Id: Makefile,v 1.64 1999/01/13 02:47:32 scrappy Exp $ # -DISTNAME= apache_1.3.3 -PKGNAME= apache-1.3.3 +DISTNAME= apache_1.3.4 +PKGNAME= apache-1.3.4 CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ -#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.3/ - MAINTAINER= ache@freebsd.org Y2K= http://www.apache.org/docs/misc/FAQ.html#year2000 + # # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance # GNU_CONFIGURE= yes CONFIGURE_ARGS= \ + --with-layout=GNU \ --sysconfdir=${PREFIX}/etc/apache \ --includedir=${PREFIX}/include/apache \ - --logfiledir=/var/log \ - --runtimedir=/var/run \ + --localstatedir=/var \ --datadir=${PREFIX}/www \ + --suexec-docroot=${PREFIX}/www/data \ --proxycachedir=${PREFIX}/www/proxy \ --libexecdir=${PREFIX}/libexec/apache \ --without-confadjust \ diff --git a/www/apache20/distinfo b/www/apache20/distinfo index 810fe93364ba..1ec9f3e89a85 100644 --- a/www/apache20/distinfo +++ b/www/apache20/distinfo @@ -1 +1 @@ -MD5 (apache_1.3.3.tar.gz) = bb6f14bbb369097a55969482d395d1ae +MD5 (apache_1.3.4.tar.gz) = eab1d93bc17e7d9fcf87dc9fa744a9d3 diff --git a/www/apache20/files/patch-aa b/www/apache20/files/patch-aa index 95661a056d8d..1a054409abf9 100644 --- a/www/apache20/files/patch-aa +++ b/www/apache20/files/patch-aa @@ -1,40 +1,24 @@ -*** configure.orig Thu Sep 17 12:07:53 1998 ---- configure Thu Sep 24 03:57:33 1998 -*************** -*** 870,877 **** - echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" - echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" - echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" -! echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log" -! echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log" - echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" - echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" - echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" ---- 870,877 ---- - echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" - echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" - echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" -! 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}httpd.conf" - echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" -*************** -*** 935,942 **** - echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci - echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci - echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.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 '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci - echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci - echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci ---- 935,942 ---- - echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci - echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci - echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$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}httpd.conf\"'" >>$src/apaci - echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci +--- configure.orig Sat Jan 2 16:19:41 1999 ++++ configure Fri Jan 15 00:44:01 1999 +@@ -1012,8 +1012,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" +@@ -1091,8 +1091,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/apache20/files/patch-ab b/www/apache20/files/patch-ab index 50e0de52fc30..0639f2c81376 100644 --- a/www/apache20/files/patch-ab +++ b/www/apache20/files/patch-ab @@ -1,152 +1,94 @@ -*** Makefile.tmpl.orig Sat Sep 19 16:41:48 1998 ---- Makefile.tmpl Thu Sep 24 04:07:49 1998 -*************** -*** 107,112 **** ---- 107,113 ---- - runtimedir = @runtimedir@ - logfiledir = @logfiledir@ - proxycachedir = @proxycachedir@ -+ doc_prefix = $(prefix)/share/doc/apache - - libexecdir_relative = @libexecdir_relative@ - -*************** -*** 167,173 **** - -DGID_MIN=$(suexec_gidmin) \ - -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ - -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ -! -DDOC_ROOT=\"$(datadir)/htdocs\" \ - -DSAFE_PATH=\"$(suexec_safepath)\" \ - ' \ - suexec; \ ---- 168,174 ---- - -DGID_MIN=$(suexec_gidmin) \ - -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ - -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ -! -DDOC_ROOT=\"$(datadir)/data\" \ - -DSAFE_PATH=\"$(suexec_safepath)\" \ - ' \ - suexec; \ -*************** -*** 224,232 **** - $(MKDIR) $(root)$(mandir)/man1 - $(MKDIR) $(root)$(mandir)/man8 - $(MKDIR) $(root)$(sysconfdir) -! $(MKDIR) $(root)$(datadir)/htdocs - $(MKDIR) $(root)$(datadir)/icons -! $(MKDIR) $(root)$(datadir)/cgi-bin - $(MKDIR) $(root)$(includedir) - $(MKDIR) $(root)$(runtimedir) - $(MKDIR) $(root)$(logfiledir) ---- 225,233 ---- - $(MKDIR) $(root)$(mandir)/man1 - $(MKDIR) $(root)$(mandir)/man8 - $(MKDIR) $(root)$(sysconfdir) -! $(MKDIR) $(root)$(doc_prefix) - $(MKDIR) $(root)$(datadir)/icons -! $(MKDIR) $(root)$(datadir)/cgi-bin.default - $(MKDIR) $(root)$(includedir) - $(MKDIR) $(root)$(runtimedir) - $(MKDIR) $(root)$(logfiledir) -*************** -*** 340,365 **** - # icons and distributed CGI scripts. - install-data: - @echo "===> [data: Installing initial data files]" -! -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ -! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ -! else \ -! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \ - (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\ -! (cd $(root)$(datadir)/htdocs/ && $(TAR) xf -); \ -! find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \ -! find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \ -! fi -! -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ -! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ -! 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)$(datadir)/cgi-bin/$${script}"; \ -! $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \ - done; \ -! fi - @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ - (cd $(TOP)/icons/ && $(TAR) cf - *) |\ - (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \ ---- 341,373 ---- - # icons and distributed CGI scripts. - install-data: - @echo "===> [data: Installing initial data files]" -! # -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ -! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ -! # else \ -! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ - (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\ -! (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)$(datadir)/data ]; then \ -! $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data; \ -! fi -! $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data.default -! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ -! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ -! # 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)$(datadir)/cgi-bin.default/$${script}"; \ -! $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin.default/$${script}; \ - done; \ -! # fi -! if [ ! -d $(root)$(datadir)/cgi-bin ]; then \ -! $(LN) -sf $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ -! fi - @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ - (cd $(TOP)/icons/ && $(TAR) cf - *) |\ - (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \ -*************** -*** 378,384 **** - echo ""; \ - cat $(TOP)/conf/$${conf}-dist ) |\ - sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ -! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \ - -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ - -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ - -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ ---- 386,392 ---- - echo ""; \ - cat $(TOP)/conf/$${conf}-dist ) |\ - sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ -! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \ - -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ - -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ - -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ -*************** -*** 386,395 **** - -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ - -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \ - -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \ -! -e 's;logs/access_log;$(logfiledir)/access_log;' \ -! -e 's;logs/error_log;$(logfiledir)/error_log;' \ -! -e 's;logs/referer_log;$(logfiledir)/referer_log;' \ -! -e 's;logs/agent_log;$(logfiledir)/agent_log;' \ - -e 's;conf/magic;$(sysconfdir)/magic;' \ - -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ - -e 's;Group #-1;Group $(conf_group);' \ ---- 394,403 ---- - -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ - -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \ - -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \ -! -e 's;logs/access_log;$(logfiledir)/httpd-access.log;' \ -! -e 's;logs/error_log;$(logfiledir)/httpd-error.log;' \ -! -e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \ -! -e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \ - -e 's;conf/magic;$(sysconfdir)/magic;' \ - -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ - -e 's;Group #-1;Group $(conf_group);' \ +--- Makefile.tmpl.orig Thu Jan 7 14:50:45 1999 ++++ Makefile.tmpl Fri Jan 15 02:39:17 1999 +@@ -110,6 +110,7 @@ + runtimedir = @runtimedir@ + logfiledir = @logfiledir@ + proxycachedir = @proxycachedir@ ++doc_prefix = $(prefix)/share/doc/apache + + libexecdir_relative = @libexecdir_relative@ + +@@ -239,9 +240,9 @@ + $(MKDIR) $(root)$(mandir)/man1 + $(MKDIR) $(root)$(mandir)/man8 + $(MKDIR) $(root)$(sysconfdir) +- $(MKDIR) $(root)$(datadir)/htdocs ++ $(MKDIR) $(root)$(doc_prefix) + $(MKDIR) $(root)$(datadir)/icons +- $(MKDIR) $(root)$(datadir)/cgi-bin ++ $(MKDIR) $(root)$(datadir)/cgi-bin.default + $(MKDIR) $(root)$(includedir) + $(MKDIR) $(root)$(runtimedir) + $(MKDIR) $(root)$(logfiledir) +@@ -363,25 +364,33 @@ + # icons and distributed CGI scripts. + install-data: + @echo "===> [data: Installing initial data files]" +- -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ +- else \ +- echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \ ++# -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ ++# else \ ++ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ + (cd $(TOP)/htdocs/ && $(TAR) -hcf - *) |\ +- (cd $(root)$(datadir)/htdocs/ && $(TAR) -xf -); \ +- find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \ +- find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \ +- fi +- -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ +- 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)$(datadir)/data ]; then \ ++ $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data; \ ++ fi ++ $(RM) $(root)$(datadir)/data.default ++ $(LN) -s $(root)$(doc_prefix) $(root)$(datadir)/data.default ++# -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ++# 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)$(datadir)/cgi-bin/$${script}"; \ +- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \ +- done; \ ++ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin.default/$${script}"; \ ++ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin.default/$${script}; \ ++ done; ++# fi ++ if [ ! -d $(root)$(datadir)/cgi-bin ]; then \ ++ $(LN) -sf $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ + fi + @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ + (cd $(TOP)/icons/ && $(TAR) -hcf - *) |\ +@@ -411,7 +420,7 @@ + echo ""; \ + cat $(TOP)/conf/$${conf}-dist ) |\ + sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ +- -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \ ++ -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \ + -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ + -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ + -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ +@@ -419,10 +428,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)/httpd-access.log;' \ ++ -e 's;logs/error_log;$(logfiledir)/httpd-error.log;' \ ++ -e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \ ++ -e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \ + -e 's;conf/magic;$(sysconfdir)/magic;' \ + -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ + -e 's;Group #-1;Group $(conf_group);' \ diff --git a/www/apache20/files/patch-ag b/www/apache20/files/patch-ag index 11aedaa76270..fe3b9579cd7f 100644 --- a/www/apache20/files/patch-ag +++ b/www/apache20/files/patch-ag @@ -1,53 +1,29 @@ -*** conf/httpd.conf-dist.orig Thu May 7 01:12:39 1998 ---- conf/httpd.conf-dist Fri Jun 5 19:34:17 1998 -*************** -*** 50,56 **** - # don't use Group #-1 on these systems! - - User nobody -! Group #-1 - - # ServerAdmin: Your address, where problems with the server should be - # e-mailed. ---- 50,56 ---- - # don't use Group #-1 on these systems! - - User nobody -! Group nogroup - - # ServerAdmin: Your address, where problems with the server should be - # e-mailed. -*************** -*** 94,100 **** - # The location of the access logfile (Common Logfile Format). - # If this does not start with /, ServerRoot is prepended to it. - -! CustomLog logs/access_log common - - # If you would like to have an agent and referer logfile uncomment the - # following directives. ---- 94,100 ---- - # The location of the access logfile (Common Logfile Format). - # If this does not start with /, ServerRoot is prepended to it. - -! #CustomLog logs/access_log common - - # If you would like to have an agent and referer logfile uncomment the - # following directives. -*************** -*** 105,111 **** - # 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 - - # PidFile: The file the server should log its pid to - PidFile logs/httpd.pid ---- 105,111 ---- - # 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 - - # PidFile: The file the server should log its pid to - PidFile logs/httpd.pid +--- conf/httpd.conf-dist.orig Sat Dec 12 20:04:29 1998 ++++ conf/httpd.conf-dist Fri Jan 15 01:08:36 1999 +@@ -241,7 +241,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 +@@ -459,7 +459,7 @@ + # define per-<VirtualHost> 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 +@@ -472,7 +472,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 diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist index 3579a0e937ce..5e978c82e3c5 100644 --- a/www/apache20/pkg-plist +++ b/www/apache20/pkg-plist @@ -31,6 +31,7 @@ include/apache/http_request.h include/apache/http_vhost.h include/apache/httpd.h include/apache/multithread.h +include/apache/os-inline.c include/apache/os.h include/apache/rfc1413.h include/apache/scoreboard.h @@ -83,6 +84,7 @@ share/doc/apache/manual/images/mod_rewrite_fig2.fig share/doc/apache/manual/images/mod_rewrite_fig2.gif share/doc/apache/manual/images/sub.gif share/doc/apache/manual/index.html +share/doc/apache/manual/install-tpf.html share/doc/apache/manual/install.html share/doc/apache/manual/invoking.html share/doc/apache/manual/keepalive.html @@ -164,10 +166,12 @@ share/doc/apache/manual/new_features_1_1.html share/doc/apache/manual/new_features_1_2.html share/doc/apache/manual/new_features_1_3.html share/doc/apache/manual/process-model.html +share/doc/apache/manual/readme-tpf.html share/doc/apache/manual/sections.html share/doc/apache/manual/sourcereorg.html share/doc/apache/manual/stopping.html share/doc/apache/manual/suexec.html +share/doc/apache/manual/suexec_1_2.html share/doc/apache/manual/unixware.html share/doc/apache/manual/upgrading_to_1_3.html share/doc/apache/manual/vhosts/details.html @@ -247,6 +251,36 @@ www/icons/right.gif www/icons/screw1.gif www/icons/screw2.gif www/icons/script.gif +www/icons/small/README.txt +www/icons/small/back.gif +www/icons/small/binary.gif +www/icons/small/binhex.gif +www/icons/small/blank.gif +www/icons/small/broken.gif +www/icons/small/burst.gif +www/icons/small/comp1.gif +www/icons/small/comp2.gif +www/icons/small/compressed.gif +www/icons/small/continued.gif +www/icons/small/dir.gif +www/icons/small/dir2.gif +www/icons/small/forward.gif +www/icons/small/generic.gif +www/icons/small/generic2.gif +www/icons/small/generic3.gif +www/icons/small/image.gif +www/icons/small/image2.gif +www/icons/small/index.gif +www/icons/small/key.gif +www/icons/small/movie.gif +www/icons/small/rainbow.gif +www/icons/small/sound.gif +www/icons/small/sound2.gif +www/icons/small/tar.gif +www/icons/small/text.gif +www/icons/small/transfer.gif +www/icons/small/unknown.gif +www/icons/small/uu.gif www/icons/sound1.gif www/icons/sound2.gif www/icons/sphere1.gif @@ -272,6 +306,7 @@ www/icons/world2.gif @dirrm share/doc/apache/manual @dirrm share/doc/apache @dirrm www/cgi-bin.default +@dirrm www/icons/small @dirrm www/icons @dirrm www/proxy @dirrm www diff --git a/www/apache21/Makefile b/www/apache21/Makefile index 4c35dd579665..fa4826d25231 100644 --- a/www/apache21/Makefile +++ b/www/apache21/Makefile @@ -3,30 +3,30 @@ # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@nagual.pp.ru # -# $Id: Makefile,v 1.63 1998/10/19 12:48:55 smace Exp $ +# $Id: Makefile,v 1.64 1999/01/13 02:47:32 scrappy Exp $ # -DISTNAME= apache_1.3.3 -PKGNAME= apache-1.3.3 +DISTNAME= apache_1.3.4 +PKGNAME= apache-1.3.4 CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ -#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.3/ - MAINTAINER= ache@freebsd.org Y2K= http://www.apache.org/docs/misc/FAQ.html#year2000 + # # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance # GNU_CONFIGURE= yes CONFIGURE_ARGS= \ + --with-layout=GNU \ --sysconfdir=${PREFIX}/etc/apache \ --includedir=${PREFIX}/include/apache \ - --logfiledir=/var/log \ - --runtimedir=/var/run \ + --localstatedir=/var \ --datadir=${PREFIX}/www \ + --suexec-docroot=${PREFIX}/www/data \ --proxycachedir=${PREFIX}/www/proxy \ --libexecdir=${PREFIX}/libexec/apache \ --without-confadjust \ diff --git a/www/apache21/distinfo b/www/apache21/distinfo index 810fe93364ba..1ec9f3e89a85 100644 --- a/www/apache21/distinfo +++ b/www/apache21/distinfo @@ -1 +1 @@ -MD5 (apache_1.3.3.tar.gz) = bb6f14bbb369097a55969482d395d1ae +MD5 (apache_1.3.4.tar.gz) = eab1d93bc17e7d9fcf87dc9fa744a9d3 diff --git a/www/apache21/files/patch-aa b/www/apache21/files/patch-aa index 95661a056d8d..1a054409abf9 100644 --- a/www/apache21/files/patch-aa +++ b/www/apache21/files/patch-aa @@ -1,40 +1,24 @@ -*** configure.orig Thu Sep 17 12:07:53 1998 ---- configure Thu Sep 24 03:57:33 1998 -*************** -*** 870,877 **** - echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" - echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" - echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" -! echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log" -! echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log" - echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" - echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" - echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" ---- 870,877 ---- - echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" - echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" - echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" -! 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}httpd.conf" - echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" -*************** -*** 935,942 **** - echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci - echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci - echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.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 '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci - echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci - echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci ---- 935,942 ---- - echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci - echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci - echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$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}httpd.conf\"'" >>$src/apaci - echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci +--- configure.orig Sat Jan 2 16:19:41 1999 ++++ configure Fri Jan 15 00:44:01 1999 +@@ -1012,8 +1012,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" +@@ -1091,8 +1091,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/apache21/files/patch-ab b/www/apache21/files/patch-ab index 50e0de52fc30..0639f2c81376 100644 --- a/www/apache21/files/patch-ab +++ b/www/apache21/files/patch-ab @@ -1,152 +1,94 @@ -*** Makefile.tmpl.orig Sat Sep 19 16:41:48 1998 ---- Makefile.tmpl Thu Sep 24 04:07:49 1998 -*************** -*** 107,112 **** ---- 107,113 ---- - runtimedir = @runtimedir@ - logfiledir = @logfiledir@ - proxycachedir = @proxycachedir@ -+ doc_prefix = $(prefix)/share/doc/apache - - libexecdir_relative = @libexecdir_relative@ - -*************** -*** 167,173 **** - -DGID_MIN=$(suexec_gidmin) \ - -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ - -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ -! -DDOC_ROOT=\"$(datadir)/htdocs\" \ - -DSAFE_PATH=\"$(suexec_safepath)\" \ - ' \ - suexec; \ ---- 168,174 ---- - -DGID_MIN=$(suexec_gidmin) \ - -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ - -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ -! -DDOC_ROOT=\"$(datadir)/data\" \ - -DSAFE_PATH=\"$(suexec_safepath)\" \ - ' \ - suexec; \ -*************** -*** 224,232 **** - $(MKDIR) $(root)$(mandir)/man1 - $(MKDIR) $(root)$(mandir)/man8 - $(MKDIR) $(root)$(sysconfdir) -! $(MKDIR) $(root)$(datadir)/htdocs - $(MKDIR) $(root)$(datadir)/icons -! $(MKDIR) $(root)$(datadir)/cgi-bin - $(MKDIR) $(root)$(includedir) - $(MKDIR) $(root)$(runtimedir) - $(MKDIR) $(root)$(logfiledir) ---- 225,233 ---- - $(MKDIR) $(root)$(mandir)/man1 - $(MKDIR) $(root)$(mandir)/man8 - $(MKDIR) $(root)$(sysconfdir) -! $(MKDIR) $(root)$(doc_prefix) - $(MKDIR) $(root)$(datadir)/icons -! $(MKDIR) $(root)$(datadir)/cgi-bin.default - $(MKDIR) $(root)$(includedir) - $(MKDIR) $(root)$(runtimedir) - $(MKDIR) $(root)$(logfiledir) -*************** -*** 340,365 **** - # icons and distributed CGI scripts. - install-data: - @echo "===> [data: Installing initial data files]" -! -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ -! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ -! else \ -! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \ - (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\ -! (cd $(root)$(datadir)/htdocs/ && $(TAR) xf -); \ -! find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \ -! find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \ -! fi -! -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ -! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ -! 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)$(datadir)/cgi-bin/$${script}"; \ -! $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \ - done; \ -! fi - @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ - (cd $(TOP)/icons/ && $(TAR) cf - *) |\ - (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \ ---- 341,373 ---- - # icons and distributed CGI scripts. - install-data: - @echo "===> [data: Installing initial data files]" -! # -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ -! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ -! # else \ -! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ - (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\ -! (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)$(datadir)/data ]; then \ -! $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data; \ -! fi -! $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data.default -! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ -! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ -! # 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)$(datadir)/cgi-bin.default/$${script}"; \ -! $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin.default/$${script}; \ - done; \ -! # fi -! if [ ! -d $(root)$(datadir)/cgi-bin ]; then \ -! $(LN) -sf $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ -! fi - @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ - (cd $(TOP)/icons/ && $(TAR) cf - *) |\ - (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \ -*************** -*** 378,384 **** - echo ""; \ - cat $(TOP)/conf/$${conf}-dist ) |\ - sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ -! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \ - -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ - -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ - -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ ---- 386,392 ---- - echo ""; \ - cat $(TOP)/conf/$${conf}-dist ) |\ - sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ -! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \ - -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ - -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ - -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ -*************** -*** 386,395 **** - -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ - -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \ - -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \ -! -e 's;logs/access_log;$(logfiledir)/access_log;' \ -! -e 's;logs/error_log;$(logfiledir)/error_log;' \ -! -e 's;logs/referer_log;$(logfiledir)/referer_log;' \ -! -e 's;logs/agent_log;$(logfiledir)/agent_log;' \ - -e 's;conf/magic;$(sysconfdir)/magic;' \ - -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ - -e 's;Group #-1;Group $(conf_group);' \ ---- 394,403 ---- - -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ - -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \ - -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \ -! -e 's;logs/access_log;$(logfiledir)/httpd-access.log;' \ -! -e 's;logs/error_log;$(logfiledir)/httpd-error.log;' \ -! -e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \ -! -e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \ - -e 's;conf/magic;$(sysconfdir)/magic;' \ - -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ - -e 's;Group #-1;Group $(conf_group);' \ +--- Makefile.tmpl.orig Thu Jan 7 14:50:45 1999 ++++ Makefile.tmpl Fri Jan 15 02:39:17 1999 +@@ -110,6 +110,7 @@ + runtimedir = @runtimedir@ + logfiledir = @logfiledir@ + proxycachedir = @proxycachedir@ ++doc_prefix = $(prefix)/share/doc/apache + + libexecdir_relative = @libexecdir_relative@ + +@@ -239,9 +240,9 @@ + $(MKDIR) $(root)$(mandir)/man1 + $(MKDIR) $(root)$(mandir)/man8 + $(MKDIR) $(root)$(sysconfdir) +- $(MKDIR) $(root)$(datadir)/htdocs ++ $(MKDIR) $(root)$(doc_prefix) + $(MKDIR) $(root)$(datadir)/icons +- $(MKDIR) $(root)$(datadir)/cgi-bin ++ $(MKDIR) $(root)$(datadir)/cgi-bin.default + $(MKDIR) $(root)$(includedir) + $(MKDIR) $(root)$(runtimedir) + $(MKDIR) $(root)$(logfiledir) +@@ -363,25 +364,33 @@ + # icons and distributed CGI scripts. + install-data: + @echo "===> [data: Installing initial data files]" +- -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ +- else \ +- echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \ ++# -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ ++# else \ ++ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ + (cd $(TOP)/htdocs/ && $(TAR) -hcf - *) |\ +- (cd $(root)$(datadir)/htdocs/ && $(TAR) -xf -); \ +- find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \ +- find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \ +- fi +- -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ +- 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)$(datadir)/data ]; then \ ++ $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data; \ ++ fi ++ $(RM) $(root)$(datadir)/data.default ++ $(LN) -s $(root)$(doc_prefix) $(root)$(datadir)/data.default ++# -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ++# 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)$(datadir)/cgi-bin/$${script}"; \ +- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \ +- done; \ ++ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin.default/$${script}"; \ ++ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin.default/$${script}; \ ++ done; ++# fi ++ if [ ! -d $(root)$(datadir)/cgi-bin ]; then \ ++ $(LN) -sf $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ + fi + @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ + (cd $(TOP)/icons/ && $(TAR) -hcf - *) |\ +@@ -411,7 +420,7 @@ + echo ""; \ + cat $(TOP)/conf/$${conf}-dist ) |\ + sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ +- -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \ ++ -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \ + -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ + -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ + -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ +@@ -419,10 +428,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)/httpd-access.log;' \ ++ -e 's;logs/error_log;$(logfiledir)/httpd-error.log;' \ ++ -e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \ ++ -e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \ + -e 's;conf/magic;$(sysconfdir)/magic;' \ + -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ + -e 's;Group #-1;Group $(conf_group);' \ diff --git a/www/apache21/files/patch-ag b/www/apache21/files/patch-ag index 11aedaa76270..fe3b9579cd7f 100644 --- a/www/apache21/files/patch-ag +++ b/www/apache21/files/patch-ag @@ -1,53 +1,29 @@ -*** conf/httpd.conf-dist.orig Thu May 7 01:12:39 1998 ---- conf/httpd.conf-dist Fri Jun 5 19:34:17 1998 -*************** -*** 50,56 **** - # don't use Group #-1 on these systems! - - User nobody -! Group #-1 - - # ServerAdmin: Your address, where problems with the server should be - # e-mailed. ---- 50,56 ---- - # don't use Group #-1 on these systems! - - User nobody -! Group nogroup - - # ServerAdmin: Your address, where problems with the server should be - # e-mailed. -*************** -*** 94,100 **** - # The location of the access logfile (Common Logfile Format). - # If this does not start with /, ServerRoot is prepended to it. - -! CustomLog logs/access_log common - - # If you would like to have an agent and referer logfile uncomment the - # following directives. ---- 94,100 ---- - # The location of the access logfile (Common Logfile Format). - # If this does not start with /, ServerRoot is prepended to it. - -! #CustomLog logs/access_log common - - # If you would like to have an agent and referer logfile uncomment the - # following directives. -*************** -*** 105,111 **** - # 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 - - # PidFile: The file the server should log its pid to - PidFile logs/httpd.pid ---- 105,111 ---- - # 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 - - # PidFile: The file the server should log its pid to - PidFile logs/httpd.pid +--- conf/httpd.conf-dist.orig Sat Dec 12 20:04:29 1998 ++++ conf/httpd.conf-dist Fri Jan 15 01:08:36 1999 +@@ -241,7 +241,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 +@@ -459,7 +459,7 @@ + # define per-<VirtualHost> 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 +@@ -472,7 +472,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 diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist index 3579a0e937ce..5e978c82e3c5 100644 --- a/www/apache21/pkg-plist +++ b/www/apache21/pkg-plist @@ -31,6 +31,7 @@ include/apache/http_request.h include/apache/http_vhost.h include/apache/httpd.h include/apache/multithread.h +include/apache/os-inline.c include/apache/os.h include/apache/rfc1413.h include/apache/scoreboard.h @@ -83,6 +84,7 @@ share/doc/apache/manual/images/mod_rewrite_fig2.fig share/doc/apache/manual/images/mod_rewrite_fig2.gif share/doc/apache/manual/images/sub.gif share/doc/apache/manual/index.html +share/doc/apache/manual/install-tpf.html share/doc/apache/manual/install.html share/doc/apache/manual/invoking.html share/doc/apache/manual/keepalive.html @@ -164,10 +166,12 @@ share/doc/apache/manual/new_features_1_1.html share/doc/apache/manual/new_features_1_2.html share/doc/apache/manual/new_features_1_3.html share/doc/apache/manual/process-model.html +share/doc/apache/manual/readme-tpf.html share/doc/apache/manual/sections.html share/doc/apache/manual/sourcereorg.html share/doc/apache/manual/stopping.html share/doc/apache/manual/suexec.html +share/doc/apache/manual/suexec_1_2.html share/doc/apache/manual/unixware.html share/doc/apache/manual/upgrading_to_1_3.html share/doc/apache/manual/vhosts/details.html @@ -247,6 +251,36 @@ www/icons/right.gif www/icons/screw1.gif www/icons/screw2.gif www/icons/script.gif +www/icons/small/README.txt +www/icons/small/back.gif +www/icons/small/binary.gif +www/icons/small/binhex.gif +www/icons/small/blank.gif +www/icons/small/broken.gif +www/icons/small/burst.gif +www/icons/small/comp1.gif +www/icons/small/comp2.gif +www/icons/small/compressed.gif +www/icons/small/continued.gif +www/icons/small/dir.gif +www/icons/small/dir2.gif +www/icons/small/forward.gif +www/icons/small/generic.gif +www/icons/small/generic2.gif +www/icons/small/generic3.gif +www/icons/small/image.gif +www/icons/small/image2.gif +www/icons/small/index.gif +www/icons/small/key.gif +www/icons/small/movie.gif +www/icons/small/rainbow.gif +www/icons/small/sound.gif +www/icons/small/sound2.gif +www/icons/small/tar.gif +www/icons/small/text.gif +www/icons/small/transfer.gif +www/icons/small/unknown.gif +www/icons/small/uu.gif www/icons/sound1.gif www/icons/sound2.gif www/icons/sphere1.gif @@ -272,6 +306,7 @@ www/icons/world2.gif @dirrm share/doc/apache/manual @dirrm share/doc/apache @dirrm www/cgi-bin.default +@dirrm www/icons/small @dirrm www/icons @dirrm www/proxy @dirrm www diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 4c35dd579665..fa4826d25231 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -3,30 +3,30 @@ # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@nagual.pp.ru # -# $Id: Makefile,v 1.63 1998/10/19 12:48:55 smace Exp $ +# $Id: Makefile,v 1.64 1999/01/13 02:47:32 scrappy Exp $ # -DISTNAME= apache_1.3.3 -PKGNAME= apache-1.3.3 +DISTNAME= apache_1.3.4 +PKGNAME= apache-1.3.4 CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ -#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.3/ - MAINTAINER= ache@freebsd.org Y2K= http://www.apache.org/docs/misc/FAQ.html#year2000 + # # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance # GNU_CONFIGURE= yes CONFIGURE_ARGS= \ + --with-layout=GNU \ --sysconfdir=${PREFIX}/etc/apache \ --includedir=${PREFIX}/include/apache \ - --logfiledir=/var/log \ - --runtimedir=/var/run \ + --localstatedir=/var \ --datadir=${PREFIX}/www \ + --suexec-docroot=${PREFIX}/www/data \ --proxycachedir=${PREFIX}/www/proxy \ --libexecdir=${PREFIX}/libexec/apache \ --without-confadjust \ diff --git a/www/apache22/distinfo b/www/apache22/distinfo index 810fe93364ba..1ec9f3e89a85 100644 --- a/www/apache22/distinfo +++ b/www/apache22/distinfo @@ -1 +1 @@ -MD5 (apache_1.3.3.tar.gz) = bb6f14bbb369097a55969482d395d1ae +MD5 (apache_1.3.4.tar.gz) = eab1d93bc17e7d9fcf87dc9fa744a9d3 diff --git a/www/apache22/files/patch-aa b/www/apache22/files/patch-aa index 95661a056d8d..1a054409abf9 100644 --- a/www/apache22/files/patch-aa +++ b/www/apache22/files/patch-aa @@ -1,40 +1,24 @@ -*** configure.orig Thu Sep 17 12:07:53 1998 ---- configure Thu Sep 24 03:57:33 1998 -*************** -*** 870,877 **** - echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" - echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" - echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" -! echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log" -! echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log" - echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" - echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" - echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" ---- 870,877 ---- - echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" - echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" - echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" -! 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}httpd.conf" - echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" -*************** -*** 935,942 **** - echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci - echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci - echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.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 '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci - echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci - echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci ---- 935,942 ---- - echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci - echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci - echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$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}httpd.conf\"'" >>$src/apaci - echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci +--- configure.orig Sat Jan 2 16:19:41 1999 ++++ configure Fri Jan 15 00:44:01 1999 +@@ -1012,8 +1012,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" +@@ -1091,8 +1091,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 index 50e0de52fc30..0639f2c81376 100644 --- a/www/apache22/files/patch-ab +++ b/www/apache22/files/patch-ab @@ -1,152 +1,94 @@ -*** Makefile.tmpl.orig Sat Sep 19 16:41:48 1998 ---- Makefile.tmpl Thu Sep 24 04:07:49 1998 -*************** -*** 107,112 **** ---- 107,113 ---- - runtimedir = @runtimedir@ - logfiledir = @logfiledir@ - proxycachedir = @proxycachedir@ -+ doc_prefix = $(prefix)/share/doc/apache - - libexecdir_relative = @libexecdir_relative@ - -*************** -*** 167,173 **** - -DGID_MIN=$(suexec_gidmin) \ - -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ - -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ -! -DDOC_ROOT=\"$(datadir)/htdocs\" \ - -DSAFE_PATH=\"$(suexec_safepath)\" \ - ' \ - suexec; \ ---- 168,174 ---- - -DGID_MIN=$(suexec_gidmin) \ - -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ - -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ -! -DDOC_ROOT=\"$(datadir)/data\" \ - -DSAFE_PATH=\"$(suexec_safepath)\" \ - ' \ - suexec; \ -*************** -*** 224,232 **** - $(MKDIR) $(root)$(mandir)/man1 - $(MKDIR) $(root)$(mandir)/man8 - $(MKDIR) $(root)$(sysconfdir) -! $(MKDIR) $(root)$(datadir)/htdocs - $(MKDIR) $(root)$(datadir)/icons -! $(MKDIR) $(root)$(datadir)/cgi-bin - $(MKDIR) $(root)$(includedir) - $(MKDIR) $(root)$(runtimedir) - $(MKDIR) $(root)$(logfiledir) ---- 225,233 ---- - $(MKDIR) $(root)$(mandir)/man1 - $(MKDIR) $(root)$(mandir)/man8 - $(MKDIR) $(root)$(sysconfdir) -! $(MKDIR) $(root)$(doc_prefix) - $(MKDIR) $(root)$(datadir)/icons -! $(MKDIR) $(root)$(datadir)/cgi-bin.default - $(MKDIR) $(root)$(includedir) - $(MKDIR) $(root)$(runtimedir) - $(MKDIR) $(root)$(logfiledir) -*************** -*** 340,365 **** - # icons and distributed CGI scripts. - install-data: - @echo "===> [data: Installing initial data files]" -! -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ -! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ -! else \ -! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \ - (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\ -! (cd $(root)$(datadir)/htdocs/ && $(TAR) xf -); \ -! find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \ -! find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \ -! fi -! -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ -! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ -! 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)$(datadir)/cgi-bin/$${script}"; \ -! $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \ - done; \ -! fi - @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ - (cd $(TOP)/icons/ && $(TAR) cf - *) |\ - (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \ ---- 341,373 ---- - # icons and distributed CGI scripts. - install-data: - @echo "===> [data: Installing initial data files]" -! # -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ -! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ -! # else \ -! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ - (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\ -! (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)$(datadir)/data ]; then \ -! $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data; \ -! fi -! $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data.default -! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ -! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ -! # 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)$(datadir)/cgi-bin.default/$${script}"; \ -! $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin.default/$${script}; \ - done; \ -! # fi -! if [ ! -d $(root)$(datadir)/cgi-bin ]; then \ -! $(LN) -sf $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ -! fi - @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ - (cd $(TOP)/icons/ && $(TAR) cf - *) |\ - (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \ -*************** -*** 378,384 **** - echo ""; \ - cat $(TOP)/conf/$${conf}-dist ) |\ - sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ -! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \ - -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ - -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ - -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ ---- 386,392 ---- - echo ""; \ - cat $(TOP)/conf/$${conf}-dist ) |\ - sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ -! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \ - -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ - -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ - -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ -*************** -*** 386,395 **** - -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ - -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \ - -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \ -! -e 's;logs/access_log;$(logfiledir)/access_log;' \ -! -e 's;logs/error_log;$(logfiledir)/error_log;' \ -! -e 's;logs/referer_log;$(logfiledir)/referer_log;' \ -! -e 's;logs/agent_log;$(logfiledir)/agent_log;' \ - -e 's;conf/magic;$(sysconfdir)/magic;' \ - -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ - -e 's;Group #-1;Group $(conf_group);' \ ---- 394,403 ---- - -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ - -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \ - -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \ -! -e 's;logs/access_log;$(logfiledir)/httpd-access.log;' \ -! -e 's;logs/error_log;$(logfiledir)/httpd-error.log;' \ -! -e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \ -! -e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \ - -e 's;conf/magic;$(sysconfdir)/magic;' \ - -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ - -e 's;Group #-1;Group $(conf_group);' \ +--- Makefile.tmpl.orig Thu Jan 7 14:50:45 1999 ++++ Makefile.tmpl Fri Jan 15 02:39:17 1999 +@@ -110,6 +110,7 @@ + runtimedir = @runtimedir@ + logfiledir = @logfiledir@ + proxycachedir = @proxycachedir@ ++doc_prefix = $(prefix)/share/doc/apache + + libexecdir_relative = @libexecdir_relative@ + +@@ -239,9 +240,9 @@ + $(MKDIR) $(root)$(mandir)/man1 + $(MKDIR) $(root)$(mandir)/man8 + $(MKDIR) $(root)$(sysconfdir) +- $(MKDIR) $(root)$(datadir)/htdocs ++ $(MKDIR) $(root)$(doc_prefix) + $(MKDIR) $(root)$(datadir)/icons +- $(MKDIR) $(root)$(datadir)/cgi-bin ++ $(MKDIR) $(root)$(datadir)/cgi-bin.default + $(MKDIR) $(root)$(includedir) + $(MKDIR) $(root)$(runtimedir) + $(MKDIR) $(root)$(logfiledir) +@@ -363,25 +364,33 @@ + # icons and distributed CGI scripts. + install-data: + @echo "===> [data: Installing initial data files]" +- -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ +- else \ +- echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \ ++# -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ ++# else \ ++ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ + (cd $(TOP)/htdocs/ && $(TAR) -hcf - *) |\ +- (cd $(root)$(datadir)/htdocs/ && $(TAR) -xf -); \ +- find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \ +- find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \ +- fi +- -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ +- 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)$(datadir)/data ]; then \ ++ $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data; \ ++ fi ++ $(RM) $(root)$(datadir)/data.default ++ $(LN) -s $(root)$(doc_prefix) $(root)$(datadir)/data.default ++# -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ++# 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)$(datadir)/cgi-bin/$${script}"; \ +- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \ +- done; \ ++ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin.default/$${script}"; \ ++ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin.default/$${script}; \ ++ done; ++# fi ++ if [ ! -d $(root)$(datadir)/cgi-bin ]; then \ ++ $(LN) -sf $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ + fi + @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ + (cd $(TOP)/icons/ && $(TAR) -hcf - *) |\ +@@ -411,7 +420,7 @@ + echo ""; \ + cat $(TOP)/conf/$${conf}-dist ) |\ + sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ +- -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \ ++ -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \ + -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ + -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ + -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ +@@ -419,10 +428,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)/httpd-access.log;' \ ++ -e 's;logs/error_log;$(logfiledir)/httpd-error.log;' \ ++ -e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \ ++ -e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \ + -e 's;conf/magic;$(sysconfdir)/magic;' \ + -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ + -e 's;Group #-1;Group $(conf_group);' \ diff --git a/www/apache22/files/patch-ag b/www/apache22/files/patch-ag index 11aedaa76270..fe3b9579cd7f 100644 --- a/www/apache22/files/patch-ag +++ b/www/apache22/files/patch-ag @@ -1,53 +1,29 @@ -*** conf/httpd.conf-dist.orig Thu May 7 01:12:39 1998 ---- conf/httpd.conf-dist Fri Jun 5 19:34:17 1998 -*************** -*** 50,56 **** - # don't use Group #-1 on these systems! - - User nobody -! Group #-1 - - # ServerAdmin: Your address, where problems with the server should be - # e-mailed. ---- 50,56 ---- - # don't use Group #-1 on these systems! - - User nobody -! Group nogroup - - # ServerAdmin: Your address, where problems with the server should be - # e-mailed. -*************** -*** 94,100 **** - # The location of the access logfile (Common Logfile Format). - # If this does not start with /, ServerRoot is prepended to it. - -! CustomLog logs/access_log common - - # If you would like to have an agent and referer logfile uncomment the - # following directives. ---- 94,100 ---- - # The location of the access logfile (Common Logfile Format). - # If this does not start with /, ServerRoot is prepended to it. - -! #CustomLog logs/access_log common - - # If you would like to have an agent and referer logfile uncomment the - # following directives. -*************** -*** 105,111 **** - # 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 - - # PidFile: The file the server should log its pid to - PidFile logs/httpd.pid ---- 105,111 ---- - # 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 - - # PidFile: The file the server should log its pid to - PidFile logs/httpd.pid +--- conf/httpd.conf-dist.orig Sat Dec 12 20:04:29 1998 ++++ conf/httpd.conf-dist Fri Jan 15 01:08:36 1999 +@@ -241,7 +241,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 +@@ -459,7 +459,7 @@ + # define per-<VirtualHost> 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 +@@ -472,7 +472,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 diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist index 3579a0e937ce..5e978c82e3c5 100644 --- a/www/apache22/pkg-plist +++ b/www/apache22/pkg-plist @@ -31,6 +31,7 @@ include/apache/http_request.h include/apache/http_vhost.h include/apache/httpd.h include/apache/multithread.h +include/apache/os-inline.c include/apache/os.h include/apache/rfc1413.h include/apache/scoreboard.h @@ -83,6 +84,7 @@ share/doc/apache/manual/images/mod_rewrite_fig2.fig share/doc/apache/manual/images/mod_rewrite_fig2.gif share/doc/apache/manual/images/sub.gif share/doc/apache/manual/index.html +share/doc/apache/manual/install-tpf.html share/doc/apache/manual/install.html share/doc/apache/manual/invoking.html share/doc/apache/manual/keepalive.html @@ -164,10 +166,12 @@ share/doc/apache/manual/new_features_1_1.html share/doc/apache/manual/new_features_1_2.html share/doc/apache/manual/new_features_1_3.html share/doc/apache/manual/process-model.html +share/doc/apache/manual/readme-tpf.html share/doc/apache/manual/sections.html share/doc/apache/manual/sourcereorg.html share/doc/apache/manual/stopping.html share/doc/apache/manual/suexec.html +share/doc/apache/manual/suexec_1_2.html share/doc/apache/manual/unixware.html share/doc/apache/manual/upgrading_to_1_3.html share/doc/apache/manual/vhosts/details.html @@ -247,6 +251,36 @@ www/icons/right.gif www/icons/screw1.gif www/icons/screw2.gif www/icons/script.gif +www/icons/small/README.txt +www/icons/small/back.gif +www/icons/small/binary.gif +www/icons/small/binhex.gif +www/icons/small/blank.gif +www/icons/small/broken.gif +www/icons/small/burst.gif +www/icons/small/comp1.gif +www/icons/small/comp2.gif +www/icons/small/compressed.gif +www/icons/small/continued.gif +www/icons/small/dir.gif +www/icons/small/dir2.gif +www/icons/small/forward.gif +www/icons/small/generic.gif +www/icons/small/generic2.gif +www/icons/small/generic3.gif +www/icons/small/image.gif +www/icons/small/image2.gif +www/icons/small/index.gif +www/icons/small/key.gif +www/icons/small/movie.gif +www/icons/small/rainbow.gif +www/icons/small/sound.gif +www/icons/small/sound2.gif +www/icons/small/tar.gif +www/icons/small/text.gif +www/icons/small/transfer.gif +www/icons/small/unknown.gif +www/icons/small/uu.gif www/icons/sound1.gif www/icons/sound2.gif www/icons/sphere1.gif @@ -272,6 +306,7 @@ www/icons/world2.gif @dirrm share/doc/apache/manual @dirrm share/doc/apache @dirrm www/cgi-bin.default +@dirrm www/icons/small @dirrm www/icons @dirrm www/proxy @dirrm www |