It's double-feature time:

Upgrade to Apache 1.3.9 and mod_ssl 2.4.0

5 files changed, 54 insertions, 65 deletions

diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index 8ed7357b4d28..a5d6ebfd7c75 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for:	Apache + mod_ssl
-# Version required:	1.3.6 + 2.3.11
+# Version required:	1.3.9 + 2.4.0
 # Date created:		Sat Aug 22 12:00:00 CDT 1998
 # Whom:			rse@engelschall.com
 #
-# $Id: Makefile,v 1.41 1999/07/28 13:44:19 rse Exp $
+# $Id: Makefile,v 1.42 1999/08/19 14:23:10 rse Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -48,8 +48,8 @@ BUILD_DEPENDS=	openssl:${PORTSDIR}/security/openssl \
 		${PREFIX}/lib/libmm.a:${PORTSDIR}/devel/mm
 RUN_DEPENDS=	openssl:${PORTSDIR}/security/openssl
 
-VERSION_APACHE=	1.3.6
-VERSION_MODSSL=	2.3.11
+VERSION_APACHE=	1.3.9
+VERSION_MODSSL=	2.4.0
 
 Y2K=		http://www.modssl.org/docs/2.3/ssl_faq.html#y2k
 RESTRICTED=	"Contains cryptography"
diff --git a/www/apache13-modssl/distinfo b/www/apache13-modssl/distinfo
index 4f19027f81c7..8617fd940bbf 100644
--- a/www/apache13-modssl/distinfo
+++ b/www/apache13-modssl/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
-MD5 (mod_ssl-2.3.11-1.3.6.tar.gz) = f1c0c7aea63ab09391516999af11e65b
+MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32
+MD5 (mod_ssl-2.4.0-1.3.9.tar.gz) = 225c82d5d54a0e1c872bfcc7ffdfb0d8
diff --git a/www/apache13-modssl/files/patch-ad b/www/apache13-modssl/files/patch-ad
index c89aa3d323f7..5deadd438d9a 100644
--- a/www/apache13-modssl/files/patch-ad
+++ b/www/apache13-modssl/files/patch-ad
@@ -9,15 +9,6 @@
  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
diff --git a/www/apache13-modssl/files/patch-ae b/www/apache13-modssl/files/patch-ae
index 039d6320f415..74b2d8308bd9 100644
--- a/www/apache13-modssl/files/patch-ae
+++ b/www/apache13-modssl/files/patch-ae
@@ -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 Jun  4 17:54:19 1999
++++ src/support/log_server_status	Thu Aug 19 16:30:48 1999
+@@ -67,7 +67,7 @@
+ #
+ require 'sys/socket.ph';
+ 
+-$wherelog = "/var/log/graph/";  # Logs will be like "/var/log/graph/19960312"
++$wherelog = "/var/log/httpd-status-";
+ $server = "localhost";          # Name of server, could be "www.foo.com"
+ $port = "80";                   # Port on server
+ $request = "/status/?auto";     # Request to send
+@@ -93,14 +93,14 @@
+ ### Main
+ 
+ {
+-        $year=`date +%y`;
++        $year=`LC_TIME=C date +%y`;
+ 	chomp($year);
+ 	$year += ($year < 70) ? 2000 : 1900;
+-	$date = $year . `date +%m%d:%H%M%S`;
++	$date = $year . `LC_TIME=C date +%m%d:%H%M%S`;
+ 	chomp($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-modssl/pkg-plist b/www/apache13-modssl/pkg-plist
index 036d9802dfc3..f22f870863c9 100644
--- a/www/apache13-modssl/pkg-plist
+++ b/www/apache13-modssl/pkg-plist
@@ -46,6 +46,7 @@ include/apache/ap_config_auto.h
 include/apache/ap_ctype.h
 include/apache/ap_md5.h
 include/apache/ap_mmn.h
+include/apache/ap_sha1.h
 include/apache/buff.h
 include/apache/compat.h
 include/apache/conf.h
@@ -70,6 +71,18 @@ include/apache/util_date.h
 include/apache/util_md5.h
 include/apache/util_script.h
 include/apache/util_uri.h
+include/apache/xml/asciitab.h
+include/apache/xml/xmltok.h
+include/apache/xml/xmlrole.h
+include/apache/xml/xmlparse.h
+include/apache/xml/xmldef.h
+include/apache/xml/utf8tab.h
+include/apache/xml/nametab.h
+include/apache/xml/latin1tab.h
+include/apache/xml/iasciitab.h
+include/apache/xml/hashtable.h
+include/apache/xml/xmltok_impl.h
+libexec/apache/httpd.exp
 libexec/apache/libproxy.so
 libexec/apache/libssl.so
 libexec/apache/mod_define.so
@@ -102,6 +115,7 @@ libexec/apache/mod_status.so
 libexec/apache/mod_unique_id.so
 libexec/apache/mod_userdir.so
 libexec/apache/mod_usertrack.so
+libexec/apache/mod_vhost_alias.so
 share/apache/cgi-bin/printenv
 share/apache/cgi-bin/test-cgi
 share/apache/htdocs/apache_pb.gif
@@ -208,10 +222,13 @@ share/apache/htdocs/manual/mod/mod_status.html
 share/apache/htdocs/manual/mod/mod_unique_id.html
 share/apache/htdocs/manual/mod/mod_userdir.html
 share/apache/htdocs/manual/mod/mod_usertrack.html
+share/apache/htdocs/manual/mod/mod_auth_digest.html
+share/apache/htdocs/manual/mod/mod_vhost_alias.html
 share/apache/htdocs/manual/mod/mod_ssl/index.html
 share/apache/htdocs/manual/mod/mod_ssl/ssl_compat.gfont000.gif
 share/apache/htdocs/manual/mod/mod_ssl/ssl_compat.html
 share/apache/htdocs/manual/mod/mod_ssl/ssl_cover_logo.jpg
+share/apache/htdocs/manual/mod/mod_ssl/ssl_cover_title.gif
 share/apache/htdocs/manual/mod/mod_ssl/ssl_cover_title.jpg
 share/apache/htdocs/manual/mod/mod_ssl/ssl_faq.gfont000.gif
 share/apache/htdocs/manual/mod/mod_ssl/ssl_faq.html
@@ -253,6 +270,7 @@ share/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-preface.gif
 share/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-ref.gif
 share/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-toc.gif
 share/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-tutor.gif
+share/apache/htdocs/manual/mod/mod_ssl/ssl_template.inc
 share/apache/htdocs/manual/mod/mod_ssl/ssl_compat.wml
 share/apache/htdocs/manual/mod/mod_ssl/ssl_cover.wml
 share/apache/htdocs/manual/mod/mod_ssl/ssl_faq.wml
@@ -406,6 +424,7 @@ share/apache/icons/small/uu.gif
 @dirrm etc/apache/ssl.prm
 @dirrm etc/apache/ssl.key
 @dirrm etc/apache
+@dirrm include/apache/xml/
 @dirrm include/apache
 @dirrm libexec/apache
 @dirrm share/apache/cgi-bin