Upgrade to Apache 1.3.3 + mod_ssl 2.0.15

3 files changed, 21 insertions, 13 deletions

diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index 1edccb972962..42808e076ee8 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.2 + 2.0.12
+# Version required:	1.3.3 + 2.0.15
 # Date created:		Sat Aug 22 12:00:00 CDT 1998
 # Whom:			rse@engelschall.com
 #
-# $Id: Makefile,v 1.7 1998/09/23 12:20:00 rse Exp $
+# $Id: Makefile,v 1.8 1998/10/02 10:11:11 rse Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -12,8 +12,15 @@ CATEGORIES=	www security
 MASTER_SITES=	ftp://www.apache.org/apache/dist/ \
 		http://www.engelschall.com/sw/mod_ssl/distrib/ \
 		ftp://ftp.engelschall.com/sw/mod_ssl/ \
+		ftp://ftp.nvg.ntnu.no/pub/unix/mod_ssl/ \
 		ftp://ftp.ulpgc.es/pub/mod_ssl/ \
-		ftp://glock.missouri.edu/pub/mod_ssl/
+		ftp://glock.missouri.edu/pub/mod_ssl/ \
+		ftp://ftp.infoscience.co.jp/pub/Crypto/SSL/mod_ssl/ \
+		ftp://ftp.uni-trier.de/pub/unix/security/mod_ssl/ \
+		ftp://ftp.blatzheim.com/pub/mod_ssl/ \
+		ftp://ftp.fu-berlin.de/unix/security/mod_ssl/ \
+		ftp://ftp.ntrl.net/pub/mirror/ralfsw/mod_ssl/
+
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}
 
@@ -24,8 +31,8 @@ BUILD_DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay \
 		${PREFIX}/lib/libcrypto.a:${PORTSDIR}/security/SSLeay
 RUN_DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
 
-VERSION_APACHE=	1.3.2
-VERSION_MODSSL=	2.0.12
+VERSION_APACHE=	1.3.3
+VERSION_MODSSL=	2.0.15
 
 RESTRICTED=	"Contains cryptography"
 
@@ -40,6 +47,8 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/apache \
 		--without-confadjust \
 		--enable-shared=remain \
 		--enable-module=most \
+		--enable-module=auth_db \
+		--disable-module=auth_dbm \
 		--enable-module=ssl
 
 OPTIM=\
@@ -48,9 +57,8 @@ OPTIM=\
 -DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
 
 .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
-CONFIGURE_ARGS+= --disable-rule=STATUS
-OPTIM+= -DBUFFERED_LOGS
-CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations
+OPTIM+= -DBUFFERED_LOGS -DFD_SETSIZE=1024
+CFLAGS+= -O6 -funroll-loops -fstrength-reduce -fomit-frame-pointer -fexpensive-optimizations -ffast-math
 .endif
 
 CONFIGURE_ENV=	OPTIM='${OPTIM}' SSL_BASE='SYSTEM' PATH="${PREFIX}/bin:${PATH}"
diff --git a/www/apache13-modssl/distinfo b/www/apache13-modssl/distinfo
index 8c75e8fa1e95..298ff63dea93 100644
--- a/www/apache13-modssl/distinfo
+++ b/www/apache13-modssl/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.3.2.tar.gz) = a86e38366bcd9797400818ae6eb1400f
-MD5 (mod_ssl-2.0.12-1.3.2.tar.gz) = 607426ac2f73e0c7968cbba9c4dc701e
+MD5 (apache_1.3.3.tar.gz) = bb6f14bbb369097a55969482d395d1ae
+MD5 (mod_ssl-2.0.15-1.3.3.tar.gz) = 410b12bc8eb07d321ea9b8b18f4bbce0
diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist
index a6be286b0c83..a9ac696e32cf 100644
--- a/www/apache13-modssl/pkg-plist
+++ b/www/apache13-modssl/pkg-plist
@@ -14,13 +14,13 @@ etc/apache/srm.conf.default
 etc/apache/ssl.crt/README.CRT
 etc/apache/ssl.crt/Makefile
 etc/apache/ssl.crt/ca-bundle.crt
-etc/apache/ssl.crt/snakeoil.crt
+etc/apache/ssl.crt/snakeoil-ca.crt
 etc/apache/ssl.crt/server.crt
 etc/apache/ssl.csr/README.CSR
 etc/apache/ssl.csr/server.csr
 etc/apache/ssl.key/README.KEY
+etc/apache/ssl.key/snakeoil-ca.key
 etc/apache/ssl.key/server.key
-etc/apache/ssl.key/snakeoil.key
 etc/rc.d/apache.sh
 include/apache/alloc.h
 include/apache/ap.h
@@ -54,7 +54,7 @@ include/apache/util_md5.h
 include/apache/util_script.h
 include/apache/util_uri.h
 libexec/apache/mod_auth_anon.so
-libexec/apache/mod_auth_dbm.so
+libexec/apache/mod_auth_db.so
 libexec/apache/mod_cern_meta.so
 libexec/apache/mod_digest.so
 libexec/apache/mod_expires.so