diff options
author | Andrey A. Chernov <ache@FreeBSD.org> | 1998-06-05 17:16:22 +0000 |
---|---|---|
committer | Andrey A. Chernov <ache@FreeBSD.org> | 1998-06-05 17:16:22 +0000 |
commit | 47d0754fb79b1b2a0641eb5edda1b991e3c46261 (patch) | |
tree | 125f76c57ec559358f1d27db4123e0d9c13d7b7e /www/apache13/files/patch-ab | |
parent | Upgrade from 1.1 to 1.1.1. (diff) |
upgrade to 1.3b7
Notes
Notes:
svn path=/head/; revision=11279
Diffstat (limited to 'www/apache13/files/patch-ab')
-rw-r--r-- | www/apache13/files/patch-ab | 256 |
1 files changed, 130 insertions, 126 deletions
diff --git a/www/apache13/files/patch-ab b/www/apache13/files/patch-ab index b0f108c37db2..55c4a50bbd3e 100644 --- a/www/apache13/files/patch-ab +++ b/www/apache13/files/patch-ab @@ -1,133 +1,137 @@ -*** Makefile.tmpl.orig Tue Apr 14 23:17:36 1998 ---- Makefile.tmpl Tue Apr 21 23:48:17 1998 +*** Makefile.tmpl.orig Tue May 12 15:52:11 1998 +--- Makefile.tmpl Fri Jun 5 19:13:32 1998 *************** -*** 207,218 **** - $(MKDIR) $(mandir)/man1 - $(MKDIR) $(mandir)/man8 - $(MKDIR) $(sysconfdir) -! $(MKDIR) $(datadir)/htdocs - $(MKDIR) $(datadir)/icons -! $(MKDIR) $(datadir)/cgi-bin - $(MKDIR) $(localstatedir)/$(localstatesubdir_logs) - $(MKDIR) $(localstatedir)/$(localstatesubdir_run) -! $(MKDIR) $(localstatedir)/proxy - $(MKDIR) $(includedir) - @echo "<=== [mktree]" - ---- 207,218 ---- - $(MKDIR) $(mandir)/man1 - $(MKDIR) $(mandir)/man8 - $(MKDIR) $(sysconfdir) -! $(MKDIR) $(datadir)/data.default - $(MKDIR) $(datadir)/icons -! $(MKDIR) $(datadir)/cgi-bin.default - $(MKDIR) $(localstatedir)/$(localstatesubdir_logs) - $(MKDIR) $(localstatedir)/$(localstatesubdir_run) -! $(MKDIR) $(datadir)/proxy - $(MKDIR) $(includedir) - @echo "<=== [mktree]" - +*** 161,167 **** + -DGID_MIN=$(suexec_gidmin) \ + -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ + -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ +! -DDOC_ROOT=\"$(datadir)/htdocs\" \ + -DSAFE_PATH=\"$(suexec_safepath)\" \ + ' \ + suexec; \ +--- 161,167 ---- + -DGID_MIN=$(suexec_gidmin) \ + -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ + -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ +! -DDOC_ROOT=\"$(datadir)/data\" \ + -DSAFE_PATH=\"$(suexec_safepath)\" \ + ' \ + suexec; \ *************** -*** 311,327 **** - install-docroot: - @echo "===> [docroot: Installing initial DocumentRoot files]" - -(cd $(ROOT)/htdocs/ && $(TAR) cf - *) |\ -! (cd $(datadir)/htdocs/ && $(TAR) xf -) -! -find $(datadir)/htdocs/ -type d -exec chmod a+rx {} \; -! -find $(datadir)/htdocs/ -type f -exec chmod a+r {} \; - -(cd $(ROOT)/icons/ && $(TAR) cf - *) |\ - (cd $(datadir)/icons/ && $(TAR) xf -) - -find $(datadir)/icons/ -type d -exec chmod a+rx {} \; - -find $(datadir)/icons/ -type f -exec chmod a+r {} \; - -(cd $(ROOT)/cgi-bin/ && $(TAR) cf - *) |\ -! (cd $(datadir)/cgi-bin/ && $(TAR) xf -) -! -find $(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \; -! -find $(datadir)/cgi-bin/ -type f -exec chmod a+r {} \; - @echo "<=== [docroot]" - - # create the initial configuration by providing default files ---- 311,333 ---- - install-docroot: - @echo "===> [docroot: Installing initial DocumentRoot files]" - -(cd $(ROOT)/htdocs/ && $(TAR) cf - *) |\ -! (cd $(datadir)/data.default/ && $(TAR) xf -) -! -find $(datadir)/data.default/ -type d -exec chmod a+rx {} \; -! -find $(datadir)/data.default/ -type f -exec chmod a+r {} \; -! if [ ! -d $(datadir)/data ]; then \ -! $(CP) -Rp $(datadir)/data.default $(datadir)/data; \ -! fi - -(cd $(ROOT)/icons/ && $(TAR) cf - *) |\ - (cd $(datadir)/icons/ && $(TAR) xf -) - -find $(datadir)/icons/ -type d -exec chmod a+rx {} \; - -find $(datadir)/icons/ -type f -exec chmod a+r {} \; - -(cd $(ROOT)/cgi-bin/ && $(TAR) cf - *) |\ -! (cd $(datadir)/cgi-bin.default/ && $(TAR) xf -) -! -find $(datadir)/cgi-bin.default/ -type d -exec chmod a+rx {} \; -! -find $(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \; -! if [ ! -d $(datadir)/cgi-bin ]; then \ -! $(CP) -Rp $(datadir)/cgi-bin.default $(datadir)/cgi-bin; \ +*** 216,224 **** + $(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) +--- 216,224 ---- + $(MKDIR) $(root)$(mandir)/man1 + $(MKDIR) $(root)$(mandir)/man8 + $(MKDIR) $(root)$(sysconfdir) +! $(MKDIR) $(root)$(datadir)/data.default + $(MKDIR) $(root)$(datadir)/icons +! $(MKDIR) $(root)$(datadir)/cgi-bin.default + $(MKDIR) $(root)$(includedir) + $(MKDIR) $(root)$(runtimedir) + $(MKDIR) $(root)$(logfiledir) +*************** +*** 330,352 **** + # 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 - @echo "<=== [docroot]" - - # create the initial configuration by providing default files +! -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ +! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ +! else \ +! echo "Copying tree $(TOP)/cgi-bin/ -> $(root)$(datadir)/cgi-bin/"; \ + (cd $(TOP)/cgi-bin/ && $(TAR) cf - *) |\ +! (cd $(root)$(datadir)/cgi-bin/ && $(TAR) xf -); \ +! find $(root)$(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \; ; \ +! find $(root)$(datadir)/cgi-bin/ -type f -exec chmod a+r {} \; ; \ + fi + @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ + (cd $(TOP)/icons/ && $(TAR) cf - *) |\ +--- 330,358 ---- + # 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)/data.default/"; \ + (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\ +! (cd $(root)$(datadir)/data.default/ && $(TAR) xf -); \ +! find $(root)$(datadir)/data.default/ -type d -exec chmod a+rx {} \; ; \ +! find $(root)$(datadir)/data.default/ -type f -exec chmod a+r {} \; ; \ +! # fi +! if [ ! -d $(root)$(datadir)/data ]; then \ +! $(CP) -Rp $(root)$(datadir)/data.default $(root)$(datadir)/data; \ +! fi +! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ +! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ +! # else \ +! echo "Copying tree $(TOP)/cgi-bin/ -> $(root)$(datadir)/cgi-bin.default/"; \ + (cd $(TOP)/cgi-bin/ && $(TAR) cf - *) |\ +! (cd $(root)$(datadir)/cgi-bin.default/ && $(TAR) xf -); \ +! find $(root)$(datadir)/cgi-bin.default/ -type d -exec chmod a+rx {} \; ; \ +! find $(root)$(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \; ; \ +! # fi +! if [ ! -d $(root)$(datadir)/cgi-bin ]; then \ +! $(CP) -Rp $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ + fi + @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ + (cd $(TOP)/icons/ && $(TAR) cf - *) |\ *************** -*** 335,351 **** +*** 366,373 **** echo ""; \ - cat $(ROOT)/conf/$$conf-dist ) |\ - sed -e '/# LoadModule/r .install.conf' \ -! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \ -! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \ - -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ - -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ -! -e 's;@@ServerRoot@@/proxy;$(localstatedir)/proxy;' \ - -e 's;@@ServerRoot@@;$(prefix);' \ - -e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \ - -e 's;logs/apache_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \ - -e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \ -! -e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/access_log;' \ -! -e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/error_log;' \ - >.install.tmp && \ - echo "$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default"; \ - $(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \ ---- 341,356 ---- + 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)/htdocs;' \ + -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ + -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ + -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ +--- 372,379 ---- echo ""; \ - cat $(ROOT)/conf/$$conf-dist ) |\ - sed -e '/# LoadModule/r .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;$(datadir)/proxy;' \ - -e 's;@@ServerRoot@@;$(prefix);' \ - -e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \ - -e 's;logs/apache_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \ - -e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \ -! -e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/httpd-access.log;' \ -! -e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/httpd-error.log;' \ - >.install.tmp && \ - echo "$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default"; \ - $(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \ + cat $(TOP)/conf/$${conf}-dist ) |\ + sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ +! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \ +! -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);' \ *************** -*** 356,363 **** - echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \ - fi; \ - done -! $(CP) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types -! $(CP) $(ROOT)/conf/magic $(sysconfdir)/magic - @echo "<=== [config]" - - ---- 361,374 ---- - echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \ - fi; \ - done -! $(INSTALL_DATA) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types.default -! if [ ! -f "$(sysconfdir)/mime.types" ]; then \ -! $(INSTALL_DATA) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types; \ -! fi -! $(INSTALL_DATA) $(ROOT)/conf/magic $(sysconfdir)/magic.default -! if [ ! -f "$(sysconfdir)/magic" ]; then \ -! $(INSTALL_DATA) $(ROOT)/conf/magic $(sysconfdir)/magic; \ -! fi - @echo "<=== [config]" - - +*** 375,384 **** + -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;' \ + > $(TOP)/$(SRC)/.apaci.install.tmp && \ + echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \ +--- 381,390 ---- + -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;' \ + > $(TOP)/$(SRC)/.apaci.install.tmp && \ + echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \ |