Upgrade SSL-aware Apache to: Apache 1.3.1 + mod_ssl 2.0.7

3 files changed, 33 insertions, 13 deletions

diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index bf743e5fcffa..b7e57dc60085 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sat Aug 22 12:00:00 CDT 1998
 # Whom:			rse@engelschall.com
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/27 16:00:05 rse Exp $
+# $Id: Makefile,v 1.2 1998/08/29 21:24:13 rse Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -12,8 +12,10 @@ 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.ulpgc.es/pub/mod_ssl/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}
+		ftp://ftp.ulpgc.es/pub/mod_ssl/ \
+		ftp://glock.missouri.edu/pub/mod_ssl/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}
 
 MAINTAINER=	rse@engelschall.com
 
@@ -23,7 +25,7 @@ BUILD_DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay \
 RUN_DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
 
 VERSION_APACHE=	1.3.1
-VERSION_MODSSL=	2.0.6
+VERSION_MODSSL=	2.0.7
 
 RESTRICTED=	"Contains cryptography"
 
@@ -61,6 +63,10 @@ INSTALL_TARGET=	install-quiet
 MAN1=	ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1
 MAN8=	apxs.8 httpd.8 logresolve.8 rotatelogs.8
 
+TYPE=	test
+CRT=
+KEY=
+
 pre-patch:
 	@cd ${WRKDIR}/mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE} \
 	&& ${ECHO_MSG} "===>  Applying mod_ssl-${VERSION_MODSSL} extension" \
@@ -69,7 +75,7 @@ pre-patch:
 certificate:
 	@cd ${WRKSRC} \
 	&& ${ECHO_MSG} "===>  Creating Test Certificate for Server" \
-	&& ${MAKE} certificate
+	&& ${MAKE} certificate TYPE=$(TYPE) CRT=$(CRT) KEY=$(KEY)
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
diff --git a/www/apache13-modssl/distinfo b/www/apache13-modssl/distinfo
index d55e1f7caf4b..ece853caa541 100644
--- a/www/apache13-modssl/distinfo
+++ b/www/apache13-modssl/distinfo
@@ -1,2 +1,2 @@
 MD5 (apache_1.3.1.tar.gz) = fd28c26f94451216a23f34f5fe22e2b4
-MD5 (mod_ssl-2.0.6-1.3.1.tar.gz) = bc7387ca02a7f29263ee7283755b44ba
+MD5 (mod_ssl-2.0.7-1.3.1.tar.gz) = 41805193144d9ab05e9430c60ae2de1b
diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist
index 9368f061bb6d..ad1b7232580e 100644
--- a/www/apache13-modssl/pkg-plist
+++ b/www/apache13-modssl/pkg-plist
@@ -6,8 +6,16 @@ etc/apache/httpd.conf.default
 etc/apache/magic.default
 etc/apache/mime.types.default
 etc/apache/srm.conf.default
-etc/apache/sslcerts/Makefile
-etc/apache/sslcerts/server.pem
+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/server.crt
+etc/apache/ssl.csr/README.CSR
+etc/apache/ssl.csr/server.csr
+etc/apache/ssl.key/README.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
@@ -264,11 +272,17 @@ www/icons/uu.gif
 www/icons/uuencoded.gif
 www/icons/world1.gif
 www/icons/world2.gif
+@exec mkdir -p %D/www
 @exec mkdir -p %D/www/proxy
+@dirrm www/proxy
+@dirrm www
 @exec ln -fs %B %D/www/data.default
-@exec cd %D/etc/apache/sslcerts/ && make >/dev/null 2>&1
-@exec mkdir -p %D/etc/apache/sslkeys
 @unexec rm -f %D/www/data.default
-@unexec rm -f %D/etc/apache/sslcerts/*.0
-@dirrm %D/etc/apache/sslcerts
-@dirrm %D/etc/apache/sslkeys
+@exec mkdir -p %D/etc/apache/ssl.crt
+@exec mkdir -p %D/etc/apache/ssl.csr
+@exec mkdir -p %D/etc/apache/ssl.key
+@exec cd %D/etc/apache/ssl.crt/ && make >/dev/null 2>&1
+@unexec rm -f %D/etc/apache/ssl.crt/*.0
+@dirrm etc/apache/ssl.crt
+@dirrm etc/apache/ssl.csr
+@dirrm etc/apache/ssl.key