5 files changed, 15 insertions, 61 deletions

diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index 057eacbeba35..252226565db0 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -11,7 +11,7 @@ PORTNAME=	apache+ssl
 PORTVERSION=	${APACHE_VERSION}.${APACHE_SSL_VERSION}
 PORTREVISION=	1
 CATEGORIES=	www security
-MASTER_SITES=	http://www.apache.org/dist/ \
+MASTER_SITES=	http://www.apache.org/dist/httpd/ \
 		ftp://ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/ \
 		ftp://src.doc.ic.ac.uk/packages/apache/dist/ \
 		ftp://ftp.gbnet.net/pub/apache/dist/ \
@@ -40,11 +40,8 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@freebsd.org
 
-FORBIDDEN=	"Vulnerable to denial-of-service.  See" \
-		"http://httpd.apache.org/info/security_bulletin_20020617.txt"
-
-APACHE_VERSION=		1.3.12
-APACHE_SSL_VERSION=	1.40
+APACHE_VERSION=		1.3.26
+APACHE_SSL_VERSION=	1.48
 
 USE_OPENSSL=	YES
 USE_PERL5=	YES
diff --git a/www/apache13-ssl/distinfo b/www/apache13-ssl/distinfo
index 8146887acd6e..2e32eeec93c0 100644
--- a/www/apache13-ssl/distinfo
+++ b/www/apache13-ssl/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2
-MD5 (apache_1.3.12+ssl_1.40.tar.gz) = de6d24d2f590984ad08f0a87969253be
+MD5 (apache_1.3.26.tar.gz) = 52e9b875597a208fca9d393e710087b6
+MD5 (apache_1.3.26+ssl_1.48.tar.gz) = c0b9574b15dd4668cfc4f27b009ae1dd
diff --git a/www/apache13-ssl/files/patch-ar b/www/apache13-ssl/files/patch-ar
index d1f2bdc79cc9..db93d4cec5d8 100644
--- a/www/apache13-ssl/files/patch-ar
+++ b/www/apache13-ssl/files/patch-ar
@@ -1,11 +1,15 @@
---- SSLpatch.orig	Thu Sep  9 14:40:45 1999
-+++ SSLpatch	Sun Sep 26 20:21:09 1999
-@@ -95,7 +95,7 @@
+--- SSLpatch.orig	Thu Jun 20 13:00:27 2002
++++ SSLpatch	Sun Sep 15 14:18:42 2002
+@@ -60,9 +60,9 @@
+ +SSL_BASE=/usr/local/ssl
  +SSL_INCLUDE= -I$(SSL_BASE)/include
  +SSL_CFLAGS= -DAPACHE_SSL
- +SSL_LIB_DIR= $(SSL_BASE)
+-+SSL_LIB_DIR=/usr/local/ssl/lib
 -+SSL_LIBS= -L$(SSL_LIB_DIR) -lssl -lcrypto
+-+SSL_APP_DIR=/usr/local/ssl/bin
+++SSL_LIB_DIR=$(SSL_BASE)
 ++SSL_LIBS= -L$(SSL_LIB_DIR) -lssl -lcrypto $(EXTRA_SSL_LIBS)
- +SSL_APP_DIR= $(SSL_BASE)/apps
- +SSL_APP=/usr/home/ben/work/openssl/apps/openssl
+++SSL_APP_DIR=$(SSL_BASE)/apps
+ +SSL_APP=/usr/local/ssl/bin/openssl
  +
+  ################################################################
diff --git a/www/apache13-ssl/files/patch-at b/www/apache13-ssl/files/patch-at
deleted file mode 100644
index f7aff8452ba3..000000000000
--- a/www/apache13-ssl/files/patch-at
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/Configure.orig	Sun Feb  6 10:27:19 2000
-+++ src/Configure	Thu Apr 27 23:55:17 2000
-@@ -467,7 +467,7 @@
-     	PLATOSVERS=`echo $PLAT | sed 's/^.*freebsd//'`
- 	OS="FreeBSD $PLATOSVERS"
- 	case "$PLATOSVERS" in
--	    [234]*)
-+	    [2-9]*)
- 		DEF_WANTHSREGEX=no
- 		CFLAGS="$CFLAGS -funsigned-char"
- 		;;
-@@ -1043,7 +1043,7 @@
- 	    LDFLAGS_SHLIB_EXPORT=""
- 	    SHLIB_SUFFIX_DEPTH=2
- 	    ;;
--	*-freebsd3*|*-freebsd4*)
-+	*-freebsd[3-9]*)
- 		LD_SHLIB="gcc"
- 	    CFLAGS_SHLIB="-fpic"
- 	    LDFLAGS_SHLIB="-shared"
diff --git a/www/apache13-ssl/files/patch-src::modules::ssl::apache_ssl.c b/www/apache13-ssl/files/patch-src::modules::ssl::apache_ssl.c
deleted file mode 100644
index 6ed9f3ad0dd9..000000000000
--- a/www/apache13-ssl/files/patch-src::modules::ssl::apache_ssl.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/modules/ssl/apache_ssl.c	Wed Dec  5 08:24:16 2001
-+++ src/modules/ssl/apache_ssl.c	Mon Mar  4 04:17:11 2002
-@@ -1254,7 +1254,6 @@
- static void SendSessionToServer(SSL_SESSION *pSession,
- 				conn_rec *pCurrentConnection)
-     {
--    uchar buf[MAX_SESSION_DER];
-     Cache *p;
-     uchar *t;
-     int nLength;
-@@ -1273,13 +1272,13 @@
-     memcpy(t,pSession->session_id,pSession->session_id_length);
-     p=LocalCacheAdd(t,pSession->session_id_length,tExpiresAt);
- 
--    t=buf;
--    nLength=i2d_SSL_SESSION(pSession,&t);
-+    nLength=i2d_SSL_SESSION(pSession,NULL);
-     assert(nLength > 0);
-     assert(nLength <= MAX_SESSION_DER);
- 
-     p->aucData=malloc(nLength);
--    memcpy(p->aucData,buf,nLength);
-+    t=p->aucData;
-+    nLength=i2d_SSL_SESSION(pSession,&t);
-     p->nData=nLength;
- 
-     GlobalCacheAdd(p->aucKey,p->nKey,p->aucData,p->nData,tExpiresAt);