Update Apache and mod_ssl using new build layout (see post to tech-pkg for

details).  No security fixes in Apache 1.3.3, so immediate upgrade from    
1.3.2 is not necessary.

7 files changed, 170 insertions, 0 deletions

diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
new file mode 100644
index 00000000000..b895b3cc0ba
--- /dev/null
+++ b/www/ap-ssl/Makefile
@@ -0,0 +1,58 @@
+# $NetBSD: Makefile,v 1.1.1.1 1998/12/03 17:22:01 tv Exp $
+#
+
+DISTNAME=	mod_ssl-2.1.2-1.3.3
+PKGNAME=	ap-ssl-2.1.2
+CATEGORIES=	www
+MASTER_SITES=	http://www.engelschall.com/sw/mod_ssl/distrib/
+
+MAINTAINER=	tv@netbsd.org
+HOMEPAGE=	http://www.sngelschall.com/sw/mod_ssl/
+
+DEPENDS=	ssleay-0.9.0b:../../security/ssleay \
+		apache-1.3.3.0:../../www/apache
+# For "apxs":
+BUILD_DEPENDS=	${PREFIX}/bin/perl:../../lang/perl5
+
+CONFLICTS=	apache-1.3.[012] apache-*modssl-*
+
+fetch-depends:
+.if !defined(USE_RSAREF2) || ${USE_RSAREF2} != YES && ${USE_RSAREF2} != NO
+	@${ECHO}
+	@${ECHO} The variable USE_RSAREF2 must be set to either YES or NO
+	@${ECHO} in order to build this package.  People with no RSA
+	@${ECHO} license MUST set this variable to YES.  Users outside
+	@${ECHO} the USA MUST set this variable to NO.  RSA licensees may
+	@${ECHO} choose -- NO is faster.
+	@${FALSE}
+.endif
+
+LDFLAGS+=	-L${PREFIX}/lib -lcrypto -lssl
+CPPFLAGS+=	-I${PREFIX}/include/ssleay
+.if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
+LDFLAGS+=	-lrsaref
+.endif
+
+# Since we don't have the Apache source tree to work with, we have to pretend
+# 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\\\" \
+		-DSSL_PRODUCT_NAME=\\\"mod_ssl\\\" \
+		-DSSL_PRODUCT_VERSION=\\\"2.1.2\\\" *.c
+	cd ${WRKSRC}/pkg.sslsup && ${LINK.c} -o ca-fix ca-fix.c
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/pkg.sslsup/ca-fix ${PREFIX}/bin/
+	@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} ${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 \
+		${WRKSRC}/pkg.sslcfg/*.csr ${PREFIX}/etc/httpd/ssl.csr/
+	${INSTALL_DATA} ${WRKSRC}/pkg.sslcfg/README.KEY \
+		${WRKSRC}/pkg.sslcfg/*.key ${PREFIX}/etc/httpd/ssl.key/
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-ssl/files/md5 b/www/ap-ssl/files/md5
new file mode 100644
index 00000000000..43bba96ca1f
--- /dev/null
+++ b/www/ap-ssl/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 1998/12/03 17:22:02 tv Exp $
+
+MD5 (mod_ssl-2.1.2-1.3.3.tar.gz) = a054804ba2a895b1fc53727c9b52ce54
diff --git a/www/ap-ssl/patches/patch-aa b/www/ap-ssl/patches/patch-aa
new file mode 100644
index 00000000000..4e4baf2a190
--- /dev/null
+++ b/www/ap-ssl/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1.1.1 1998/12/03 17:22:02 tv Exp $
+
+--- pkg.sslsup/ca-fix.c.orig	Thu Dec  3 11:40:55 1998
++++ pkg.sslsup/ca-fix.c	Thu Dec  3 11:41:27 1998
+@@ -20,6 +20,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <ctype.h>
+ #include <bio.h>
+ #include <objects.h>
diff --git a/www/ap-ssl/pkg/COMMENT b/www/ap-ssl/pkg/COMMENT
new file mode 100644
index 00000000000..1411ea44197
--- /dev/null
+++ b/www/ap-ssl/pkg/COMMENT
@@ -0,0 +1 @@
+Secure Sockets Layer module for Apache.
diff --git a/www/ap-ssl/pkg/DESCR b/www/ap-ssl/pkg/DESCR
new file mode 100644
index 00000000000..65daf42ddae
--- /dev/null
+++ b/www/ap-ssl/pkg/DESCR
@@ -0,0 +1,19 @@
+                       _             _ 
+   _ __ ___   ___   __| |    ___ ___| |  
+  | '_ ` _ \ / _ \ / _` |   / __/ __| |  
+  | | | | | | (_) | (_| |   \__ \__ \ |  mod_ssl - Apache Interface to SSLeay  
+  |_| |_| |_|\___/ \__,_|___|___/___/_|  http://www.engelschall.com/sw/mod_ssl/
+                       |_____|         
+
+  Description
+  ___________
+
+  This Apache module provides strong cryptography for the Apache 1.3 webserver
+  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.  Additionally it uses a tool developed by
+  Larry Wall and David MacKenzie for use in the GNU project of the FSF.
diff --git a/www/ap-ssl/pkg/MESSAGE b/www/ap-ssl/pkg/MESSAGE
new file mode 100644
index 00000000000..b2f4ef2f6f9
--- /dev/null
+++ b/www/ap-ssl/pkg/MESSAGE
@@ -0,0 +1,16 @@
+=============================================================================
+$NetBSD: MESSAGE,v 1.1.1.1 1998/12/03 17:22:02 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
+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
+httpd.conf which reads:
+
+  #LoadFile !librsaref.so.2
+
+=============================================================================
diff --git a/www/ap-ssl/pkg/PLIST b/www/ap-ssl/pkg/PLIST
new file mode 100644
index 00000000000..305060babcb
--- /dev/null
+++ b/www/ap-ssl/pkg/PLIST
@@ -0,0 +1,61 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 1998/12/03 17:22:02 tv Exp $
+bin/ca-fix
+etc/httpd/ssl.crt/Makefile
+etc/httpd/ssl.crt/README.CRT
+etc/httpd/ssl.crt/ca-bundle.crt
+etc/httpd/ssl.crt/server.crt
+etc/httpd/ssl.crt/snakeoil-ca.crt
+etc/httpd/ssl.crt/snakeoil.crt
+etc/httpd/ssl.csr/README.CSR
+etc/httpd/ssl.csr/server.csr
+etc/httpd/ssl.key/README.KEY
+etc/httpd/ssl.key/server.key
+etc/httpd/ssl.key/snakeoil-ca.key
+etc/httpd/ssl.key/snakeoil.key
+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/ssl_compat.gfont000.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_compat.html
+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_intro.gfont000.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_intro.html
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_intro_fig1.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_intro_fig2.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_intro_fig3.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_overview.gfont000.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_overview.html
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_overview_fig1.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_reference.gfont000.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_reference.html
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.head-chapter.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.head-num-1.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.head-num-2.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.head-num-3.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.head-num-4.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.head-num-5.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.head-num-6.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.head-num-7.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.imgdot-1x1-000000.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.imgdot-1x1-transp.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.navbut-next-n.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.navbut-next-s.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.navbut-prev-n.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.navbut-prev-s.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-abstract.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-compat.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-faq.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-gloss.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-howto.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-intro.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-over.gif
+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
+@dirrm share/httpd/htdocs/manual/mod/mod_ssl