Upgrade to Apache 1.2.1 and SSLeay 0.8.1. Add SSL3 and many other features.

Submitted by:	Richard Seaman <dick@tar.com>
Apologies to:	All the other who sent me helpful comments and tips and
		who I forgot :-)

5 files changed, 48 insertions, 41 deletions

diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index 0db3cba6b42e..93e5d3175aa5 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -1,34 +1,35 @@
 # New ports collection makefile for:    apache HTTPSD
-# Version required:     1.1.1
-# Date created:         Fri Aug 25 16:42:36 CDT 1995
-# Whom:                 markm@FreeBSD.org
-#
-# $Id: Makefile,v 1.35 1997/07/08 13:04:09 ache Exp $
+# Version required:     1.2.1
+# Date created:     	15th August 1997
+# Whom:			Richard Seaman <dick@tar.com>
 #
+# $Id$
 
-DISTNAME=       apache_1.1.1
-PKGNAME=        apache_SSL-1.1.1
+DISTNAME=       apache_1.2.1
+PKGNAME=        apacheSSL-1.2.1
 CATEGORIES=	www
-MASTER_SITES+=  ftp://www.apache.org/apache/dist/old/1.1/ \
+MASTER_SITES=   ftp://www.apache.org/apache/dist/ \
 		ftp://ftp.ox.ac.uk/pub/crypto/SSL/
 
 MAIN_SRC=	${DISTNAME}${EXTRACT_SUFX}
-SSL_EXTRAS=	${DISTNAME}+1.3.ssl${EXTRACT_SUFX}
-
+SSL_EXTRAS=	apache_1.2.0+ssl_1.8.tar.gz
 DISTFILES=	${MAIN_SRC} ${SSL_EXTRAS}
 EXTRACT_ONLY=	${MAIN_SRC}
+BUILD_DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay-0.8.1
+RESTRICTED=     "Contains cryptography"
 
 MAINTAINER=	markm@freebsd.org
 
-BROKEN=		"SSLeay has changed, and the patches for apache need more work"
-
-DEPENDS=	${PORTSDIR}/security/SSLeay
-
 post-extract:
 	@cd ${WRKSRC} && tar xzf ${DISTDIR}/${SSL_EXTRAS}
 
+# SSLpatch from SSL_EXTRAS is for apache_1.2.0 ... if/when it is upgraded
+# we can revert to the commented out line.  There are only minor tweaks needed
+# to get to SSLpatch-1.2.1 
 pre-patch:
-	@cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} < SSLpatch
+#       @cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} < SSLpatch
+	@cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} \
+		< ${FILESDIR}/SSLpatch-1.2.1
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache_ssl.sh ]; then \
@@ -38,4 +39,18 @@ post-install:
 		chmod 751 ${PREFIX}/etc/rc.d/apache_ssl.sh; \
 	fi
 
+.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO
+pre-fetch:
+	@echo
+	@echo You must set variable USA_RESIDENT to YES, if you are USA resident
+	@echo or to NO, if you aren\'t USA resident to build this package.
+	@echo You must also have installed RSAREF if you are USA resident.
+	@false
+.elif defined(USA_RESIDENT)
+.if ${USA_RESIDENT} == YES
+pre-build:
+	${PATCH} <${FILESDIR}/Makefile.rsa.patch
+.endif
+.endif
+
 .include <bsd.port.mk>
diff --git a/www/apache13-ssl/distinfo b/www/apache13-ssl/distinfo
index cac0b1f5916e..fc7c3f739d88 100644
--- a/www/apache13-ssl/distinfo
+++ b/www/apache13-ssl/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.1.1.tar.gz) = 0dc9c3a3148d2acf419dd926018003c3
-MD5 (apache_1.1.1+1.3.ssl.tar.gz) = bef929679760796eb9955ed941ace370
+MD5 (apache_1.2.1.tar.gz) = 387add2881934555b2d2fed1172849ec
+MD5 (apache_1.2.0+ssl_1.8.tar.gz) = 36bb9b85dbc6f3e195ba964ae848c8a5
diff --git a/www/apache13-ssl/pkg-comment b/www/apache13-ssl/pkg-comment
index 0a8a9cf142af..fa8e2bec4747 100644
--- a/www/apache13-ssl/pkg-comment
+++ b/www/apache13-ssl/pkg-comment
@@ -1 +1 @@
-The extremely popular Apache http server.  Very fast, very clean.
+Apache secure https server using SSL
diff --git a/www/apache13-ssl/pkg-descr b/www/apache13-ssl/pkg-descr
index f08e87f934fa..c7d91b211556 100644
--- a/www/apache13-ssl/pkg-descr
+++ b/www/apache13-ssl/pkg-descr
@@ -1,15 +1,8 @@
-                                 Apache
-                             Version 1.0 (and up)
-
-What is it?
------------
-
-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.
-
-Documentation
--------------
-
-All the documentation is on-line on the WWW, via the URL http://www.apache.org
+                             Apache + SSLeay
+
+Uses the public domain SSL implementation known as SSLeay, integrated into
+the Apache server to provide a public domain HTTPS server using Netscape
+Secure Sockets Layer (SSL), versions 2 and 3.  There are licensing
+issues in connection with use of the SSLeay code in the US, and there
+are ITAR restrictions on export, even though the SSLeay code is obtained
+from an overseas location.
diff --git a/www/apache13-ssl/pkg-plist b/www/apache13-ssl/pkg-plist
index f6c59a6ed027..e4a0bbc896d6 100644
--- a/www/apache13-ssl/pkg-plist
+++ b/www/apache13-ssl/pkg-plist
@@ -1,12 +1,10 @@
 etc/rc.d/apache_ssl.sh
-@exec mkdir -p %D/www/cgi-bin %D/www/data
-@unexec rm %D/etc/rc.d/apache_ssl.sh
-etc/apache/httpd.conf
-etc/apache/httpd.conf-SSL
-etc/apache/srm.conf
-etc/apache/access.conf
-etc/apache/mime.types
-etc/apache/mime.types-SSL
+etc/apache-SSL/httpd.conf
+etc/apache-SSL/srm.conf
+etc/apache-SSL/access.conf
+etc/apache-SSL/httpd.conf-SSL
+etc/apache-SSL/mime.types
+etc/apache-SSL/mime.types-SSL
 sbin/httpsd
 www/icons/README
 www/icons/a.gif
@@ -84,3 +82,4 @@ www/icons/uu.gif
 www/icons/uuencoded.gif
 www/icons/world1.gif
 www/icons/world2.gif
+@unexec rmdir %B