diff options
Diffstat (limited to 'www/apache13-modssl/files/patch-ai')
| -rw-r--r-- | www/apache13-modssl/files/patch-ai | 56 |
1 files changed, 39 insertions, 17 deletions
diff --git a/www/apache13-modssl/files/patch-ai b/www/apache13-modssl/files/patch-ai index 11517ba25548..3cd482a64a0d 100644 --- a/www/apache13-modssl/files/patch-ai +++ b/www/apache13-modssl/files/patch-ai @@ -1,18 +1,29 @@ ---- Makefile.tmpl.orig Thu Oct 19 11:30:46 2000 -+++ Makefile.tmpl Thu Oct 19 11:43:48 2000 -@@ -125,2 +125,3 @@ +--- Makefile.tmpl.orig Thu Oct 18 14:14:44 2001 ++++ Makefile.tmpl Thu Oct 18 14:18:07 2001 +@@ -127,6 +127,7 @@ + runtimedir = @runtimedir@ + logfiledir = @logfiledir@ proxycachedir = @proxycachedir@ +doc_prefix = $(prefix)/share/doc/apache -@@ -327,5 +328,5 @@ + libexecdir_relative = @libexecdir_relative@ + +@@ -329,10 +330,10 @@ + $(MKDIR) $(root)$(sysconfdir)/ssl.csr + $(MKDIR) $(root)$(sysconfdir)/ssl.key $(MKDIR) $(root)$(sysconfdir)/ssl.prm - $(MKDIR) $(root)$(htdocsdir) + $(MKDIR) $(root)$(doc_prefix) + $(MKDIR) $(root)$(manualdir) $(MKDIR) $(root)$(iconsdir) - $(MKDIR) $(root)$(cgidir) + $(MKDIR) $(root)$(cgidir).default $(MKDIR) $(root)$(includedir) -@@ -528,14 +529,18 @@ + $(MKDIR) $(root)$(includedir)/xml + $(MKDIR) $(root)$(runtimedir) +@@ -531,14 +532,17 @@ + # icons and distributed CGI scripts. + install-data: @echo "===> [data: Installing initial data files]" - -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ - echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ @@ -21,27 +32,32 @@ +# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ +# else \ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \ - (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\ + (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* apache_pb.* ) |\ - (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \ - find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \ -- find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \ -- fi -- -@if [ -f $(root)$(cgidir)/printenv ]; then \ -- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ -- else \ +- find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \ + (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 {} \; ; \ ++ find $(root)$(doc_prefix)/ -type f -print | xargs chmod a+r ; \ +# fi + if [ ! -d $(root)$(htdocsdir) ]; then \ + $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \ -+ fi -+ $(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default + fi + -@if [ -d $(TOP)/htdocs/manual ]; then \ + echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \ +@@ -547,16 +551,19 @@ + find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \ + find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \ + fi +- -@if [ -f $(root)$(cgidir)/printenv ]; then \ +- echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \ +- else \ +# -@if [ -f $(root)$(cgidir)/printenv ]; then \ -+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ ++# echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \ +# else \ for script in printenv test-cgi; do \ -@@ -544,5 +549,8 @@ + cat $(TOP)/cgi-bin/$${script} |\ + sed -e 's;^#!/.*perl;#!$(PERL);' \ > $(TOP)/$(SRC)/.apaci.install.tmp; \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \ - $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \ @@ -52,7 +68,11 @@ + if [ ! -d $(root)$(cgidir) ]; then \ + $(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \ fi -@@ -594,6 +602,6 @@ + @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ + (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\ +@@ -605,10 +612,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;" \ @@ -63,3 +83,5 @@ + -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \ + -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \ -e 's;conf/magic;$(sysconfdir)/magic;' \ + -e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \ + -e 's;User nobody;User $(conf_user);' \ |