diff options
Diffstat (limited to 'russian/apache13-modssl/files/patch-ab')
| -rw-r--r-- | russian/apache13-modssl/files/patch-ab | 86 |
1 files changed, 48 insertions, 38 deletions
diff --git a/russian/apache13-modssl/files/patch-ab b/russian/apache13-modssl/files/patch-ab index 97f6cb427bb0..672f23479f33 100644 --- a/russian/apache13-modssl/files/patch-ab +++ b/russian/apache13-modssl/files/patch-ab @@ -1,26 +1,21 @@ ---- Makefile.tmpl.orig Mon Mar 12 13:11:58 2001 -+++ Makefile.tmpl Mon Mar 12 13:17:31 2001 -@@ -126,6 +126,7 @@ - runtimedir = @runtimedir@ - logfiledir = @logfiledir@ - proxycachedir = @proxycachedir@ -+doc_prefix = $(prefix)/share/doc/apache - - libexecdir_relative = @libexecdir_relative@ - -@@ -328,9 +329,9 @@ +--- Makefile.tmpl.orig Tue Nov 6 11:37:00 2001 ++++ Makefile.tmpl Tue Nov 6 11:39:12 2001 +@@ -329,10 +329,12 @@ $(MKDIR) $(root)$(sysconfdir)/ssl.csr $(MKDIR) $(root)$(sysconfdir)/ssl.key $(MKDIR) $(root)$(sysconfdir)/ssl.prm - $(MKDIR) $(root)$(htdocsdir) -+ $(MKDIR) $(root)$(doc_prefix) ++ $(RM) -rf $(root)$(htdocsdir).default ++ $(MKDIR) $(root)$(htdocsdir).default + $(MKDIR) $(root)$(manualdir) $(MKDIR) $(root)$(iconsdir) - $(MKDIR) $(root)$(cgidir) ++ $(RM) -rf $(root)$(cgidir).default + $(MKDIR) $(root)$(cgidir).default $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(includedir)/xml $(MKDIR) $(root)$(sysconfdir)/tables -@@ -530,25 +531,33 @@ +@@ -532,33 +534,40 @@ # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -28,29 +23,36 @@ - echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ - else \ - echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \ -+# -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ -+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ -+# else \ -+ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ - (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\ ++# -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ ++# else \ ++ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir).default/"; \ + (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* ra-powered.* 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 {} \; ; \ +- find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \ - fi +- -@if [ -d $(TOP)/htdocs/manual ]; then \ ++ (cd $(root)$(htdocsdir).default/ && $(TAR) -xf -); \ ++ find $(root)$(htdocsdir).default/ -type d -exec chmod a+rx {} \; ; \ ++ find $(root)$(htdocsdir).default/ -type f -print | xargs chmod a+r ; \ ++# fi ++# -@if [ -d $(TOP)/htdocs/manual ]; then \ + echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \ + (cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\ + (cd $(root)$(manualdir)/ && $(TAR) -xf -); \ + find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \ + find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \ ++# fi ++ $(LN) -sf $(root)$(manualdir) $(root)$(htdocsdir).default/manual ++ if [ ! -d $(root)$(htdocsdir)/ ]; then \ ++ $(LN) -sf $(root)$(htdocsdir).default $(root)$(htdocsdir); \ + fi - -@if [ -f $(root)$(cgidir)/printenv ]; then \ -- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ +- echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \ - else \ -+ (cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \ -+ find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \ -+ find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \ -+# fi -+ if [ ! -d $(root)$(htdocsdir) ]; then \ -+ $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \ -+ fi -+ $(RM) $(root)$(htdocsdir).default -+ $(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default +# -@if [ -f $(root)$(cgidir)/printenv ]; then \ -+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ ++# echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \ +# else \ for script in printenv test-cgi; do \ cat $(TOP)/cgi-bin/$${script} |\ @@ -61,13 +63,15 @@ + echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \ + $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \ done; \ -+# fi -+ if [ ! -d $(root)$(cgidir) ]; then \ +- fi ++# fi ++ if [ ! -d $(root)$(cgidir)/ ]; then \ + $(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \ - fi ++ fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\ -@@ -598,10 +607,10 @@ + (cd $(root)$(iconsdir)/ && $(TAR) -xf -); \ +@@ -608,15 +617,15 @@ -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;' \ @@ -75,10 +79,16 @@ - -e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \ - -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \ - -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \ -+ -e "s;logs/access_log;$(logfiledir)/$${target_prefix}http-access.log;" \ -+ -e "s;logs/error_log;$(logfiledir)/$${target_prefix}http-error.log;" \ -+ -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}http-referer.log;" \ -+ -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}http-agent.log;" \ ++ -e "s;logs/access_log;$(logfiledir)/$${target_prefix}httpd-access.log;" \ ++ -e "s;logs/error_log;$(logfiledir)/$${target_prefix}httpd-error.log;" \ ++ -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \ ++ -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \ -e 's;conf/magic;$(sysconfdir)/magic;' \ -e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \ -e 's;conf/tables;$(sysconfdir)/tables;g' \ + -e 's;User nobody;User $(conf_user);' \ +- -e 's;Group #-1;Group $(conf_group);' \ ++ -e 's;Group "#-1";Group $(conf_group);' \ + -e 's;Port 80;Port $(conf_port);' \ + -e 's;Listen 80;Listen $(conf_port);' \ + -e 's;Listen 443;Listen $(conf_port_ssl);' \ |