Update Apache to 1.3.6, mod_ssl to 2.2.8, and mod_perl to 1.19. mod_ssl

now makes use of OpenSSL.

4 files changed, 29 insertions, 17 deletions

diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index 577b2102df5..f36e6ed9af7 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.6 1999/04/14 18:00:48 bad Exp $
+# $NetBSD: Makefile,v 1.7 1999/04/30 17:05:21 tv Exp $
 #
 
-DISTNAME=	mod_ssl-2.1.3-1.3.3
-PKGNAME=	ap-ssl-2.1.3
+DISTNAME=	mod_ssl-2.2.8-1.3.6
+PKGNAME=	ap-ssl-2.2.8
 CATEGORIES=	www
-MASTER_SITES=	http://www.engelschall.com/sw/mod_ssl/distrib/
+MASTER_SITES=	ftp://ftp.engelschall.com/sw/mod_ssl/
 
 MAINTAINER=	tv@netbsd.org
-HOMEPAGE=	http://www.sngelschall.com/sw/mod_ssl/
+HOMEPAGE=	http://www.engelschall.com/sw/mod_ssl/
 
-DEPENDS=	ssleay-0.9.0b:../../security/ssleay \
-		apache-1.3.3.2:../../www/apache
+DEPENDS=	openssl-0.9.2b:../../security/openssl \
+		apache-1.3.6p0:../../www/apache
 # For "apxs":
 BUILD_DEPENDS=	${LOCALBASE}/bin/perl:../../lang/perl5
 
@@ -30,7 +30,7 @@ fetch-depends:
 .endif
 
 LDFLAGS+=	-L${PREFIX}/lib -lcrypto -lssl
-CPPFLAGS+=	-I${PREFIX}/include/ssleay
+CPPFLAGS+=	-I${PREFIX}/include/openssl
 .if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
 LDFLAGS+=	-lrsaref
 .endif
@@ -39,9 +39,9 @@ LDFLAGS+=	-lrsaref
 # to get all the appropriate config information and compile with apxs.
 do-build:
 	@cd ${WRKSRC}/pkg.sslmod && ${PREFIX}/sbin/apxs -c -o mod_ssl.so \
-		${CPPFLAGS} -DSSL_COMPAT -DMOD_SSL_VERSION=\\\"2.1.2\\\" \
+		${CPPFLAGS} -DSSL_COMPAT -DMOD_SSL_VERSION=\\\"2.2.8\\\" \
 		-DSSL_PRODUCT_NAME=\\\"mod_ssl\\\" \
-		-DSSL_PRODUCT_VERSION=\\\"2.1.2\\\" *.c
+		-DSSL_PRODUCT_VERSION=\\\"2.2.8\\\" *.c
 	cd ${WRKSRC}/pkg.sslsup && ${LINK.c} -o ca-fix ca-fix.c
 
 do-install:
@@ -49,7 +49,10 @@ do-install:
 	@cd ${WRKSRC}/pkg.sslmod && ${PREFIX}/sbin/apxs -i mod_ssl.so
 	${INSTALL_DATA_DIR} ${PREFIX}/share/httpd/htdocs/manual/mod/mod_ssl
 	cd ${WRKSRC}/pkg.ssldoc && \
-		${INSTALL_DATA} *.html *.gif ${PREFIX}/share/httpd/htdocs/manual/mod/mod_ssl/
+		${INSTALL_DATA} *.html *.gif *.jpg ${PREFIX}/share/httpd/htdocs/manual/mod/mod_ssl/
+	${INSTALL_DATA_DIR} ${PREFIX}/share/mod_ssl
+	cd ${WRKSRC}/pkg.contrib && \
+		${INSTALL_SCRIPT} *.sh *.cgi ${PREFIX}/share/mod_ssl/
 	${INSTALL_DATA} ${WRKSRC}/pkg.sslcfg/Makefile ${WRKSRC}/pkg.sslcfg/README.CRT \
 		${WRKSRC}/pkg.sslcfg/*.crt ${PREFIX}/etc/httpd/ssl.crt/
 	${INSTALL_DATA} ${WRKSRC}/pkg.sslcfg/README.CSR \
diff --git a/www/ap-ssl/files/md5 b/www/ap-ssl/files/md5
index 43cb67e779d..96c0ff30892 100644
--- a/www/ap-ssl/files/md5
+++ b/www/ap-ssl/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/12/07 21:29:09 tv Exp $
+$NetBSD: md5,v 1.3 1999/04/30 17:05:21 tv Exp $
 
-MD5 (mod_ssl-2.1.3-1.3.3.tar.gz) = 76bd1f0d5f5c9623a71fea336312a753
+MD5 (mod_ssl-2.2.8-1.3.6.tar.gz) = 0aaf0ff78d38cc53ad10fe73cc42a0f5
diff --git a/www/ap-ssl/pkg/MESSAGE b/www/ap-ssl/pkg/MESSAGE
index b2f4ef2f6f9..44a8e4fbc2a 100644
--- a/www/ap-ssl/pkg/MESSAGE
+++ b/www/ap-ssl/pkg/MESSAGE
@@ -1,5 +1,5 @@
 =============================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 1998/12/03 17:22:02 tv Exp $
+$NetBSD: MESSAGE,v 1.2 1999/04/30 17:05:21 tv Exp $
 
 In order to start Apache with mod_ssl support, you need to run Apache with
 "apachectl startssl" instead of "apachectl start".  The SSL-specific
@@ -8,7 +8,7 @@ configuration parts of the default httpd.conf are bracketed by:
   <IfDefine SSL>
   </IfDefine>
 
-If you are using RSAREF, you MUST uncomment the line near the top of
+If you are using RSAREF, you MUST uncomment the line in the SSL block of
 httpd.conf which reads:
 
   #LoadFile !librsaref.so.2
diff --git a/www/ap-ssl/pkg/PLIST b/www/ap-ssl/pkg/PLIST
index 305060babcb..5ba47328de8 100644
--- a/www/ap-ssl/pkg/PLIST
+++ b/www/ap-ssl/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1998/12/03 17:22:02 tv Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/04/30 17:05:22 tv Exp $
 bin/ca-fix
 etc/httpd/ssl.crt/Makefile
 etc/httpd/ssl.crt/README.CRT
@@ -16,12 +16,16 @@ lib/httpd/mod_ssl.so
 share/httpd/htdocs/manual/mod/mod_ssl/apache_pb.gif
 share/httpd/htdocs/manual/mod/mod_ssl/index.html
 share/httpd/htdocs/manual/mod/mod_ssl/mod_ssl_sb.gif
+share/httpd/htdocs/manual/mod/mod_ssl/openssl_ics.gif
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_compat.gfont000.gif
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_compat.html
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_cover_logo.jpg
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_cover_title.gif
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_faq.gfont000.gif
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_faq.html
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_glossary.html
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_howto.gfont000.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_howto.html
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_intro.gfont000.gif
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_intro.html
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_intro_fig1.gif
@@ -57,5 +61,10 @@ share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-preface.gif
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-ref.gif
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-toc.gif
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-tutor.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssleay.gif
+share/mod_ssl/cca.sh
+share/mod_ssl/gid-mkcert.sh
+share/mod_ssl/loadcacert.cgi
+share/mod_ssl/mca.sh
+share/mod_ssl/sign.sh
 @dirrm share/httpd/htdocs/manual/mod/mod_ssl
+@dirrm share/mod_ssl