diff options
Diffstat (limited to 'www/apache13-fp/files/patch-fa')
| -rw-r--r-- | www/apache13-fp/files/patch-fa | 165 |
1 files changed, 18 insertions, 147 deletions
diff --git a/www/apache13-fp/files/patch-fa b/www/apache13-fp/files/patch-fa index 352a2f74baf8..1dc8ca2ce217 100644 --- a/www/apache13-fp/files/patch-fa +++ b/www/apache13-fp/files/patch-fa @@ -1,35 +1,35 @@ ---- frontpage/version4.0/change_server.sh.orig Mon May 24 13:27:07 1999 -+++ frontpage/version4.0/change_server.sh Thu Feb 24 20:39:30 2000 -@@ -38,9 +38,11 @@ +--- frontpage/version4.0/change_server.sh.orig Tue May 2 15:41:43 2000 ++++ frontpage/version4.0/change_server.sh Thu Jul 6 21:45:52 2000 +@@ -38,9 +38,12 @@ { VERSION="4.0" PATH=".:/bin:/usr/bin:/sbin:/usr/sbin:/usr/ucb:/etc:/usr/bsd" - NEWHTTPDNEW="/usr/local/frontpage/version${VERSION}/apache-fp/httpd" - NEWHTTPDCOMPAT="/usr/local/frontpage/version${VERSION}/apache-fp/httpd.Compat" - DEFAULTHTTPD="/usr/local/apache/sbin/httpd" -+ NEWHTTPDNEW="PREFIX/sbin/httpd" ++ AP_TARGET=`PREFIX/sbin/apxs -q TARGET` ++ NEWHTTPDNEW="PREFIX/sbin/${AP_TARGET}" + NEWMODFPNEW="PREFIX/libexec/apache/mod_frontpage.so" + NEWHTTPDCOMPAT="${NEWHTTPDNEW}" + NEWMODFPCOMAPT="${NEWMODFPNEW}" -+ DEFAULTHTTPD="PREFIX/sbin/httpd" ++ DEFAULTHTTPD="PREFIX/sbin/${AP_TARGET}" case "`echo 'x\c'`" in 'x\c') echo="echo -n" nnl= ;; #BSD -@@ -60,6 +62,9 @@ - IRIX*) machine="sgi" ;; - SunOS*5.*sun4*) machine="solaris" ;; +@@ -62,7 +65,7 @@ SunOS*5.*i386*) machine="solarisx86" ;; -+ FreeBSD* | \ -+ NetBSD* | \ -+ OpenBSD* | \ BSD/OS*) machine="bsdi" ;; SCO_SV*) machine="sco5" ;; +- FreeBSD*) machine="freebsd" ;; ++ FreeBSD*) machine="bsdi" ;; UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;; -@@ -214,6 +219,20 @@ + *) echo "ERROR: Unsupported platform! Uname is $system." + return 1 +@@ -217,8 +220,22 @@ clear -+ if ($strings $httpdfile | $fgrep "etc/apache/httpd.conf" > /dev/null) ++ if ($strings $httpdfile | $fgrep "etc/apache/${AP_TARGET}.conf" > /dev/null) + then + NEWHTTPD=$NEWHTTPDNEW + NEWMODFP=$NEWMODFPNEW @@ -44,9 +44,12 @@ + sed -e 's%^.*FrontPage/\([0-9\.]*\).*%\1%' | tail -1` + else - if ($strings $httpdfile | $fgrep "etc/httpd.conf" > /dev/null) +- if ($strings $httpdfile | $fgrep "etc/httpd.conf" > /dev/null) ++ if ($strings $httpdfile | $fgrep "etc/${AP_TARGET}.conf" > /dev/null) then -@@ -232,7 +251,8 @@ + NEWHTTPD=$NEWHTTPDNEW + echo "Selected server uses NEW directory structure:" +@@ -235,7 +252,8 @@ sourceVersionNumber=`$NEWHTTPD -v | sed 's%^.*Apache/\([0-9\.]*\).*%\1%' | head -1` sourceFPVersionNumber=`$strings $NEWHTTPD | $fgrep "FrontPage/" 2> /dev/null | sed -e ' s%^.*FrontPage/\([0-9\.]*\).*%\1%' | tail -1` @@ -56,135 +59,3 @@ echo echo "Currently running Apache/${targetVersionNumber} FrontPage/${nnl}" if [ "${targetFPVersionNumber}" = "" ] -@@ -496,10 +516,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" ] -@@ -1061,10 +1090,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 -@@ -1081,10 +1119,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 -@@ -1108,10 +1155,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" ] -@@ -1253,6 +1309,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() |