diff options
author | steve <steve@FreeBSD.org> | 1999-01-26 02:27:31 +0000 |
---|---|---|
committer | steve <steve@FreeBSD.org> | 1999-01-26 02:27:31 +0000 |
commit | 797a101621ff4a9d66f0f38272937a960f2da964 (patch) | |
tree | b970eebb30b25c7efb1ecd66ec65cb3184063551 /www/apache13-fp/files | |
parent | ce77b7d2e8aaa85230f2f56099ecd28aa8402a87 (diff) | |
download | FreeBSD-ports-797a101621ff4a9d66f0f38272937a960f2da964.zip FreeBSD-ports-797a101621ff4a9d66f0f38272937a960f2da964.tar.gz |
Update to version 1.3.4.
PR: 9617
Submitted by: maintainer
Diffstat (limited to 'www/apache13-fp/files')
-rw-r--r-- | www/apache13-fp/files/apache.sh.tmpl | 7 | ||||
-rw-r--r-- | www/apache13-fp/files/patch-aa | 122 | ||||
-rw-r--r-- | www/apache13-fp/files/patch-ab | 304 | ||||
-rw-r--r-- | www/apache13-fp/files/patch-ag | 180 | ||||
-rw-r--r-- | www/apache13-fp/files/patch-ak | 106 | ||||
-rw-r--r-- | www/apache13-fp/files/patch-al | 79 | ||||
-rw-r--r-- | www/apache13-fp/files/patch-at | 12 | ||||
-rw-r--r-- | www/apache13-fp/files/patch-fa | 361 | ||||
-rw-r--r-- | www/apache13-fp/files/patch-fb | 773 |
9 files changed, 899 insertions, 1045 deletions
diff --git a/www/apache13-fp/files/apache.sh.tmpl b/www/apache13-fp/files/apache.sh.tmpl index 95855ce..b36a499 100644 --- a/www/apache13-fp/files/apache.sh.tmpl +++ b/www/apache13-fp/files/apache.sh.tmpl @@ -22,13 +22,18 @@ new_key() { # Main # +if [ -x PREFIX/libexec/apache/mod_frontpage.so ] +then + MODULES="fp" +fi + case "$1" in start) if [ -x PREFIX/sbin/apachectl ] then new_key - PREFIX/sbin/apachectl start && echo -n ' httpd' + PREFIX/sbin/apachectl start${MODULES} && echo -n ' httpd' fi ;; diff --git a/www/apache13-fp/files/patch-aa b/www/apache13-fp/files/patch-aa index ddf92e7..0a8331b 100644 --- a/www/apache13-fp/files/patch-aa +++ b/www/apache13-fp/files/patch-aa @@ -1,72 +1,50 @@ -*** configure.orig Thu Sep 17 03:07:53 1998 ---- configure Sat Nov 28 11:33:04 1998 -*************** -*** 810,815 **** ---- 810,816 ---- - ## - ## determine special configuration parameters - ## -+ conf_user="nobody" - conf_group="#-1" - conf_port="80" - conf_serveradmin="you@your.address" -*************** -*** 828,833 **** ---- 829,837 ---- - conf_serveradmin="`$aux/buildinfo.sh -n %u@%h%d`" - conf_servername="`$aux/buildinfo.sh -n %h%d`" - fi -+ if [ ".$suexec" = .1 ]; then -+ conf_user="$suexec_caller" -+ fi - - ## - ## determine prefix-relative paths for directories -*************** -*** 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" ---- 874,881 ---- - 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" -*************** -*** 912,917 **** ---- 916,922 ---- - -e "s%@suexec_uidmin@%$suexec_uidmin%g" \ - -e "s%@suexec_gidmin@%$suexec_gidmin%g" \ - -e "s%@suexec_safepath@%$suexec_safepath%g" \ -+ -e "s%@conf_user@%$conf_user%g" \ - -e "s%@conf_group@%$conf_group%g" \ - -e "s%@conf_port@%$conf_port%g" \ - -e "s%@conf_serveradmin@%$conf_serveradmin%g" \ -*************** -*** 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 ---- 940,947 ---- - 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 07:19:41 1999 ++++ configure Mon Jan 18 17:18:16 1999 +@@ -953,6 +953,7 @@ + ## + ## determine special configuration parameters + ## ++conf_user="nobody" + conf_group="#-1" + conf_port="80" + conf_serveradmin="you@your.address" +@@ -971,6 +972,9 @@ + conf_serveradmin="`$aux/buildinfo.sh -n %u@%h%d`" + conf_servername="`$aux/buildinfo.sh -n %h%d`" + fi ++if [ ".$suexec" = .1 ]; then ++ conf_user="$suexec_caller" ++fi + + ## + ## determine prefix-relative paths for directories +@@ -1012,8 +1016,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" +@@ -1068,6 +1072,7 @@ + -e "s%@suexec_uidmin@%$suexec_uidmin%g" \ + -e "s%@suexec_gidmin@%$suexec_gidmin%g" \ + -e "s%@suexec_safepath@%$suexec_safepath%g" \ ++-e "s%@conf_user@%$conf_user%g" \ + -e "s%@conf_group@%$conf_group%g" \ + -e "s%@conf_port@%$conf_port%g" \ + -e "s%@conf_serveradmin@%$conf_serveradmin%g" \ +@@ -1091,8 +1096,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-fp/files/patch-ab b/www/apache13-fp/files/patch-ab index 0bc741e..279a637 100644 --- a/www/apache13-fp/files/patch-ab +++ b/www/apache13-fp/files/patch-ab @@ -1,168 +1,136 @@ -*** Makefile.tmpl.orig Sat Sep 19 07:41:48 1998 ---- Makefile.tmpl Sat Nov 28 10:30:01 1998 -*************** -*** 107,112 **** ---- 107,113 ---- - runtimedir = @runtimedir@ - logfiledir = @logfiledir@ - proxycachedir = @proxycachedir@ -+ doc_prefix = $(prefix)/share/doc/apache - - libexecdir_relative = @libexecdir_relative@ - -*************** -*** 119,124 **** ---- 120,126 ---- - suexec_safepath = @suexec_safepath@ - - # some substituted configuration parameters -+ conf_user = @conf_user@ - conf_group = @conf_group@ - conf_port = @conf_port@ - conf_serveradmin = @conf_serveradmin@ -*************** -*** 166,173 **** - -DUID_MIN=$(suexec_uidmin) \ - -DGID_MIN=$(suexec_gidmin) \ - -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ -! -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ -! -DDOC_ROOT=\"$(datadir)/htdocs\" \ - -DSAFE_PATH=\"$(suexec_safepath)\" \ - ' \ - suexec; \ ---- 168,175 ---- - -DUID_MIN=$(suexec_uidmin) \ - -DGID_MIN=$(suexec_gidmin) \ - -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ -! -DLOG_EXEC=\"$(logfiledir)/httpd-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) ---- 226,234 ---- - $(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,364 **** - # 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 - *) |\ ---- 342,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 \ -! $(CP) -rp $(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 - *) |\ -*************** -*** 378,397 **** - 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);' \ - -e 's;@@ServerRoot@@;$(prefix);' \ - -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);' \ - -e 's;Port 80;Port $(conf_port);' \ - -e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \ ---- 387,409 ---- - 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);' \ -+ -e 's;@@ServerRoot@@/srm.conf;$(sysconfdir)/srm.conf;' \ -+ -e 's;@@ServerRoot@@/access.conf;$(sysconfdir)/access.conf;' \ - -e 's;@@ServerRoot@@;$(prefix);' \ - -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;User nobody;User $(conf_user);' \ - -e 's;Group #-1;Group $(conf_group);' \ - -e 's;Port 80;Port $(conf_port);' \ - -e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \ +--- Makefile.tmpl.orig Thu Jan 7 05:50:45 1999 ++++ Makefile.tmpl Fri Jan 22 22:24:16 1999 +@@ -110,6 +110,7 @@ + runtimedir = @runtimedir@ + logfiledir = @logfiledir@ + proxycachedir = @proxycachedir@ ++doc_prefix = $(prefix)/share/doc/apache + + libexecdir_relative = @libexecdir_relative@ + +@@ -124,6 +125,7 @@ + suexec_safepath = @suexec_safepath@ + + # some substituted configuration parameters ++conf_user = @conf_user@ + conf_group = @conf_group@ + conf_port = @conf_port@ + conf_serveradmin = @conf_serveradmin@ +@@ -239,9 +241,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) +@@ -278,9 +280,11 @@ + file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \ + echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \ + $(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \ +- name=`$(TOP)/$(AUX)/fmn.sh $(TOP)/$(SRC)/$${mod}`; \ +- echo dummy | awk '{ printf("LoadModule %-18s %s\n", modname, modpath); }' \ +- modname="$${name}" modpath="$(libexecdir_relative)$${file}" >>$(SRC)/.apaci.install.conf; \ ++ if [ "$${file}" != "mod_frontpage.so" ]; then \ ++ name=`$(TOP)/$(AUX)/fmn.sh $(TOP)/$(SRC)/$${mod}`; \ ++ echo dummy | awk '{ printf("LoadModule %-18s %s\n", modname, modpath); }' \ ++ modname="$${name}" modpath="$(libexecdir_relative)$${file}" >>$(SRC)/.apaci.install.conf; \ ++ fi; \ + done; \ + echo "" >>$(SRC)/.apaci.install.conf; \ + echo "# Reconstruction of the complete module list from all available modules" >>$(SRC)/.apaci.install.conf; \ +@@ -288,6 +292,7 @@ + echo "# [WHENEVER YOU CHANGE THE LOADMODULE SECTION ABOVE UPDATE THIS, TOO]" >>$(SRC)/.apaci.install.conf; \ + echo "ClearModuleList" >>$(SRC)/.apaci.install.conf; \ + egrep "^[ ]*(Add|Shared)Module" $(SRC)/Configuration.apaci |\ ++ egrep -v "mod_frontpage.so" |\ + sed -e 's:SharedModule:AddModule:' \ + -e 's:modules/[^/]*/::' \ + -e 's:[ ]lib: mod_:' \ +@@ -308,6 +313,7 @@ + echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*] $(root)$(sbindir)/$${apachectl}"; \ + sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/$(TARGET).pid;' \ + -e 's;HTTPD=.*;HTTPD=$(sbindir)/$(TARGET);' \ ++ -e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib\:$(prefix)/lib;' \ + < $(TOP)/$(SRC)/support/apachectl > $(TOP)/$(SRC)/.apaci.install.tmp && \ + $(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sbindir)/$${apachectl}; \ + echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.1 $(root)$(mandir)/man1/$${apachectl}.1"; \ +@@ -363,25 +369,32 @@ + # 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 {} \; ; \ ++ (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 \ ++ $(CP) -rp $(root)$(doc_prefix) $(root)$(datadir)/data; \ + fi +- -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ +- else \ ++ $(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/$${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,20 +424,23 @@ + 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);' \ ++ -e 's;@@ServerRoot@@/srm.conf;$(sysconfdir)/srm.conf;' \ ++ -e 's;@@ServerRoot@@/access.conf;$(sysconfdir)/access.conf;' \ + -e 's;@@ServerRoot@@;$(prefix);g' \ + -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;User nobody;User $(conf_user);' \ + -e 's;Group #-1;Group $(conf_group);' \ + -e 's;Port 80;Port $(conf_port);' \ + -e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \ diff --git a/www/apache13-fp/files/patch-ag b/www/apache13-fp/files/patch-ag index bcbbc23..4ae02d5 100644 --- a/www/apache13-fp/files/patch-ag +++ b/www/apache13-fp/files/patch-ag @@ -1,72 +1,108 @@ -*** conf/httpd.conf-dist.orig Wed May 6 16:12:39 1998 ---- conf/httpd.conf-dist Sat Jun 6 13:08:52 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. -*************** -*** 65,70 **** ---- 65,80 ---- - - ServerRoot @@ServerRoot@@ - -+ # AccessConfig: The name and location of the Access Configuration file -+ # -+ -+ AccessConfig @@ServerRoot@@/access.conf -+ -+ # ResourceConfig: The name and location of the Resource Configuration file -+ # -+ -+ ResourceConfig @@ServerRoot@@/srm.conf -+ - # BindAddress: You can support virtual hosts with this option. This option - # is used to tell the server which IP address to listen to. It can either - # contain "*", an IP address, or a fully qualified Internet domain name. -*************** -*** 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. ---- 104,110 ---- - # 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 ---- 115,121 ---- - # 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 11:04:29 1998 ++++ conf/httpd.conf-dist Mon Jan 18 17:18:16 1999 +@@ -97,6 +97,13 @@ + #ResourceConfig conf/srm.conf + #AccessConfig conf/access.conf + ++<IfDefine FRONTPAGE> ++### FrontPage needs these two directives defined, otherwise ### ++### the fpadmsrv.exe program will cause errors. ### ++ResourceConfig @@ServerRoot@@/srm.conf ++AccessConfig @@ServerRoot@@/access.conf ++</IfDefine> ++ + # + # Timeout: The number of seconds before receives and sends time out. + # +@@ -196,6 +203,22 @@ + # Example: + # LoadModule foo_module libexec/mod_foo.so + ++<IfDefine SSL> ++### Uncomment the following if you wish to use SSL and you need RSAREF: ### ++#LoadFile !librsaref.so.2 ++LoadFile !libcrypto.so.0 ++LoadFile !libssl.so.0 ++LoadModule ssl_module libexec/apache/mod_ssl.so ++AddModule mod_ssl.c ++</IfDefine> ++ ++<IfDefine FRONTPAGE> ++### We need to check if it matters when the frontpage ### ++### module is loaded, before or after the SSL module? ### ++LoadModule frontpage_module libexec/apache/mod_frontpage.so ++AddModule mod_frontpage.c ++</IfDefine> ++ + # + # ExtendedStatus controls whether Apache will generate "full" status + # information (ExtendedStatus On) or just basic information (ExtendedStatus +@@ -241,7 +264,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 +@@ -269,7 +292,7 @@ + # documents. By default, all requests are taken from this directory, but + # symbolic links and aliases may be used to point to other locations. + # +-DocumentRoot "@@ServerRoot@@/htdocs" ++DocumentRoot @@ServerRoot@@/htdocs + + # + # Each directory to which Apache has access, can be configured with respect +@@ -310,7 +333,16 @@ + # override. Can also be "All", or any combination of "Options", "FileInfo", + # "AuthConfig", and "Limit" + # ++<IfDefine !FRONTPAGE> + AllowOverride None ++</IfDefine> ++ ++<IfDefine FRONTPAGE> ++### These are the Minimum options need by the FrontPage Module. ++### With out these options set the FrontPage Client will not be ++### able to access the server. ++ AllowOverride AuthConfig Limit Indexes Options ++</IfDefine> + + # + # Controls who can get stuff from this server. +@@ -342,6 +374,15 @@ + # </Limit> + #</Directory> + ++### In Order for FrontPage to work in User and Virtual ### ++### Web Directories, they need to be set up as shown: ### ++<IfDefine FRONTPAGE> ++ <Directory /*/public_html> ++ AllowOverride AuthConfig Limit Indexes Options ++ Options ExecCGI ++ </Directory> ++</IfDefine> ++ + # + # DirectoryIndex: Name of the file or files to use as a pre-written HTML + # directory index. Separate multiple entries with spaces. +@@ -459,7 +500,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 +513,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-fp/files/patch-ak b/www/apache13-fp/files/patch-ak index 7cda58a..d8851fc 100644 --- a/www/apache13-fp/files/patch-ak +++ b/www/apache13-fp/files/patch-ak @@ -1,40 +1,66 @@ -*** src/support/apachectl.orig Fri Jul 17 01:25:54 1998 ---- src/support/apachectl Fri Jul 24 00:34:59 1998 -*************** -*** 39,44 **** ---- 39,46 ---- - # -------------------- -------------------- - # |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| - -+ eval `limits -e -C daemon` >/dev/null 2>&1 -+ - ERROR=0 - ARGV="$@" - if [ "x$ARGV" = "x" ] ; then -*************** -*** 50,56 **** - # check for pidfile - if [ -f $PIDFILE ] ; then - PID=`cat $PIDFILE` -! if kill -0 $PID; then - STATUS="httpd (pid $PID) running" - RUNNING=1 - else ---- 52,58 ---- - # check for pidfile - if [ -f $PIDFILE ] ; then - PID=`cat $PIDFILE` -! if kill -0 $PID > /dev/null 2>&1; then - STATUS="httpd (pid $PID) running" - RUNNING=1 - else -*************** -*** 82,87 **** ---- 84,90 ---- - fi - if kill $PID ; then - echo "$0 $ARG: httpd stopped" -+ rm $PIDFILE - else - echo "$0 $ARG: httpd could not be stopped" - ERROR=4 +--- src/support/apachectl.orig Fri Jan 1 13:05:32 1999 ++++ src/support/apachectl Thu Jan 21 20:14:27 1999 +@@ -27,6 +27,10 @@ + # the path to your httpd binary, including options if necessary + HTTPD='/usr/local/apache/src/httpd' + # ++# shared object search path ++LD_LIBRARY_PATH= ++export LD_LIBRARY_PATH ++# + # a command that outputs a formatted text version of the HTML at the + # url given on the command line. Designed for lynx, however other + # programs may work. +@@ -39,6 +43,8 @@ + # -------------------- -------------------- + # |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| + ++eval `limits -e -C daemon` >/dev/null 2>&1 ++ + ERROR=0 + ARGV="$@" + if [ "x$ARGV" = "x" ] ; then +@@ -50,7 +56,7 @@ + # check for pidfile + if [ -f $PIDFILE ] ; then + PID=`cat $PIDFILE` +- if kill -0 $PID; then ++ if kill -0 $PID > /dev/null 2>&1; then + STATUS="httpd (pid $PID) running" + RUNNING=1 + else +@@ -75,6 +81,18 @@ + ERROR=3 + fi + ;; ++ startfp|start_frontpage|start-FP) ++ if [ $RUNNING -eq 1 ]; then ++ echo "$0 $ARG: httpd (pid $PID) already running" ++ continue ++ fi ++ if $HTTPD -DFRONTPAGE; then ++ echo "$0 $ARG: httpd started" ++ else ++ echo "$0 $ARG: httpd could not be started" ++ ERROR=3 ++ fi ++ ;; + stop) + if [ $RUNNING -eq 0 ]; then + echo "$0 $ARG: $STATUS" +@@ -82,6 +100,7 @@ + fi + if kill $PID ; then + echo "$0 $ARG: httpd stopped" ++ rm $PIDFILE + else + echo "$0 $ARG: httpd could not be stopped" + ERROR=4 +@@ -153,6 +172,7 @@ + cat <<EOF + + start - start httpd ++startfp - start httpd with FrontPage Extentions enabled + stop - stop httpd + restart - restart httpd if running by sending a SIGHUP or start if + not running diff --git a/www/apache13-fp/files/patch-al b/www/apache13-fp/files/patch-al index 039d632..2b3796c 100644 --- a/www/apache13-fp/files/patch-al +++ b/www/apache13-fp/files/patch-al @@ -1,50 +1,29 @@ -*** src/support/log_server_status.orig Tue Mar 31 16:53:50 1998 ---- src/support/log_server_status Tue Apr 21 17:18:10 1998 -*************** -*** 67,76 **** - # - require 'sys/socket.ph'; - -! $wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/960312" - $server = "localhost"; # Name of server, could be "www.foo.com" - $port = "80"; # Port on server -! $request = "/status/?auto"; # Request to send - - sub tcp_connect - { ---- 67,76 ---- - # - require 'sys/socket.ph'; - -! $wherelog = "/var/log/httpd-status-"; # Logs will be like "/var/log/graph/960312" - $server = "localhost"; # Name of server, could be "www.foo.com" - $port = "80"; # Port on server -! $request = "/server-status/?auto"; # Request to send - - sub tcp_connect - { -*************** -*** 93,103 **** - ### Main - - { -! $date=`date +%y%m%d:%H%M%S`; - chop($date); - ($day,$time)=split(/:/,$date); - $res=&tcp_connect($server,$port); -! open(OUT,">>$wherelog$day"); - if ($res) { - print OUT "$time:-1:-1:-1:-1:$res\n"; - exit 1; ---- 93,103 ---- - ### Main - - { -! $date=`LC_TIME=C date +%y%m%d:%H%M%S`; - chop($date); - ($day,$time)=split(/:/,$date); - $res=&tcp_connect($server,$port); -! open(OUT,">>$wherelog$day.log"); - if ($res) { - print OUT "$time:-1:-1:-1:-1:$res\n"; - exit 1; +--- src/support/log_server_status.orig Fri Jan 1 13:05:34 1999 ++++ src/support/log_server_status Mon Jan 18 17:18:16 1999 +@@ -67,10 +67,10 @@ + # + require 'sys/socket.ph'; + +-$wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/960312" ++$wherelog = "/var/log/httpd-status-"; # Logs will be like "/var/log/httpd-status-960312" + $server = "localhost"; # Name of server, could be "www.foo.com" + $port = "80"; # Port on server +-$request = "/status/?auto"; # Request to send ++$request = "/server-status/?auto"; # Request to send + + sub tcp_connect + { +@@ -93,11 +93,11 @@ + ### Main + + { +- $date=`date +%y%m%d:%H%M%S`; ++ $date=`LC_TIME=C date +%y%m%d:%H%M%S`; + chop($date); + ($day,$time)=split(/:/,$date); + $res=&tcp_connect($server,$port); +- open(OUT,">>$wherelog$day"); ++ open(OUT,">>$wherelog$day.log"); + if ($res) { + print OUT "$time:-1:-1:-1:-1:$res\n"; + exit 1; diff --git a/www/apache13-fp/files/patch-at b/www/apache13-fp/files/patch-at new file mode 100644 index 0000000..c555f77 --- /dev/null +++ b/www/apache13-fp/files/patch-at @@ -0,0 +1,12 @@ +--- src/support/apxs.pl.orig Fri Jan 1 16:00:15 1999 ++++ src/support/apxs.pl Mon Jan 18 17:18:17 1999 +@@ -393,8 +393,7 @@ + } + my $t = $f; + $t =~ s|^.+/([^/]+)$|$1|; +- push(@cmds, "cp $f $CFG_LIBEXECDIR/$t"); +- push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t"); ++ push(@cmds, "install -c -m 555 -o root -g wheel $f $CFG_LIBEXECDIR/$t"); + + # determine module symbolname and filename + my $filename = ''; diff --git a/www/apache13-fp/files/patch-fa b/www/apache13-fp/files/patch-fa index dca1cb1..d9af777 100644 --- a/www/apache13-fp/files/patch-fa +++ b/www/apache13-fp/files/patch-fa @@ -1,205 +1,156 @@ -*** frontpage/version3.0/change_server.sh.orig Thu Mar 5 06:00:22 1998 ---- frontpage/version3.0/change_server.sh Tue Mar 17 21:06:53 1998 -*************** -*** 38,46 **** - { - VERSION="3.0" - PATH=".:/bin:/usr/bin:/sbin:/usr/sbin:/usr/ucb:/etc" -! NEWHTTPD="/usr/local/frontpage/currentversion/apache-fp/httpd" - UPGRADEVERSION=`$NEWHTTPD -v` -! DEFAULTHTTPD="/usr/local/etc/httpd/httpd" - - case "`echo 'x\c'`" in - 'x\c') echo="echo -n" nnl= ;; #BSD ---- 38,46 ---- - { - VERSION="3.0" - PATH=".:/bin:/usr/bin:/sbin:/usr/sbin:/usr/ucb:/etc" -! NEWHTTPD="/usr/local/sbin/httpd" - UPGRADEVERSION=`$NEWHTTPD -v` -! DEFAULTHTTPD="/usr/local/sbin/httpd" - - case "`echo 'x\c'`" in - 'x\c') echo="echo -n" nnl= ;; #BSD -*************** -*** 59,64 **** ---- 59,67 ---- - IRIX*) machine="sgi" ;; - SunOS*5.*sun4*) machine="solaris" ;; - SunOS*4.*sun4*) machine="sunos";; -+ FreeBSD* | \ -+ NetBSD* | \ -+ OpenBSD* | \ - *BSD/OS?3.0*) machine="bsdi3" ;; - BSD/OS*) machine="bsdi" ;; - SCO_SV*) machine="sco5" ;; -*************** -*** 366,375 **** - *pache*) getHttpDirective $configfile AccessConfig $port - if [ "$param" != "" ] - then -! file=`basename $param` -! accessconffile="${configfiledir}${file}" - else -! accessconffile="${configfiledir}access.conf" - fi - - if [ ! -f "$accessconffile" ] ---- 369,387 ---- - *pache*) getHttpDirective $configfile AccessConfig $port - if [ "$param" != "" ] - then -! if [ "$param" != "/dev/null" ] -! then -! file=`basename $param` -! accessconffile="${configfiledir}${file}" -! else -! configError -! fi - else -! accessconffile="${configfiledir}conf/access.conf" -! if [ ! -f "$accessconffile" ] -! then -! configError2 -! fi - fi - - if [ ! -f "$accessconffile" ] -*************** -*** 932,941 **** - getHttpDirective $configfile ResourceConfig $port - if [ "$param" != "" ] - then -! file=`basename $param` -! resconffile="${configfiledir}${file}" - else -! resconffile="${configfiledir}srm.conf" - fi - echo "Getting DocumentRoot from $resconffile." - getparam DocumentRoot $resconffile ---- 944,962 ---- - getHttpDirective $configfile ResourceConfig $port - if [ "$param" != "" ] - then -! if [ "$param" != "/dev/null" ] -! then -! file=`basename $param` -! resconffile="${configfiledir}${file}" -! else -! configError -! fi - else -! resconffile="${configfiledir}conf/srm.conf" -! if [ ! -f "$resconffile" ] -! then -! configError2 -! fi - fi - echo "Getting DocumentRoot from $resconffile." - getparam DocumentRoot $resconffile -*************** -*** 952,961 **** - resconffile=$param - if [ "$param" != "" ] - then -! file=`basename $param` -! resconffile="${configfiledir}${file}" - else -! resconffile="${configfiledir}srm.conf" - fi - echo "Getting UserDir from $resconffile." - getparam UserDir $resconffile ---- 973,991 ---- - resconffile=$param - if [ "$param" != "" ] - then -! if [ "$param" != "/dev/null" ] -! then -! file=`basename $param` -! resconffile="${configfiledir}${file}" -! else -! configError -! fi - else -! resconffile="${configfiledir}conf/srm.conf" -! if [ ! -f "$resconffile" ] -! then -! configError2 -! fi - fi - echo "Getting UserDir from $resconffile." - getparam UserDir $resconffile -*************** -*** 979,988 **** - *) getHttpDirective $configfile ResourceConfig $port - if [ "$param" != "" ] - then -! file=`basename $param` -! resconffile="${configfiledir}${file}" - else -! resconffile="${configfiledir}srm.conf" - fi - - if [ ! -f "$resconffile" ] ---- 1009,1027 ---- - *) getHttpDirective $configfile ResourceConfig $port - if [ "$param" != "" ] - then -! if [ "$param" != "/dev/null" ] -! then -! file=`basename $param` -! resconffile="${configfiledir}${file}" -! else -! configError -! fi - else -! resconffile="${configfiledir}conf/srm.conf" -! if [ ! -f "$resconffile" ] -! then -! configError2 -! fi - fi - - if [ ! -f "$resconffile" ] -*************** -*** 1124,1129 **** ---- 1163,1201 ---- - getHttpRootDirective $configfile $directive - fi - -+ } -+ -+ configError() -+ { -+ echo -+ echo "ERROR: ${configfile} invalid format" -+ echo "Change ${configfile} as follows:" -+ echo -+ echo " ResourceConfig ${configfile}" -+ echo " AccessConfig ${configfile}" -+ echo -+ $echo "hit enter to continue${nnl}" -+ read continue -+ echo "Ouch!!!!!!!!!!!!! Not so hard, gently please" -+ echo -+ exit 1 -+ } -+ -+ configError2() -+ { -+ echo -+ echo "ERROR: ${configfile} invalid" -+ echo -+ echo "Change ${configfile} as follows:" -+ echo -+ echo " ResourceConfig ${configfiledir}srm.conf" -+ echo " AccessConfig ${configfiledir}access.conf" -+ echo -+ $echo "hit enter to continue${nnl}" -+ read continue -+ echo "Ouch!!!!!!!!!!!!! Not so hard, gently please" -+ echo -+ exit 1 - } - - error() +--- frontpage/version3.0/change_server.sh.orig Thu Mar 5 06:00:22 1998 ++++ frontpage/version3.0/change_server.sh Fri Jan 22 23:03:20 1999 +@@ -38,9 +38,9 @@ + { + VERSION="3.0" + PATH=".:/bin:/usr/bin:/sbin:/usr/sbin:/usr/ucb:/etc" +- NEWHTTPD="/usr/local/frontpage/currentversion/apache-fp/httpd" ++ NEWHTTPD="PREFIX/sbin/httpd" + UPGRADEVERSION=`$NEWHTTPD -v` +- DEFAULTHTTPD="/usr/local/etc/httpd/httpd" ++ DEFAULTHTTPD="PREFIX/sbin/httpd" + + case "`echo 'x\c'`" in + 'x\c') echo="echo -n" nnl= ;; #BSD +@@ -59,6 +59,9 @@ + IRIX*) machine="sgi" ;; + SunOS*5.*sun4*) machine="solaris" ;; + SunOS*4.*sun4*) machine="sunos";; ++ FreeBSD* | \ ++ NetBSD* | \ ++ OpenBSD* | \ + *BSD/OS?3.0*) machine="bsdi3" ;; + BSD/OS*) machine="bsdi" ;; + SCO_SV*) machine="sco5" ;; +@@ -366,10 +369,19 @@ + *pache*) getHttpDirective $configfile AccessConfig $port + if [ "$param" != "" ] + then +- file=`basename $param` +- accessconffile="${configfiledir}${file}" ++ if [ "$param" != "/dev/null" ] ++ then ++ file=`basename $param` ++ accessconffile="${configfiledir}${file}" ++ else ++ configError ++ fi + else +- accessconffile="${configfiledir}access.conf" ++ accessconffile="${configfiledir}conf/access.conf" ++ if [ ! -f "$accessconffile" ] ++ then ++ configError2 ++ fi + fi + + if [ ! -f "$accessconffile" ] +@@ -932,10 +944,19 @@ + getHttpDirective $configfile ResourceConfig $port + if [ "$param" != "" ] + then +- file=`basename $param` +- resconffile="${configfiledir}${file}" ++ if [ "$param" != "/dev/null" ] ++ then ++ file=`basename $param` ++ resconffile="${configfiledir}${file}" ++ else ++ configError ++ fi + else +- resconffile="${configfiledir}srm.conf" ++ resconffile="${configfiledir}conf/srm.conf" ++ if [ ! -f "$resconffile" ] ++ then ++ configError2 ++ fi + fi + echo "Getting DocumentRoot from $resconffile." + getparam DocumentRoot $resconffile +@@ -952,10 +973,19 @@ + resconffile=$param + if [ "$param" != "" ] + then +- file=`basename $param` +- resconffile="${configfiledir}${file}" ++ if [ "$param" != "/dev/null" ] ++ then ++ file=`basename $param` ++ resconffile="${configfiledir}${file}" ++ else ++ configError ++ fi + else +- resconffile="${configfiledir}srm.conf" ++ resconffile="${configfiledir}conf/srm.conf" ++ if [ ! -f "$resconffile" ] ++ then ++ configError2 ++ fi + fi + echo "Getting UserDir from $resconffile." + getparam UserDir $resconffile +@@ -979,10 +1009,19 @@ + *) getHttpDirective $configfile ResourceConfig $port + if [ "$param" != "" ] + then +- file=`basename $param` +- resconffile="${configfiledir}${file}" ++ if [ "$param" != "/dev/null" ] ++ then ++ file=`basename $param` ++ resconffile="${configfiledir}${file}" ++ else ++ configError ++ fi + else +- resconffile="${configfiledir}srm.conf" ++ resconffile="${configfiledir}conf/srm.conf" ++ if [ ! -f "$resconffile" ] ++ then ++ configError2 ++ fi + fi + + if [ ! -f "$resconffile" ] +@@ -1124,6 +1163,39 @@ + getHttpRootDirective $configfile $directive + fi + ++} ++ ++configError() ++{ ++ echo ++ echo "ERROR: ${configfile} invalid format" ++ echo "Change ${configfile} as follows:" ++ echo ++ echo " ResourceConfig ${configfile}" ++ echo " AccessConfig ${configfile}" ++ echo ++ $echo "hit enter to continue${nnl}" ++ read continue ++ echo "Ouch!!!!!!!!!!!!! Not so hard, gently please" ++ echo ++ exit 1 ++} ++ ++configError2() ++{ ++ echo ++ echo "ERROR: ${configfile} invalid" ++ echo ++ echo "Change ${configfile} as follows:" ++ echo ++ echo " ResourceConfig ${configfiledir}srm.conf" ++ echo " AccessConfig ${configfiledir}access.conf" ++ echo ++ $echo "hit enter to continue${nnl}" ++ read continue ++ echo "Ouch!!!!!!!!!!!!! Not so hard, gently please" ++ echo ++ exit 1 + } + + error() diff --git a/www/apache13-fp/files/patch-fb b/www/apache13-fp/files/patch-fb index 53eff07..ec663ce 100644 --- a/www/apache13-fp/files/patch-fb +++ b/www/apache13-fp/files/patch-fb @@ -1,437 +1,336 @@ -*** frontpage/version3.0/fp_install.sh.orig Thu Mar 5 06:00:21 1998 ---- frontpage/version3.0/fp_install.sh Tue Mar 17 21:07:20 1998 -*************** -*** 69,74 **** ---- 69,77 ---- - IRIX*) machine="sgi" ;; - SunOS*5.*sun4*) machine="solaris" ;; - SunOS*4.*sun4*) machine="sunos";; -+ FreeBSD* | \ -+ NetBSD* | \ -+ OpenBSD* | \ - *BSD/OS?3.0*) machine="bsdi3" ;; - BSD/OS*) machine="bsdi" ;; - SCO_SV*) machine="sco5" ;; -*************** -*** 412,418 **** - vtfile="fp30.$machine.tar" - echo "Platform is $machine." - -! vtfilelocation="`pwd`/" - - getextfilename $vtfilelocation $vtfile || return 1 - ---- 415,421 ---- - vtfile="fp30.$machine.tar" - echo "Platform is $machine." - -! vtfilelocation="/usr/ports/distfiles/" - - getextfilename $vtfilelocation $vtfile || return 1 - -*************** -*** 651,660 **** - *pache*) getHttpDirective $configfile AccessConfig $port - if [ "$param" != "" ] - then -! file=`basename $param` -! accessconffile="${configfiledir}${file}" - else -! accessconffile="${configfiledir}access.conf" - fi - - if [ ! -f "$accessconffile" ] ---- 654,672 ---- - *pache*) getHttpDirective $configfile AccessConfig $port - if [ "$param" != "" ] - then -! if [ "$param" != "/dev/null" ] -! then -! file=`basename $param` -! accessconffile="${configfiledir}${file}" -! else -! configError -! fi - else -! accessconffile="${configfiledir}conf/access.conf" -! if [ ! -f "$accessconffile" ] -! then -! configError2 -! fi - fi - - if [ ! -f "$accessconffile" ] -*************** -*** 1101,1118 **** - - webname="/" - - configfile="" - while ( [ "$configfile" = "" ] || [ ! -f $configfile ] ) - do -! $echo "Server config filename: ${nnl}" - read configfile -! done - - admin="" - until [ "$admin" != "" ] - do -! $echo "FrontPage Administrator's user name: ${nnl}" - read admin - done - - getparam Port $configfile ---- 1113,1141 ---- - - webname="/" - -+ defconfigfile="/usr/local/etc/apache/httpd.conf" -+ - configfile="" - while ( [ "$configfile" = "" ] || [ ! -f $configfile ] ) - do -! $echo "Server config filename: [$defconfigfile] ${nnl}" - read configfile -! if [ "$configfile" = "" ] -! then -! configfile=$defconfigfile -! fi -! done - -+ defadmin="fpadmin" - admin="" - until [ "$admin" != "" ] - do -! $echo "FrontPage Administrator's user name: [$defadmin] ${nnl}" - read admin -+ if [ "$admin" = "" ] -+ then -+ admin=$defadmin -+ fi - done - - getparam Port $configfile -*************** -*** 1124,1135 **** - read port - done - -- getparam User $configfile -- webowner=$param -- - weconfigfile="${installdir}/we${port}.cnf" - -! defwebowner=`$lsg ${docroot}${service} | $awk ' { print $3}'` - - webowner="" - until [ "$webowner" != "" ] ---- 1147,1183 ---- - read port - done - - weconfigfile="${installdir}/we${port}.cnf" -+ getHttpDirective ${configfile} ResourceConfig ${port} -+ if [ "$param" = "/dev/null" ] -+ then -+ configError -+ fi -+ configfiledir=`dirname $configfile`"/" -+ if [ "$param" != "" ] -+ then -+ file=`basename $param` -+ resconffile="${configfiledir}${file}" -+ else -+ resconffile="${configfiledir}conf/srm.conf" -+ if [ ! -f "$resconffile" ] -+ then -+ configError2 -+ fi -+ fi - -! getparam DocumentRoot $resconffile -! docroot=$param -! -! getparam User $configfile -! defwebowner=$param -! -! if [ "$defwebowner" = "" ] -! then -! getparam DocumentRoot $resconffile -! docroot=$param -! defwebowner=`$lsg ${docroot}${service} | $awk ' { print $3}'` -! fi - - webowner="" - until [ "$webowner" != "" ] -*************** -*** 1144,1149 **** ---- 1192,1203 ---- - - getparam Group $configfile - defgroup=$param -+ -+ if [ "$defgroup" = "" ] -+ then -+ defgroup=`$lsg ${docroot}${service} | $awk ' { print $4}'` -+ fi -+ - webgroup="" - until [ "$webgroup" != "" ] - do -*************** -*** 1155,1160 **** ---- 1209,1216 ---- - webgroup=$defgroup - fi - done -+ -+ defservertypenum="3" - - until [ "$servertype" != "" ] - do -*************** -*** 1168,1176 **** - echo " 7. netscape-commerce" - echo " 8. netscape-fasttrack" - echo " 9. netscape-enterprise" -! $echo "What type of Server is this: ${nnl}" - read servertypenum - echo - - case $servertypenum in - "1") servertype="ncsa" ;; ---- 1224,1236 ---- - echo " 7. netscape-commerce" - echo " 8. netscape-fasttrack" - echo " 9. netscape-enterprise" -! $echo "What type of Server is this: [$defservertypenum] ${nnl}" - read servertypenum - echo -+ if [ "$servertypenum" = "" ] -+ then -+ servertypenum=$defservertypenum -+ fi - - case $servertypenum in - "1") servertype="ncsa" ;; -*************** -*** 1185,1191 **** - "7") servertype="netscape-commerce" ;; - "8") servertype="netscape-fasttrack" ;; - "9") servertype="netscape-enterprise" ;; -! *) echo "Invalid option! Please try again." ;; - esac - done - ---- 1245,1252 ---- - "7") servertype="netscape-commerce" ;; - "8") servertype="netscape-fasttrack" ;; - "9") servertype="netscape-enterprise" ;; -! *) servertypenum="" -! echo "Invalid option! Please try again." ;; - esac - done - -*************** -*** 1510,1515 **** ---- 1571,1578 ---- - read admin - done - -+ defservertypenum="3" -+ - until [ "$servertype" != "" ] - do - echo -*************** -*** 1522,1530 **** - echo " 7. netscape-commerce" - echo " 8. netscape-fasttrack" - echo " 9. netscape-enterprise" -! $echo "What type of Server is this: ${nnl}" - read servertypenum - echo - - case $servertypenum in - "1") servertype="ncsa" ;; ---- 1585,1597 ---- - echo " 7. netscape-commerce" - echo " 8. netscape-fasttrack" - echo " 9. netscape-enterprise" -! $echo "What type of Server is this: [$defservertypenum] ${nnl}" - read servertypenum - echo -+ if [ "$servertypenum" = "" ] -+ then -+ servertypenum=$defservertypenum -+ fi - - case $servertypenum in - "1") servertype="ncsa" ;; -*************** -*** 1539,1545 **** - "7") servertype="netscape-commerce" ;; - "8") servertype="netscape-fasttrack" ;; - "9") servertype="netscape-enterprise" ;; -! *) echo "Invalid option! Please try again." ;; - esac - done - ---- 1606,1613 ---- - "7") servertype="netscape-commerce" ;; - "8") servertype="netscape-fasttrack" ;; - "9") servertype="netscape-enterprise" ;; -! *) servertypenum="" -! echo "Invalid option! Please try again." ;; - esac - done - -*************** -*** 1825,1834 **** - *) getHttpDirective $configfile ResourceConfig $port - if [ "$param" != "" ] - then -! file=`basename $param` -! resconffile="${configfiledir}${file}" - else -! resconffile="${configfiledir}srm.conf" - fi - - if [ ! -f "$resconffile" ] ---- 1893,1911 ---- - *) getHttpDirective $configfile ResourceConfig $port - if [ "$param" != "" ] - then -! if [ "$param" != "/dev/null" ] -! then -! file=`basename $param` -! resconffile="${configfiledir}${file}" -! else -! configError -! fi - else -! resconffile="${configfiledir}conf/srm.conf" -! if [ ! -f "$resconffile" ] -! then -! configError2 -! fi - fi - - if [ ! -f "$resconffile" ] -*************** -*** 1964,1970 **** - then - getHttpRootDirective $configfile $directive - fi -- - } - - getnetscapedocroot() ---- 2041,2046 ---- -*************** -*** 2080,2089 **** - getHttpDirective $configfile ResourceConfig $port - if [ "$param" != "" ] - then -! file=`basename $param` -! resconffile="${configfiledir}${file}" - else -! resconffile="${configfiledir}srm.conf" - fi - echo "Getting DocumentRoot from $resconffile." - getparam DocumentRoot $resconffile ---- 2156,2174 ---- - getHttpDirective $configfile ResourceConfig $port - if [ "$param" != "" ] - then -! if [ "$param" != "/dev/null" ] -! then -! file=`basename $param` -! resconffile="${configfiledir}${file}" -! else -! configError -! fi - else -! resconffile="${configfiledir}conf/srm.conf" -! if [ ! -f $resconffile ] -! then -! configError2 -! fi - fi - echo "Getting DocumentRoot from $resconffile." - getparam DocumentRoot $resconffile -*************** -*** 2099,2108 **** - getHttpDirective $configfile ResourceConfig $port - if [ "$param" != "" ] - then -! file=`basename $param` -! resconffile="${configfiledir}${file}" - else -! resconffile="${configfiledir}srm.conf" - fi - echo "Getting UserDir from $resconffile." - getparam UserDir $resconffile ---- 2184,2202 ---- - getHttpDirective $configfile ResourceConfig $port - if [ "$param" != "" ] - then -! if [ "$param" != "/dev/null" ] -! then -! file=`basename $param` -! resconffile="${configfiledir}${file}" -! else -! configError -! fi - else -! resconffile="${configfiledir}conf/srm.conf" -! if [ ! -f "$resconffile" ] -! then -! configError2 -! fi - fi - echo "Getting UserDir from $resconffile." - getparam UserDir $resconffile -*************** -*** 2111,2116 **** ---- 2205,2244 ---- - ;; - esac - -+ } -+ -+ configError() -+ { -+ echo -+ echo "ERROR: ${configfile} invalid" -+ echo -+ echo "Change ${configfile} as follows:" -+ echo -+ echo " ResourceConfig ${configfile}" -+ echo " AccessConfig ${configfile}" -+ echo -+ $echo "hit enter to continue${nnl}" -+ read continue -+ echo "Ouch!!!!!!!!!!!!!" -+ echo -+ exit 1 -+ } -+ -+ configError2() -+ { -+ echo -+ echo "ERROR: ${configfile} invalid" -+ echo -+ echo "Change ${configfile} as follows:" -+ echo -+ echo " ResourceConfig ${configfiledir}srm.conf" -+ echo " AccessConfig ${configfiledir}access.conf" -+ echo -+ $echo "hit enter to continue${nnl}" -+ read continue -+ echo "Ouch!!!!!!!!!!!!!" -+ echo -+ exit 1 - } - - error() +--- frontpage/version3.0/fp_install.sh.orig Thu Mar 5 06:00:21 1998 ++++ frontpage/version3.0/fp_install.sh Fri Jan 22 22:58:40 1999 +@@ -50,7 +50,7 @@ + { + VERSION="3.0" + PATH=".:/bin:/usr/bin:/sbin:/usr/sbin:/usr/ucb:/etc:/usr/bsd" +- INSTALLDIRDEFAULT="/usr/local/frontpage" ++ INSTALLDIRDEFAULT="PREFIX/frontpage" + + case "`echo 'x\c'`" in + 'x\c') echo="echo -n" nnl= ;; #BSD +@@ -69,6 +69,9 @@ + IRIX*) machine="sgi" ;; + SunOS*5.*sun4*) machine="solaris" ;; + SunOS*4.*sun4*) machine="sunos";; ++ FreeBSD* | \ ++ NetBSD* | \ ++ OpenBSD* | \ + *BSD/OS?3.0*) machine="bsdi3" ;; + BSD/OS*) machine="bsdi" ;; + SCO_SV*) machine="sco5" ;; +@@ -325,7 +328,7 @@ + echo "link will be created from /usr/local/frontpage/ to the location that" + echo "is chosen." + echo +- $echo "FrontPage Extensions directory [/usr/local/frontpage/]: ${nnl}" ++ $echo "FrontPage Extensions directory [${INSTALLDIRDEFAULT}]: ${nnl}" + read installdir + + if [ "$installdir" = "" ] +@@ -412,7 +415,7 @@ + vtfile="fp30.$machine.tar" + echo "Platform is $machine." + +- vtfilelocation="`pwd`/" ++ vtfilelocation="/usr/ports/distfiles/" + + getextfilename $vtfilelocation $vtfile || return 1 + +@@ -651,10 +654,19 @@ + *pache*) getHttpDirective $configfile AccessConfig $port + if [ "$param" != "" ] + then +- file=`basename $param` +- accessconffile="${configfiledir}${file}" ++ if [ "$param" != "/dev/null" ] ++ then ++ file=`basename $param` ++ accessconffile="${configfiledir}${file}" ++ else ++ configError ++ fi + else +- accessconffile="${configfiledir}access.conf" ++ accessconffile="${configfiledir}conf/access.conf" ++ if [ ! -f "$accessconffile" ] ++ then ++ configError2 ++ fi + fi + + if [ ! -f "$accessconffile" ] +@@ -1101,18 +1113,29 @@ + + webname="/" + ++ defconfigfile="PREFIX/etc/apache/httpd.conf" ++ + configfile="" + while ( [ "$configfile" = "" ] || [ ! -f $configfile ] ) + do +- $echo "Server config filename: ${nnl}" ++ $echo "Server config filename: [$defconfigfile] ${nnl}" + read configfile +- done ++ if [ "$configfile" = "" ] ++ then ++ configfile=$defconfigfile ++ fi ++done + ++ defadmin="fpadmin" + admin="" + until [ "$admin" != "" ] + do +- $echo "FrontPage Administrator's user name: ${nnl}" ++ $echo "FrontPage Administrator's user name: [$defadmin] ${nnl}" + read admin ++ if [ "$admin" = "" ] ++ then ++ admin=$defadmin ++ fi + done + + getparam Port $configfile +@@ -1124,12 +1147,37 @@ + read port + done + +- getparam User $configfile +- webowner=$param +- + weconfigfile="${installdir}/we${port}.cnf" ++ getHttpDirective ${configfile} ResourceConfig ${port} ++ if [ "$param" = "/dev/null" ] ++ then ++ configError ++ fi ++ configfiledir=`dirname $configfile`"/" ++ if [ "$param" != "" ] ++ then ++ file=`basename $param` ++ resconffile="${configfiledir}${file}" ++ else ++ resconffile="${configfiledir}conf/srm.conf" ++ if [ ! -f "$resconffile" ] ++ then ++ configError2 ++ fi ++ fi + +- defwebowner=`$lsg ${docroot}${service} | $awk ' { print $3}'` ++ getparam DocumentRoot $resconffile ++ docroot=$param ++ ++ getparam User $configfile ++ defwebowner=$param ++ ++ if [ "$defwebowner" = "" ] ++ then ++ getparam DocumentRoot $resconffile ++ docroot=$param ++ defwebowner=`$lsg ${docroot}${service} | $awk ' { print $3}'` ++ fi + + webowner="" + until [ "$webowner" != "" ] +@@ -1144,6 +1192,12 @@ + + getparam Group $configfile + defgroup=$param ++ ++ if [ "$defgroup" = "" ] ++ then ++ defgroup=`$lsg ${docroot}${service} | $awk ' { print $4}'` ++ fi ++ + webgroup="" + until [ "$webgroup" != "" ] + do +@@ -1155,6 +1209,8 @@ + webgroup=$defgroup + fi + done ++ ++defservertypenum="3" + + until [ "$servertype" != "" ] + do +@@ -1168,9 +1224,13 @@ + echo " 7. netscape-commerce" + echo " 8. netscape-fasttrack" + echo " 9. netscape-enterprise" +- $echo "What type of Server is this: ${nnl}" ++ $echo "What type of Server is this: [$defservertypenum] ${nnl}" + read servertypenum + echo ++ if [ "$servertypenum" = "" ] ++ then ++ servertypenum=$defservertypenum ++ fi + + case $servertypenum in + "1") servertype="ncsa" ;; +@@ -1185,7 +1245,8 @@ + "7") servertype="netscape-commerce" ;; + "8") servertype="netscape-fasttrack" ;; + "9") servertype="netscape-enterprise" ;; +- *) echo "Invalid option! Please try again." ;; ++ *) servertypenum="" ++ echo "Invalid option! Please try again." ;; + esac + done + +@@ -1510,6 +1571,8 @@ + read admin + done + ++ defservertypenum="3" ++ + until [ "$servertype" != "" ] + do + echo +@@ -1522,9 +1585,13 @@ + echo " 7. netscape-commerce" + echo " 8. netscape-fasttrack" + echo " 9. netscape-enterprise" +- $echo "What type of Server is this: ${nnl}" ++ $echo "What type of Server is this: [$defservertypenum] ${nnl}" + read servertypenum + echo ++ if [ "$servertypenum" = "" ] ++ then ++ servertypenum=$defservertypenum ++ fi + + case $servertypenum in + "1") servertype="ncsa" ;; +@@ -1539,7 +1606,8 @@ + "7") servertype="netscape-commerce" ;; + "8") servertype="netscape-fasttrack" ;; + "9") servertype="netscape-enterprise" ;; +- *) echo "Invalid option! Please try again." ;; ++ *) servertypenum="" ++ echo "Invalid option! Please try again." ;; + esac + done + +@@ -1825,10 +1893,19 @@ + *) getHttpDirective $configfile ResourceConfig $port + if [ "$param" != "" ] + then +- file=`basename $param` +- resconffile="${configfiledir}${file}" ++ if [ "$param" != "/dev/null" ] ++ then ++ file=`basename $param` ++ resconffile="${configfiledir}${file}" ++ else ++ configError ++ fi + else +- resconffile="${configfiledir}srm.conf" ++ resconffile="${configfiledir}conf/srm.conf" ++ if [ ! -f "$resconffile" ] ++ then ++ configError2 ++ fi + fi + + if [ ! -f "$resconffile" ] +@@ -1964,7 +2041,6 @@ + then + getHttpRootDirective $configfile $directive + fi +- + } + + getnetscapedocroot() +@@ -2080,10 +2156,19 @@ + getHttpDirective $configfile ResourceConfig $port + if [ "$param" != "" ] + then +- file=`basename $param` +- resconffile="${configfiledir}${file}" ++ if [ "$param" != "/dev/null" ] ++ then ++ file=`basename $param` ++ resconffile="${configfiledir}${file}" ++ else ++ configError ++ fi + else +- resconffile="${configfiledir}srm.conf" ++ resconffile="${configfiledir}conf/srm.conf" ++ if [ ! -f $resconffile ] ++ then ++ configError2 ++ fi + fi + echo "Getting DocumentRoot from $resconffile." + getparam DocumentRoot $resconffile +@@ -2099,10 +2184,19 @@ + getHttpDirective $configfile ResourceConfig $port + if [ "$param" != "" ] + then +- file=`basename $param` +- resconffile="${configfiledir}${file}" ++ if [ "$param" != "/dev/null" ] ++ then ++ file=`basename $param` ++ resconffile="${configfiledir}${file}" ++ else ++ configError ++ fi + else +- resconffile="${configfiledir}srm.conf" ++ resconffile="${configfiledir}conf/srm.conf" ++ if [ ! -f "$resconffile" ] ++ then ++ configError2 ++ fi + fi + echo "Getting UserDir from $resconffile." + getparam UserDir $resconffile +@@ -2111,6 +2205,40 @@ + ;; + esac + ++} ++ ++configError() ++{ ++ echo ++ echo "ERROR: ${configfile} invalid" ++ echo ++ echo "Change ${configfile} as follows:" ++ echo ++ echo " ResourceConfig ${configfile}" ++ echo " AccessConfig ${configfile}" ++ echo ++ $echo "hit enter to continue${nnl}" ++ read continue ++ echo "Ouch!!!!!!!!!!!!!" ++ echo ++ exit 1 ++} ++ ++configError2() ++{ ++ echo ++ echo "ERROR: ${configfile} invalid" ++ echo ++ echo "Change ${configfile} as follows:" ++ echo ++ echo " ResourceConfig ${configfiledir}srm.conf" ++ echo " AccessConfig ${configfiledir}access.conf" ++ echo ++ $echo "hit enter to continue${nnl}" ++ read continue ++ echo "Ouch!!!!!!!!!!!!!" ++ echo ++ exit 1 + } + + error() |