Upgrade:

Apache  1.3.12 -> 1.3.14
mod_ssl 2.6.6  -> 2.7.1

5 files changed, 34 insertions, 12 deletions

diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index 084982a873ce..591c3351eeb2 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	apache+mod_ssl
-PORTVERSION= 	${VERSION_APACHE}+${VERSION_MODSSL}	
-PORTREVISION=	1
+PORTVERSION= 	${VERSION_APACHE}+${VERSION_MODSSL}
+PORTREVISION=	0
 CATEGORIES=	www security
 MASTER_SITES=	http://www.apache.org/dist/ \
 		http://www.modssl.org/source/ \
@@ -36,7 +36,7 @@ MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.mtnranch.net/pub/apache/dist/ \
 		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
 		ftp://apache.nextpath.com/pub/apache/dist/
-DISTNAME=	apache_1.3.12
+DISTNAME=	apache_${VERSION_APACHE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}
 
@@ -48,10 +48,10 @@ USE_OPENSSL=	YES
 
 LIB_DEPENDS=	mm.11:${PORTSDIR}/devel/mm
 
-VERSION_APACHE=	1.3.12
-VERSION_MODSSL=	2.6.6
+VERSION_APACHE=	1.3.14
+VERSION_MODSSL=	2.7.1
 
-Y2K=		http://www.modssl.org/docs/2.6/ssl_faq.html#y2k
+Y2K=		http://www.modssl.org/docs/2.7/ssl_faq.html#y2k
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
diff --git a/www/apache13-modssl/distinfo b/www/apache13-modssl/distinfo
index 38c46d29740f..b119f4ab3e83 100644
--- a/www/apache13-modssl/distinfo
+++ b/www/apache13-modssl/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2
-MD5 (mod_ssl-2.6.6-1.3.12.tar.gz) = 573b4d89c1f203216a55fb5c2aece009
+MD5 (apache_1.3.14.tar.gz) = 34803e3d83a0a9ed981b571657b33109
+MD5 (mod_ssl-2.7.1-1.3.14.tar.gz) = 99e05bd4ab7bd5c72fbb70bd8cfbf283
diff --git a/www/apache13-modssl/files/patch-ah b/www/apache13-modssl/files/patch-ah
index e46ddf60928d..dcc8201a5a8e 100644
--- a/www/apache13-modssl/files/patch-ah
+++ b/www/apache13-modssl/files/patch-ah
@@ -6,7 +6,7 @@
  
 +# This requires special handling to get the correct versions of include files:
 +#     ../../include/fnmatch.h instead of /usr/include/fnmatch.h
-+#     /usr/include/opssl/*.h instead of /usr/local/include/openssl.h
++#     /usr/include/openssl/*.h instead of /usr/local/include/openssl.h
 +MY_CFLAGS= $(INCLUDES0) $(SSL_CFLAGS) $(INCLUDES1) $(EXTRA_INCLUDES) $(CFLAGS)
 +
  all: lib
diff --git a/www/apache13-modssl/pkg-descr b/www/apache13-modssl/pkg-descr
index 1752a800fb17..ef42cd670269 100644
--- a/www/apache13-modssl/pkg-descr
+++ b/www/apache13-modssl/pkg-descr
@@ -1,4 +1,4 @@
- Apache 1.3 + mod_ssl 2.5         ``mod_ssl combines the flexibility of   
+ Apache 1.3 + mod_ssl 2.7         ``mod_ssl combines the flexibility of   
  ========================           Apache with the security of OpenSSL.''
                                   
  The Apache Interface to OpenSSL  ``The best SSL solution for       
@@ -23,7 +23,6 @@
    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 OpenSSL+RSAref US-situation
    o  Advanced pass-phrase handling for private keys
    o  X.509 certificate based authentication for both client and server
    o  X.509 certificate revocation list (CRL) support
@@ -37,6 +36,7 @@
    o  Fully integrated into the Apache 1.3 configuration mechanism
    o  Additional integration into the Apache Autoconf-style Interface (APACI)
    o  Assistance in X.509v3 certificate generation (both RSA and DSA)
+   o  Experimental support for external Crypto Devices (OpenSSL ENGINE)
 
  All documentation can be found on-line on the Web:
    o  Apache:  http://www.apache.org/
diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist
index 82ac8d3037d7..f96979349f59 100644
--- a/www/apache13-modssl/pkg-plist
+++ b/www/apache13-modssl/pkg-plist
@@ -8,12 +8,14 @@ sbin/apxs
 sbin/logresolve
 sbin/rotatelogs
 etc/rc.d/apache.sh
+etc/apache/access.conf
 etc/apache/apache.conf
 etc/apache/apache.conf.default
 etc/apache/magic
 etc/apache/magic.default
 etc/apache/mime.types
 etc/apache/mime.types.default
+etc/apache/srm.conf
 etc/apache/ssl.crt/README.CRT
 etc/apache/ssl.crt/Makefile
 etc/apache/ssl.crt/ca-bundle.crt
@@ -35,7 +37,7 @@ etc/apache/ssl.key/snakeoil-ca-dsa.key
 etc/apache/ssl.key/snakeoil-rsa.key
 etc/apache/ssl.key/snakeoil-dsa.key
 etc/apache/ssl.key/server.key
-include/apache/alloc.h
+include/apache/ap_alloc.h
 include/apache/ap_ctx.h
 include/apache/ap_hook.h
 include/apache/ap_mm.h
@@ -118,6 +120,7 @@ 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/README.rus
 share/apache/htdocs/apache_pb.gif
 share/apache/htdocs/index.html.ca
 share/apache/htdocs/index.html.cz
@@ -135,6 +138,17 @@ share/apache/htdocs/index.html.po.iso-pl
 share/apache/htdocs/index.html.pt
 share/apache/htdocs/index.html.pt-br
 share/apache/htdocs/index.html.se
+share/apache/htdocs/index.html.he.iso8859-8
+share/apache/htdocs/index.html.kr.iso-kr
+share/apache/htdocs/index.html.no
+share/apache/htdocs/index.html.ru.cp-1251
+share/apache/htdocs/index.html.ru.cp866
+share/apache/htdocs/index.html.ru.iso-ru
+share/apache/htdocs/index.html.ru.koi8-r
+share/apache/htdocs/index.html.ru.ucs2
+share/apache/htdocs/index.html.ru.ucs4
+share/apache/htdocs/index.html.ru.utf8
+share/apache/htdocs/index.html.tw.Big5
 share/apache/htdocs/manual/LICENSE
 share/apache/htdocs/manual/bind.html
 share/apache/htdocs/manual/cgi_path.html
@@ -168,6 +182,11 @@ share/apache/htdocs/manual/man-template.html
 share/apache/htdocs/manual/netware.html
 share/apache/htdocs/manual/install-tpf.html
 share/apache/htdocs/manual/readme-tpf.html
+share/apache/htdocs/manual/configuring.html
+share/apache/htdocs/manual/mpeix.html
+share/apache/htdocs/manual/new_features_2_0.html
+share/apache/htdocs/manual/win_compiling.html
+share/apache/htdocs/manual/win_service.html
 share/apache/htdocs/manual/misc/API.html
 share/apache/htdocs/manual/misc/FAQ.html
 share/apache/htdocs/manual/misc/HTTP_Features.tsv
@@ -189,6 +208,7 @@ share/apache/htdocs/manual/misc/perf-tuning.html
 share/apache/htdocs/manual/misc/perf.html
 share/apache/htdocs/manual/misc/rewriteguide.html
 share/apache/htdocs/manual/misc/security_tips.html
+share/apache/htdocs/manual/misc/tutorials.html
 share/apache/htdocs/manual/misc/vif-info.html
 share/apache/htdocs/manual/misc/windoz_keepalive.html
 share/apache/htdocs/manual/mod/core.html
@@ -197,6 +217,8 @@ share/apache/htdocs/manual/mod/directives.html
 share/apache/htdocs/manual/mod/footer.html
 share/apache/htdocs/manual/mod/header.html
 share/apache/htdocs/manual/mod/index.html
+share/apache/htdocs/manual/mod/index-bytype.html
+share/apache/htdocs/manual/mod/module-dict.html
 share/apache/htdocs/manual/mod/mod_define.html
 share/apache/htdocs/manual/mod/mod_access.html
 share/apache/htdocs/manual/mod/mod_actions.html