Upgrade to Apache 1.3.3 + mod_ssl 2.1.2

This is the first port version for the new mod_ssl version 2.1.
As a summary, here are its main SSL/TLS-related features:

   o  Open-Source software (BSD-style license)
   o  Useable for both commercial and non-commercial use
   o  Available for both Unix and Win32 platforms
   o  128-bit strong cryptography world-wide
   o  Support for SSLv2, SSLv3 and TLSv1 protocols
   o  Clean reviewable ANSI C source code
   o  Clean Apache module architecture
   o  Integrates seamlessly into Apache through an Extended API (EAPI)
   o  Full Dynamic Shared Object (DSO) support
   o  Support for the SSLeay+RSAref US-situation
   o  Advanced pass-phrase handling for private keys
   o  X.509 certificate based authentication for both client and server
   o  Additional boolean-expression based access control facility
   o  Backward compatibility to other Apache SSL solutions
   o  Inter-process SSL session cache
   o  Powerful dedicated SSL engine logging facility
   o  Simple and robust application to Apache source trees
   o  Fully integrated into the Apache 1.3 configuration mechanism
   o  Additional integration into the Apache Autoconf-style Interface (APACI)
   o  Assistance in X.509 v3 certificate generation

5 files changed, 119 insertions, 23 deletions

diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index 42808e076ee8..63136b3c6311 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.3 + 2.0.15
+# Version required:	1.3.3 + 2.1.2
 # Date created:		Sat Aug 22 12:00:00 CDT 1998
 # Whom:			rse@engelschall.com
 #
-# $Id: Makefile,v 1.8 1998/10/02 10:11:11 rse Exp $
+# $Id: Makefile,v 1.9 1998/11/07 14:22:39 rse Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -32,7 +32,7 @@ BUILD_DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay \
 RUN_DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
 
 VERSION_APACHE=	1.3.3
-VERSION_MODSSL=	2.0.15
+VERSION_MODSSL=	2.1.2
 
 RESTRICTED=	"Contains cryptography"
 
@@ -45,11 +45,11 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/apache \
 		--proxycachedir=${PREFIX}/www/proxy \
 		--libexecdir=${PREFIX}/libexec/apache \
 		--without-confadjust \
-		--enable-shared=remain \
 		--enable-module=most \
 		--enable-module=auth_db \
 		--disable-module=auth_dbm \
-		--enable-module=ssl
+		--enable-module=ssl \
+		--enable-shared=max
 
 OPTIM=\
 -DHARD_SERVER_LIMIT=512 \
@@ -75,7 +75,7 @@ KEY=
 pre-patch:
 	@cd ${WRKDIR}/mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE} \
 	&& ${ECHO_MSG} "===>  Applying mod_ssl-${VERSION_MODSSL} extension" \
-	&& ./configure --with-apache=../${DISTNAME}
+	&& ./configure --with-apache=../${DISTNAME} --expert
 
 post-patch:
 	@cd ${WRKSRC} \
@@ -83,6 +83,8 @@ post-patch:
 
 post-build:
 	@cd ${WRKSRC} \
+	&& ${ECHO_MSG} "===>  Creating Dummy Certificate for Server (SnakeOil)" \
+	&& ${ECHO_MSG} "      [use 'make certificate' to create a real one]" \
 	&& ${MAKE} certificate TYPE=dummy >/dev/null 2>&1
 
 certificate:
diff --git a/www/apache13-modssl/distinfo b/www/apache13-modssl/distinfo
index 298ff63dea93..ee43683cd644 100644
--- a/www/apache13-modssl/distinfo
+++ b/www/apache13-modssl/distinfo
@@ -1,2 +1,2 @@
 MD5 (apache_1.3.3.tar.gz) = bb6f14bbb369097a55969482d395d1ae
-MD5 (mod_ssl-2.0.15-1.3.3.tar.gz) = 410b12bc8eb07d321ea9b8b18f4bbce0
+MD5 (mod_ssl-2.1.2-1.3.3.tar.gz) = a054804ba2a895b1fc53727c9b52ce54
diff --git a/www/apache13-modssl/pkg-comment b/www/apache13-modssl/pkg-comment
index 0ba38dd2de22..883b9e85631f 100644
--- a/www/apache13-modssl/pkg-comment
+++ b/www/apache13-modssl/pkg-comment
@@ -1 +1 @@
-The popular Apache HTTP server with SSL extension.
+The Apache 1.3 webserver with SSL/TLS functionality.
diff --git a/www/apache13-modssl/pkg-descr b/www/apache13-modssl/pkg-descr
index 961a698ee991..41717dce9942 100644
--- a/www/apache13-modssl/pkg-descr
+++ b/www/apache13-modssl/pkg-descr
@@ -1,15 +1,40 @@
-Apache 1.3 + mod_ssl 2.0
-========================
 
-Apache is an HTTP server designed as a plug-in replacement for the NCSA server
-version 1.3 (or 1.4). It fixes numerous bugs in the NCSA server and includes
-many frequently requested new features, and has an API which allows it to be
-extended to meet users' needs more easily. This version is also SSL-aware by
-the help of the mod_ssl module which interfaces Apache to the SSLeay
-encryption library.
+ Apache 1.3 + mod_ssl 2.1          ``mod_ssl combines the flexibility of  
+ ========================            Apache with the security of SSLeay.''
 
-All the documentation can be found on-line on the Web:
+ This is Apache version 1.3 plus mod_ssl which provides strong cryptography
+ via the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS
+ v1) protocols by the help of the SSL/TLS implementation library SSLeay from
+ Eric A. Young and Tim J. Hudson. The mod_ssl package was created in April
+ 1998 by Ralf S. Engelschall and was originally derived from software
+ developed by Ben Laurie for use in the Apache-SSL HTTP server project. 
+
+ As a summary, here are its main SSL/TLS-related features:
+
+   o  Open-Source software (BSD-style license)
+   o  Useable for both commercial and non-commercial use
+   o  Available for both Unix and Win32 platforms
+   o  128-bit strong cryptography world-wide
+   o  Support for SSLv2, SSLv3 and TLSv1 protocols
+   o  Clean reviewable ANSI C source code 
+   o  Clean Apache module architecture
+   o  Integrates seamlessly into Apache through an Extended API (EAPI)
+   o  Full Dynamic Shared Object (DSO) support
+   o  Support for the SSLeay+RSAref US-situation
+   o  Advanced pass-phrase handling for private keys
+   o  X.509 certificate based authentication for both client and server
+   o  Additional boolean-expression based access control facility
+   o  Backward compatibility to other Apache SSL solutions
+   o  Inter-process SSL session cache
+   o  Powerful dedicated SSL engine logging facility
+   o  Simple and robust application to Apache source trees
+   o  Fully integrated into the Apache 1.3 configuration mechanism
+   o  Additional integration into the Apache Autoconf-style Interface (APACI)
+   o  Assistance in X.509 v3 certificate generation
+
+ All documentation can be found on-line on the Web:
+
+   o  Apache:  http://www.apache.org/
+   o  mod_ssl: http://www.engelschall.com/sw/mod_ssl/
+   o  SSLeay:  http://www.ssleay.org/
 
-  o  Apache:  http://www.apache.org/
-  o  mod_ssl: http://www.engelschall.com/sw/mod_ssl/
-  o  SSLeay:  http://www.ssleay.org/
diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist
index a9ac696e32cf..df546954b9aa 100644
--- a/www/apache13-modssl/pkg-plist
+++ b/www/apache13-modssl/pkg-plist
@@ -23,6 +23,8 @@ etc/apache/ssl.key/snakeoil-ca.key
 etc/apache/ssl.key/server.key
 etc/rc.d/apache.sh
 include/apache/alloc.h
+include/apache/ap_ctx.h
+include/apache/ap_hook.h
 include/apache/ap.h
 include/apache/ap_compat.h
 include/apache/ap_config.h
@@ -53,17 +55,36 @@ include/apache/util_date.h
 include/apache/util_md5.h
 include/apache/util_script.h
 include/apache/util_uri.h
+libexec/apache/libproxy.so
+libexec/apache/libssl.so
+libexec/apache/mod_access.so
+libexec/apache/mod_actions.so
+libexec/apache/mod_alias.so
+libexec/apache/mod_asis.so
+libexec/apache/mod_auth.so
 libexec/apache/mod_auth_anon.so
 libexec/apache/mod_auth_db.so
+libexec/apache/mod_autoindex.so
 libexec/apache/mod_cern_meta.so
+libexec/apache/mod_cgi.so
 libexec/apache/mod_digest.so
+libexec/apache/mod_dir.so
+libexec/apache/mod_env.so
 libexec/apache/mod_expires.so
 libexec/apache/mod_headers.so
+libexec/apache/mod_imap.so
+libexec/apache/mod_include.so
 libexec/apache/mod_info.so
+libexec/apache/mod_log_config.so
+libexec/apache/mod_mime.so
 libexec/apache/mod_mime_magic.so
+libexec/apache/mod_negotiation.so
 libexec/apache/mod_rewrite.so
+libexec/apache/mod_setenvif.so
 libexec/apache/mod_speling.so
+libexec/apache/mod_status.so
 libexec/apache/mod_unique_id.so
+libexec/apache/mod_userdir.so
 libexec/apache/mod_usertrack.so
 sbin/ab
 sbin/apachectl
@@ -71,7 +92,6 @@ sbin/apxs
 sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
-sbin/ssl_gcache
 share/doc/apache/apache_pb.gif
 share/doc/apache/index.html
 share/doc/apache/manual/LICENSE
@@ -94,7 +114,6 @@ share/doc/apache/manual/images/mod_rewrite_fig1.fig
 share/doc/apache/manual/images/mod_rewrite_fig1.gif
 share/doc/apache/manual/images/mod_rewrite_fig2.fig
 share/doc/apache/manual/images/mod_rewrite_fig2.gif
-share/doc/apache/manual/images/mod_ssl.jpg
 share/doc/apache/manual/images/mod_ssl_sb.gif
 share/doc/apache/manual/images/ssleay.gif
 share/doc/apache/manual/images/sub.gif
@@ -170,11 +189,60 @@ share/doc/apache/manual/mod/mod_rewrite.html
 share/doc/apache/manual/mod/mod_setenvif.html
 share/doc/apache/manual/mod/mod_so.html
 share/doc/apache/manual/mod/mod_speling.html
-share/doc/apache/manual/mod/mod_ssl.html
 share/doc/apache/manual/mod/mod_status.html
 share/doc/apache/manual/mod/mod_unique_id.html
 share/doc/apache/manual/mod/mod_userdir.html
 share/doc/apache/manual/mod/mod_usertrack.html
+share/doc/apache/manual/mod/mod_ssl/index.html
+share/doc/apache/manual/mod/mod_ssl/ssl_compat.gfont000.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_compat.html
+share/doc/apache/manual/mod/mod_ssl/ssl_cover_logo.jpg
+share/doc/apache/manual/mod/mod_ssl/ssl_cover_title.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_faq.gfont000.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_faq.html
+share/doc/apache/manual/mod/mod_ssl/ssl_glossary.html
+share/doc/apache/manual/mod/mod_ssl/ssl_intro.gfont000.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_intro.html
+share/doc/apache/manual/mod/mod_ssl/ssl_intro_fig1.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_intro_fig2.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_intro_fig3.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_overview.gfont000.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_overview.html
+share/doc/apache/manual/mod/mod_ssl/ssl_overview_fig1.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_reference.gfont000.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_reference.html
+share/doc/apache/manual/mod/mod_ssl/ssl_template.head-chapter.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.head-num-1.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.head-num-2.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.head-num-3.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.head-num-4.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.head-num-5.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.head-num-6.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.head-num-7.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.imgdot-1x1-000000.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.imgdot-1x1-transp.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.navbut-next-n.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.navbut-next-s.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.navbut-prev-n.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.navbut-prev-s.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-abstract.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-compat.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-faq.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-gloss.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-howto.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-intro.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-over.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-preface.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-ref.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-toc.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-tutor.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_compat.wml
+share/doc/apache/manual/mod/mod_ssl/ssl_cover.wml
+share/doc/apache/manual/mod/mod_ssl/ssl_faq.wml
+share/doc/apache/manual/mod/mod_ssl/ssl_glossary.wml
+share/doc/apache/manual/mod/mod_ssl/ssl_intro.wml
+share/doc/apache/manual/mod/mod_ssl/ssl_overview.wml
+share/doc/apache/manual/mod/mod_ssl/ssl_reference.wml
 share/doc/apache/manual/multilogs.html
 share/doc/apache/manual/new_features_1_0.html
 share/doc/apache/manual/new_features_1_1.html
@@ -299,6 +367,7 @@ www/icons/world2.gif
 @dirrm libexec/apache
 @dirrm share/doc/apache/manual/images
 @dirrm share/doc/apache/manual/misc
+@dirrm share/doc/apache/manual/mod/mod_ssl
 @dirrm share/doc/apache/manual/mod
 @dirrm share/doc/apache/manual/vhosts
 @dirrm share/doc/apache/manual