- Upgraded to Apache 1.3.6 + mod_ssl 2.2.6

- Cleaned up the port

3 files changed, 68 insertions, 133 deletions

diff --git a/www/apache13-modssl/files/patch-aa b/www/apache13-modssl/files/patch-aa
deleted file mode 100644
index 6bb44ee30a0a..000000000000
--- a/www/apache13-modssl/files/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-*** configure.orig	Tue Jan 12 13:23:40 1999
---- configure	Tue Jan 12 13:33:38 1999
-***************
-*** 1024,1031 ****
-      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 "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
-      echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
-      echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
---- 1024,1031 ----
-      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}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"
-***************
-*** 1106,1113 ****
-  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 '-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
---- 1106,1113 ----
-  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}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-modssl/files/patch-ac b/www/apache13-modssl/files/patch-ac
index f631045f2106..77ead0f0b54a 100644
--- a/www/apache13-modssl/files/patch-ac
+++ b/www/apache13-modssl/files/patch-ac
@@ -1,53 +1,40 @@
-*** conf/httpd.conf-dist.orig	Tue Jan 12 13:51:58 1999
---- conf/httpd.conf-dist	Tue Jan 12 13:52:37 1999
-***************
-*** 252,258 ****
-  #  don't use Group #-1 on these systems!
-  #
-  User nobody
-! Group #-1
-  
-  #
-  # ServerAdmin: Your address, where problems with the server should be
---- 252,258 ----
-  #  don't use Group #-1 on these systems!
-  #
-  User nobody
-! Group nobody
-  
-  #
-  # ServerAdmin: Your address, where problems with the server should be
-***************
-*** 470,476 ****
-  # define per-<VirtualHost> access logfiles, transactions will be
-  # logged therein and *not* in this file.
-  #
-! CustomLog logs/access_log common
-  
-  #
-  # If you would like to have agent and referer logfiles, uncomment the
---- 470,476 ----
-  # define per-<VirtualHost> access logfiles, transactions will be
-  # logged therein and *not* in this file.
-  #
-! #CustomLog logs/access_log common
-  
-  #
-  # If you would like to have agent and referer logfiles, uncomment the
-***************
-*** 483,489 ****
-  # 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
-  
-  #
-  # Optionally add a line containing the server version and virtual host
---- 483,489 ----
-  # 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
-  
-  #
-  # Optionally add a line containing the server version and virtual host
+--- conf/httpd.conf-dist.orig	Wed Mar 24 10:30:16 1999
++++ conf/httpd.conf-dist	Wed Mar 24 10:33:06 1999
+@@ -94,8 +94,8 @@
+ # these files altogether by using "/dev/null" (for Unix) or
+ # "nul" (for Win32) for the arguments to the directives.
+ #
+-#ResourceConfig conf/srm.conf
+-#AccessConfig conf/access.conf
++ResourceConfig /dev/null
++AccessConfig   /dev/null
+ 
+ #
+ # Timeout: The number of seconds before receives and sends time out.
+@@ -251,7 +251,7 @@
+ #  don't use Group #-1 on these systems!
+ #
+ User nobody
+-Group #-1
++Group nobody
+ 
+ #
+ # ServerAdmin: Your address, where problems with the server should be
+@@ -469,7 +469,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
+@@ -482,7 +482,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-modssl/files/patch-ad b/www/apache13-modssl/files/patch-ad
index 7cda58a4604b..c89aa3d323f7 100644
--- a/www/apache13-modssl/files/patch-ad
+++ b/www/apache13-modssl/files/patch-ad
@@ -1,40 +1,28 @@
-*** 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	Wed Mar 24 10:11:39 1999
++++ src/support/apachectl	Wed Mar 24 10:19:09 1999
+@@ -39,6 +39,8 @@
+ # --------------------                              --------------------
+ # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
+ 
++eval `limits -e -C daemon` >/dev/null 2>&1
++
+ ERROR=0
+ ARGV="$@"
+ if [ "x$ARGV" = "x" ] ; then 
+@@ -50,7 +52,7 @@
+     # check for pidfile
+     if [ -f $PIDFILE ] ; then
+ 	PID=`cat $PIDFILE`
+-	if [ ! "x$PID" = "x" ] && kill -0 $PID; then
++	if [ ! "x$PID" = "x" ] && kill -0 $PID >/dev/null 2>&1; then
+ 	    STATUS="httpd (pid $PID) running"
+ 	    RUNNING=1
+ 	else
+@@ -94,6 +96,7 @@
+ 	fi
+ 	if kill $PID ; then
+ 	    echo "$0 $ARG: httpd stopped"
++	    rm -f $PIDFILE
+ 	else
+ 	    echo "$0 $ARG: httpd could not be stopped"
+ 	    ERROR=4