Import of Apache with MS FrontPage Extensions.

PR:		4878
Submitted by:	Scot W. Hetzel <hetzels@westbend.net>, w/input from phk.

7 files changed, 1230 insertions, 0 deletions

diff --git a/www/apache13-fp/files/patch-aa b/www/apache13-fp/files/patch-aa
new file mode 100644
index 0000000..1ac59f8
--- /dev/null
+++ b/www/apache13-fp/files/patch-aa
@@ -0,0 +1,148 @@
+*** src/Configuration.orig	Sun Jul  6 06:20:07 1997
+--- src/Configuration	Tue Jul 15 01:18:42 1997
+***************
+*** 41,49 ****
+  # Settings here have priority; If not set, Configure will attempt to guess
+  # the C compiler, and set OPTIM to '-O2'
+  #
+! EXTRA_CFLAGS=
+  EXTRA_LFLAGS=
+! EXTRA_LIBS=
+  EXTRA_INCLUDES=
+  
+  #CC=
+--- 41,62 ----
+  # Settings here have priority; If not set, Configure will attempt to guess
+  # the C compiler, and set OPTIM to '-O2'
+  #
+! EXTRA_CFLAGS= \
+! -DHTTPD_ROOT=\"${PREFIX}/etc/apache/\" \
+! -DDOCUMENT_LOCATION=\"${PREFIX}/www/data/\" \
+! -DSERVER_CONFIG_FILE=\"httpd.conf\" \
+! -DRESOURCE_CONFIG_FILE=\"srm.conf\" \
+! -DTYPES_CONFIG_FILE=\"mime.types\" \
+! -DACCESS_CONFIG_FILE=\"access.conf\" \
+! -DDEFAULT_PATH=\"/bin:/usr/bin:${PREFIX}/bin\" \
+! -DSUEXEC_BIN=\"${PREFIX}/sbin/suexec\" \
+! -DDEFAULT_XFERLOG=\"/var/log/httpd-access.log\" \
+! -DDEFAULT_ERRORLOG=\"/var/log/httpd-error.log\" \
+! -DDEFAULT_PIDLOG=\"/var/run/httpd.pid\" \
+! -DDEFAULT_SCOREBOARD=\"/var/run/apache_runtime_status\" \
+! -DDEFAULT_LOCKFILE=\"/var/spool/lock/accept.lock\"
+  EXTRA_LFLAGS=
+! EXTRA_LIBS=-lmd
+  EXTRA_INCLUDES=
+  
+  #CC=
+***************
+*** 162,173 ****
+  ## STATUS=yes (see the Rules section near the start of this file) to allow
+  ## full status information.  Check conf/access.conf on how to enable this.
+  
+! # Module status_module       mod_status.o
+  
+  ## The Info module displays configuration information for the server and 
+  ## all included modules. It's very useful for debugging.
+  
+! # Module info_module         mod_info.o
+  
+  ## mod_include translates server-side include (SSI) statements in text files.
+  ## mod_dir handles requests on directories and directory indexes.
+--- 175,186 ----
+  ## STATUS=yes (see the Rules section near the start of this file) to allow
+  ## full status information.  Check conf/access.conf on how to enable this.
+  
+! Module status_module       mod_status.o
+  
+  ## The Info module displays configuration information for the server and 
+  ## all included modules. It's very useful for debugging.
+  
+! Module info_module         mod_info.o
+  
+  ## mod_include translates server-side include (SSI) statements in text files.
+  ## mod_dir handles requests on directories and directory indexes.
+***************
+*** 209,215 ****
+  ## mod_rewrite allows for powerful URI-to-URI and URI-to-filename mapping,
+  ## using regular expressions.
+  
+! # Module rewrite_module      mod_rewrite.o
+  
+  ##
+  ## Access control and authentication modules. 
+--- 222,228 ----
+  ## mod_rewrite allows for powerful URI-to-URI and URI-to-filename mapping,
+  ## using regular expressions.
+  
+! Module rewrite_module      mod_rewrite.o
+  
+  ##
+  ## Access control and authentication modules. 
+***************
+*** 227,233 ****
+  ## "gdbm" package if not and possibly adjust EXTRA_LIBS. (This may be
+  ## done by Configure at a later date)
+  
+! # Module db_auth_module      mod_auth_db.o
+  # Module dbm_auth_module     mod_auth_dbm.o
+  
+  ## msql_auth checks against an mSQL database.  You must have mSQL installed
+--- 240,246 ----
+  ## "gdbm" package if not and possibly adjust EXTRA_LIBS. (This may be
+  ## done by Configure at a later date)
+  
+! Module db_auth_module      mod_auth_db.o
+  # Module dbm_auth_module     mod_auth_dbm.o
+  
+  ## msql_auth checks against an mSQL database.  You must have mSQL installed
+***************
+*** 244,267 ****
+  ## "digest" implements HTTP Digest Authentication rather than the less 
+  ## secure Basic Auth used by the other modules.
+  
+! # Module digest_module       mod_digest.o
+  
+  ## Optional response header manipulation modules. 
+  ##
+  ## cern_meta mimics the behavior of the CERN web server with regards to 
+  ## metainformation files.  
+  
+! # Module cern_meta_module    mod_cern_meta.o
+  
+  ## The expires module can apply Expires: headers to resources,
+  ## as a function of access time or modification time.
+  
+! # Module expires_module      mod_expires.o
+  
+  ## The headers module can set arbitrary HTTP response headers,
+  ## as configured in server, vhost, access.conf or .htaccess configs
+  
+! # Module headers_module      mod_headers.o
+  
+  ## Miscellaneous modules
+  ##
+--- 257,280 ----
+  ## "digest" implements HTTP Digest Authentication rather than the less 
+  ## secure Basic Auth used by the other modules.
+  
+! Module digest_module       mod_digest.o
+  
+  ## Optional response header manipulation modules. 
+  ##
+  ## cern_meta mimics the behavior of the CERN web server with regards to 
+  ## metainformation files.  
+  
+! Module cern_meta_module    mod_cern_meta.o
+  
+  ## The expires module can apply Expires: headers to resources,
+  ## as a function of access time or modification time.
+  
+! Module expires_module      mod_expires.o
+  
+  ## The headers module can set arbitrary HTTP response headers,
+  ## as configured in server, vhost, access.conf or .htaccess configs
+  
+! Module headers_module      mod_headers.o
+  
+  ## Miscellaneous modules
+  ##
diff --git a/www/apache13-fp/files/patch-ab b/www/apache13-fp/files/patch-ab
new file mode 100644
index 0000000..2fadd01
--- /dev/null
+++ b/www/apache13-fp/files/patch-ab
@@ -0,0 +1,55 @@
+*** conf/access.conf-dist.orig	Mon Mar 31 18:52:33 1997
+--- conf/access.conf-dist	Sat Oct 25 14:15:32 1997
+***************
+*** 12,18 ****
+  
+  # This should be changed to whatever you set DocumentRoot to.
+  
+! <Directory /usr/local/etc/httpd/htdocs>
+  
+  # This may also be "None", "All", or any combination of "Indexes",
+  # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
+--- 12,18 ----
+  
+  # This should be changed to whatever you set DocumentRoot to.
+  
+! <Directory /usr/local/www/data>
+  
+  # This may also be "None", "All", or any combination of "Indexes",
+  # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
+***************
+*** 26,32 ****
+  # override. Can also be "All", or any combination of "Options", "FileInfo", 
+  # "AuthConfig", and "Limit"
+  
+! AllowOverride None
+  
+  # Controls who can get stuff from this server.
+  
+--- 26,32 ----
+  # override. Can also be "All", or any combination of "Options", "FileInfo", 
+  # "AuthConfig", and "Limit"
+  
+! AllowOverride All
+  
+  # Controls who can get stuff from this server.
+  
+***************
+*** 38,45 ****
+  # /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
+  # CGI directory exists, if you have that configured.
+  
+! <Directory /usr/local/etc/httpd/cgi-bin>
+! AllowOverride None
+  Options None
+  </Directory>
+  
+--- 38,45 ----
+  # /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
+  # CGI directory exists, if you have that configured.
+  
+! <Directory /usr/local/www/cgi-bin>
+! AllowOverride All
+  Options None
+  </Directory>
+  
diff --git a/www/apache13-fp/files/patch-fa b/www/apache13-fp/files/patch-fa
new file mode 100644
index 0000000..dca1cb1
--- /dev/null
+++ b/www/apache13-fp/files/patch-fa
@@ -0,0 +1,205 @@
+*** 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()
diff --git a/www/apache13-fp/files/patch-fb b/www/apache13-fp/files/patch-fb
new file mode 100644
index 0000000..53eff07
--- /dev/null
+++ b/www/apache13-fp/files/patch-fb
@@ -0,0 +1,437 @@
+*** 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()
diff --git a/www/apache13-fp/files/patch-fd b/www/apache13-fp/files/patch-fd
new file mode 100644
index 0000000..89b5009
--- /dev/null
+++ b/www/apache13-fp/files/patch-fd
@@ -0,0 +1,96 @@
+*** support/suexec.h.orig	Sat May 10 00:06:17 1997
+--- support/suexec.h	Thu Apr 23 15:57:52 1998
+***************
+*** 50,55 ****
+--- 50,62 ----
+   *
+   */
+  
++ /* "FPEXE modification made on Nov 2nd 1997 by Mark Wormgoor (riddles@ipe.nl)
++  *
++  * Changes were made in order to use Suexec and Frontpage 98 at the same time.
++  * Instead of trying to run suid on /usr/local/frontpage/currentversion/bin/fpexe, 
++  * we execute this so the suid-bit does all the work
++  */
++ 
+  /*
+   * suexec.h -- user-definable variables for the suexec wrapper code.
+   */
+***************
+*** 114,129 ****
+   *             debugging purposes.
+   */
+  #ifndef LOG_EXEC
+! #define LOG_EXEC "/usr/local/etc/httpd/logs/cgi.log" /* Need me? */
+  #endif
+  
+  /*
+   * DOC_ROOT -- Define as the DocumentRoot set for Apache.  This
+   *             will be the only hierarchy (aside from UserDirs)
+   *             that can be used for suEXEC behavior.
+   */
+  #ifndef DOC_ROOT
+! #define DOC_ROOT "/usr/local/etc/httpd/htdocs"
+  #endif
+  
+  /*
+--- 121,162 ----
+   *             debugging purposes.
+   */
+  #ifndef LOG_EXEC
+! #define LOG_EXEC "/var/log/httpd-cgi.log" /* Need me? */
+  #endif
+  
+  /*
+   * DOC_ROOT -- Define as the DocumentRoot set for Apache.  This
+   *             will be the only hierarchy (aside from UserDirs)
+   *             that can be used for suEXEC behavior.
++  *             This is not used, since we have VirtualHosts defined.
+   */
+  #ifndef DOC_ROOT
+! #define DOC_ROOT "/usr/local/www"
+! #endif
+! 
+! /*
+!  * FPEXE
+!  * FRONTPAGE_EXE -- We are running frontpage and we don't need to run
+!  *                  fpexe suid, since it's already set suid.  Also, the
+!  *                  dir-rights are incorrect and so on...
+!  */
+! #ifndef FPEXE
+! #define FPEXE "fpexe"
+! #endif
+! 
+! #ifndef FRONTPAGE_EXE
+! #define FRONTPAGE_EXE "/usr/local/frontpage/version3.0/apache-fp/_vti_bin/fpexe"
+! #endif
+!                     
+! /*
+!  * SYSTEM_CGI -- Define as the cgi directory for system-wide CGI's
+!  *               Note that UID/GID of the cgi or the directory are
+!  *		 NOT matched if they're in this directory, although
+!  *		 all the other checks still apply. Caveat Emptor.
+!  */
+! 
+! #ifndef SYSTEM_CGI
+! #define SYSTEM_CGI "/usr/local/www/cgi-bin"
+  #endif
+  
+  /*
+***************
+*** 131,137 ****
+   *
+   */
+  #ifndef SAFE_PATH
+! #define SAFE_PATH "/usr/local/bin:/usr/bin:/bin"
+  #endif
+  
+  #endif  /* _SUEXEC_H */
+--- 164,170 ----
+   *
+   */
+  #ifndef SAFE_PATH
+! #define SAFE_PATH "/usr/local/bin:/usr/bin:/bin:."
+  #endif
+  
+  #endif  /* _SUEXEC_H */
diff --git a/www/apache13-fp/files/patch-fe b/www/apache13-fp/files/patch-fe
new file mode 100644
index 0000000..f2877b3
--- /dev/null
+++ b/www/apache13-fp/files/patch-fe
@@ -0,0 +1,247 @@
+*** support/suexec.c.orig	Fri Jan 30 08:45:44 1998
+--- support/suexec.c	Fri Apr 24 17:32:21 1998
+***************
+*** 66,71 ****
+--- 66,94 ----
+   *
+   */
+  
++ /*
++  * "System" CGI modification 97.05.10 by Rick Franchuk (rickf@netnation.com)
++  *
++  * I found that while it's great to make scripts run under the UID and GID
++  * specified in httpd.conf or what /etc/passwd says is 'cool', suEXEC can
++  * really put a damper on 'System' cgi's, forcing copies of the scripts
++  * to be installed into users' home directories. That didn't seem very
++  * fitting... so I changed it so that the target UID check is disabled in
++  * a system directory #defined in suexec+.h. I hope you all find it useful.
++  *
++  * The docroot check had to be bypassed to allow functionality for VirtualHost
++  * entries. I'm somewhat suprised noone encountered that behavior before.
++  */
++ 
++ /* "FPEXE modification made on 98.04.24 by Scot Hetzel (hetzels@westbend.net)
++  * based on previous FPEXE modifications supplied by Mark Wormgoor
++  * (riddles@ipe.nl)
++  *
++  * Changes were made in order to use Suexec and Frontpage 98 at the same time.
++  * After we change to the target_uid and target_gid.  We check if cmd = FPEXE,
++  * if it does then we execute the cmd without performing any further tests.
++  *
++  */
+  
+  #include "suexec.h"
+  
+***************
+*** 75,81 ****
+  #include <sys/types.h>
+  #include <stdio.h>
+  #include <stdarg.h>
+! #include <string.h>
+  #include <pwd.h>
+  #include <grp.h>
+  #include <time.h>
+--- 98,104 ----
+  #include <sys/types.h>
+  #include <stdio.h>
+  #include <stdarg.h>
+! #include <strings.h>
+  #include <pwd.h>
+  #include <grp.h>
+  #include <time.h>
+***************
+*** 138,144 ****
+  
+  static void err_output(const char *fmt, va_list ap)
+  {
+- #ifdef LOG_EXEC
+      time_t timevar;
+      struct tm *lt;
+  
+--- 161,166 ----
+***************
+*** 158,164 ****
+      vfprintf(log, fmt, ap);
+  
+      fflush(log);
+- #endif /* LOG_EXEC */
+      return;
+  }
+  
+--- 180,185 ----
+***************
+*** 264,270 ****
+  	log_err("user mismatch (%s)\n", pw->pw_name);
+  	exit(103);
+      }
+!     
+      /*
+       * Check for a leading '/' (absolute path) in the command to be executed,
+       * or attempts to back up out of the current directory,
+--- 285,291 ----
+  	log_err("user mismatch (%s)\n", pw->pw_name);
+  	exit(103);
+      }
+! 
+      /*
+       * Check for a leading '/' (absolute path) in the command to be executed,
+       * or attempts to back up out of the current directory,
+***************
+*** 301,306 ****
+--- 322,328 ----
+      /*
+       * Error out if the target group name is invalid.
+       */
++ 
+      if (strspn(target_gname, "1234567890") != strlen(target_gname)) {
+  	if ((gr = getgrnam(target_gname)) == NULL) {
+  	    log_err("invalid target group name: (%s)\n", target_gname);
+***************
+*** 325,331 ****
+       * Log the transaction here to be sure we have an open log 
+       * before we setuid().
+       */
+!     log_err("uid: (%s/%s) gid: (%s/%s) %s\n",
+               target_uname, actual_uname,
+               target_gname, actual_gname,
+               cmd);
+--- 347,353 ----
+       * Log the transaction here to be sure we have an open log 
+       * before we setuid().
+       */
+!     log_err("uid: (%s/%s) gid: (%s/%s) cmd: %s\n",
+               target_uname, actual_uname,
+               target_gname, actual_gname,
+               cmd);
+***************
+*** 357,363 ****
+       * and setgid() to the target group. If unsuccessful, error out.
+       */
+      if (((setgid(gid)) != 0) || (initgroups(actual_uname,gid) != 0)) {
+!         log_err("failed to setgid (%ld: %s)\n", gid, cmd);
+          exit(109);
+      }
+  
+--- 379,385 ----
+       * and setgid() to the target group. If unsuccessful, error out.
+       */
+      if (((setgid(gid)) != 0) || (initgroups(actual_uname,gid) != 0)) {
+!         log_err("failed to setgid (%ld: %s/%s)\n", gid, cwd, cmd);
+          exit(109);
+      }
+  
+***************
+*** 365,375 ****
+       * setuid() to the target user.  Error out on fail.
+       */
+      if ((setuid(uid)) != 0) {
+! 	log_err("failed to setuid (%ld: %s)\n", uid, cmd);
+  	exit(110);
+      }
+  
+      /*
+       * Get the current working directory, as well as the proper
+       * document root (dependant upon whether or not it is a
+       * ~userdir request).  Error out if we cannot get either one,
+--- 387,405 ----
+       * setuid() to the target user.  Error out on fail.
+       */
+      if ((setuid(uid)) != 0) {
+! 	log_err("failed to setuid (%ld: %s/%s)\n", uid, cwd, cmd);
+  	exit(110);
+      }
+  
+      /*
++      * We logged everything, changed to the target uid/gid, and know the
++      * user is ok.  We run fpexe now and bail out before anything goes wrong.
++      */
++ #ifdef FPEXE
++     if ((strcmp(cmd, FPEXE)) != NULL) {
++ #endif
++ 
++     /*
+       * Get the current working directory, as well as the proper
+       * document root (dependant upon whether or not it is a
+       * ~userdir request).  Error out if we cannot get either one,
+***************
+*** 402,411 ****
+--- 432,446 ----
+          }
+      }
+  
++     /*
++      * This section must be commented out to work properly with
++      * VirtualHosts running CGI in thier own directories.
++      *
+      if ((strncmp(cwd, dwd, strlen(dwd))) != 0) {
+          log_err("command not in docroot (%s/%s)\n", cwd, cmd);
+          exit(114);
+      }
++      */
+  
+      /*
+       * Stat the cwd and verify it is a directory, or error out.
+***************
+*** 451,470 ****
+       * Error out if the target name/group is different from
+       * the name/group of the cwd or the program.
+       */
+!     if ((uid != dir_info.st_uid) ||
+! 	(gid != dir_info.st_gid) ||
+! 	(uid != prg_info.st_uid) ||
+! 	(gid != prg_info.st_gid))
+!     {
+! 	log_err("target uid/gid (%ld/%ld) mismatch with directory (%ld/%ld) or program (%ld/%ld)\n",
+! 		 uid, gid,
+! 		 dir_info.st_uid, dir_info.st_gid,
+! 		 prg_info.st_uid, prg_info.st_gid);
+! 	exit(120);
+      }
+  
+      clean_env();
+  
+      /* 
+       * Be sure to close the log file so the CGI can't
+       * mess with it.  If the exec fails, it will be reopened 
+--- 486,516 ----
+       * Error out if the target name/group is different from
+       * the name/group of the cwd or the program.
+       */
+! 
+! #ifdef SYSTEM_CGI
+!     if (strncmp(cwd, SYSTEM_CGI, strlen(SYSTEM_CGI))) {
+! #endif
+! 	if ((uid != dir_info.st_uid) ||
+! 	    (gid != dir_info.st_gid) ||
+! 	    (uid != prg_info.st_uid) ||
+! 	    (gid != prg_info.st_gid))
+! 	{
+! 	    log_err("target uid/gid (%ld/%ld) mismatch with directory %s(%ld/%ld) or program %s(%ld/%ld)\n",
+! 		uid, gid,
+! 		cwd, dir_info.st_uid, dir_info.st_gid,
+! 		cmd, prg_info.st_uid, prg_info.st_gid);
+! 	    exit(120);
+! 	}
+! #ifdef SYSTEM_CGI
+      }
++ #endif
+  
+      clean_env();
+  
++ #ifdef FPEXE
++     }
++ #endif
++ 
+      /* 
+       * Be sure to close the log file so the CGI can't
+       * mess with it.  If the exec fails, it will be reopened 
+***************
+*** 486,491 ****
+--- 532,538 ----
+       *
+       * Oh well, log the failure and error out.
+       */
++ 
+      log_err("exec failed (%s)\n", cmd);
+      exit(255);
+  }
diff --git a/www/apache13-fp/files/patch-ff b/www/apache13-fp/files/patch-ff
new file mode 100644
index 0000000..da0f609
--- /dev/null
+++ b/www/apache13-fp/files/patch-ff
@@ -0,0 +1,42 @@
+*** support/Makefile.tmpl.orig	Mon Mar 10 03:31:34 1997
+--- support/Makefile.tmpl	Thu Apr 23 13:20:33 1998
+***************
+*** 8,18 ****
+--- 8,32 ----
+  INCLUDES=-I../src -I../src/regex $(INCLUDES1) $(EXTRA_INCLUDES)
+  LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
+  
++ PREFIX?=/usr/local
++ USER_CGI_BIN?=public_html
++ HTTPD_USER?=www
++ FP_EXE=${PREFIX}/frontpage/version3.0/apache-fp/_vti_bin/fpexe
++ SYS_CGI_BIN=${PREFIX}/www/cgi-bin
++ SU_FLAGS=-DHTTPD_USER=\"${HTTPD_USER}\"
++ SU_FLAGS+=-DSYSTEM_CGI=\"${SYS_CGI_BIN}\"
++ SU_FLAGS+=-DFRONTPAGE_EXE=\"${FP_EXE}\"
++ SU_FLAGS+=-DUSERDIR_SUFFIX=\"${USER_CGI_BIN}\"
++ 
+  .c.o: 
+  	$(CC) -c $(CFLAGS) $(INCLUDES) $<
+  
+  TARGETS=htpasswd htdigest httpd_monitor rotatelogs logresolve
+  
++ .if defined(SUEXEC)
++ TARGETS+=suexec
++ .endif
++ 
+  all: $(TARGETS)
+  
+  htpasswd: htpasswd.c
+***************
+*** 29,34 ****
+--- 43,51 ----
+  
+  logresolve: logresolve.c
+  	$(CC) $(INCLUDES) $(CFLAGS) logresolve.c -o logresolve $(LIBS)
++ 
++ suexec: suexec.c
++ 	$(CC) $(INCLUDES) $(CFLAGS) ${SU_FLAGS} suexec.c -o suexec
+  
+  clean:
+  	rm -f $(TARGETS)