Import of a new SSL-aware Apache 1.3, achieved by patching up

the original Apache 1.3.1 with mod_ssl 2.0.5 (the Apache
Interface to SSLeay).

4 files changed, 183 insertions, 0 deletions

diff --git a/www/apache13-modssl/files/patch-aa b/www/apache13-modssl/files/patch-aa
new file mode 100644
index 000000000000..21ea6449f6ca
--- /dev/null
+++ b/www/apache13-modssl/files/patch-aa
@@ -0,0 +1,40 @@
+*** configure.bak	Sun Jul 12 13:25:46 1998
+--- configure	Thu Jul 23 16:52:04 1998
+***************
+*** 877,884 ****
+      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"
+--- 877,884 ----
+      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"
+***************
+*** 942,949 ****
+  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
+--- 942,949 ----
+  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
diff --git a/www/apache13-modssl/files/patch-ac b/www/apache13-modssl/files/patch-ac
new file mode 100644
index 000000000000..11aedaa76270
--- /dev/null
+++ b/www/apache13-modssl/files/patch-ac
@@ -0,0 +1,53 @@
+*** conf/httpd.conf-dist.orig	Thu May  7 01:12:39 1998
+--- conf/httpd.conf-dist	Fri Jun  5 19:34:17 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.
+***************
+*** 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.
+--- 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.
+***************
+*** 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
+--- 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
diff --git a/www/apache13-modssl/files/patch-ad b/www/apache13-modssl/files/patch-ad
new file mode 100644
index 000000000000..7cda58a4604b
--- /dev/null
+++ b/www/apache13-modssl/files/patch-ad
@@ -0,0 +1,40 @@
+*** 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
diff --git a/www/apache13-modssl/files/patch-ae b/www/apache13-modssl/files/patch-ae
new file mode 100644
index 000000000000..039d6320f415
--- /dev/null
+++ b/www/apache13-modssl/files/patch-ae
@@ -0,0 +1,50 @@
+*** 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;