Retire apache-ssl, activate apache12-ssl and apache13-ssl!

PR:		ports/8448
Submitted By:	Adam Laurie <adam@algroup.co.uk>, Member of Apache-SSL

6 files changed, 205 insertions, 95 deletions

diff --git a/www/Makefile b/www/Makefile
index 855e7622f71c..5b03c6ba51eb 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.106 1998/11/22 22:32:02 asami Exp $
+# $Id: Makefile,v 1.107 1998/12/01 02:24:41 jkoshy Exp $
 #
 
     SUBDIR += Mosaic         # requires Motif
@@ -7,11 +7,12 @@
     SUBDIR += apache12
     SUBDIR += apache12-fp
     SUBDIR += apache12-php3
+    SUBDIR += apache12-ssl
     SUBDIR += apache13
     SUBDIR += apache13-fp
     SUBDIR += apache13-modssl
     SUBDIR += apache13-php3
-    SUBDIR += apache-ssl
+    SUBDIR += apache13-ssl
     SUBDIR += arena
     SUBDIR += ashe           # requires Motif
     SUBDIR += aswedit
diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index 3370d949664f..28dc44295cd2 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -1,84 +1,99 @@
-# New ports collection makefile for:    apache HTTPSD
-# Version required:     1.2.5
-# Date created:     	15th August 1997
-# Whom:			Mark Murray <mark@grondar.za>
+# New ports collection makefile for:    apache-ssl HTTPSD
+# Version required:     apache 1.3.3 and ssl 1.28
+# Date created:     	8th November, 1998
+# Whom:			Adam Laurie <adam@algroup.co.uk>
+#			based on apache port by ache@nagual.pp.ru
+#			and apache-ssl port by Mark Murray <mark@grondar.za>.
+#			Oh, and with a little bit of help from Ben :)
 #
-# $Id: Makefile,v 1.46 1998/12/01 11:14:55 obrien Exp $
+# $Id: $
 
-DISTNAME=       apache_1.2.6
-PKGNAME=        apacheSSL-1.2.6
+APACHE= 	1.3.3
+APACHE-SSL=	1.28
+
+DISTNAME=       apache_${APACHE}
+PKGNAME=        apache-${APACHE}+ssl_${APACHE-SSL}
 CATEGORIES=	www security
 MASTER_SITES=   ftp://www.apache.org/apache/dist/ \
-		ftp://ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/
-DISTFILES=      ${DISTNAME}${EXTRACT_SUFX} apache_1.2.6+ssl_1.15.tar.gz
+		ftp://ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/ \
+		ftp://ftp.MASTER.pgp.net/pub/crypto/SSL/Apache-SSL/ \
+		ftp://ftp.replay.com/pub/crypto/apache/Apache-SSL/ \
+		ftp://ftp.win.or.jp/pub/network/security/apache-ssl/Apache-SSL/ \
+		ftp://ftp.sage-au.org.au/pub/network/security/apache-ssl/Apache-SSL/ \
+		ftp://ftp.vwv.com/pub/crypto/SSL/Apache-SSL/ \
+		ftp://mirror.aarnet.edu.au/www/servers/apache-ssl/ \
+		ftp://ftp.it.net.au/mirrors/crypto/SSL/Apache-SSL/ \
+		ftp://ftp.infoscience.co.jp/pub/Crypto/SSL/Apache-SSL/Apache-SSL/ \
+		ftp://ftp.funet.fi/pub/crypt/mirrors/ftp.ox.ac.uk/SSL/Apache-SSL/ \
+		ftp://apache-ssl.raver.net/pub/ftp.apache-ssl.org/Apache-SSL/ \
+		http://mirror.aarnet.edu.au/www/servers/apache-ssl/ \
+		http://ftp.it.net.au/mirrors/crypto/SSL/Apache-SSL/ \
+		http://www.asap.cs.nott.ac.uk/SSL
 
-MAINTAINER=     markm@freebsd.org
+DISTFILES=      ${DISTNAME}${EXTRACT_SUFX} \
+		apache_${APACHE}+ssl_${APACHE-SSL}${EXTRACT_SUFX}
 
-BUILD_DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
-RUN_DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
+MAINTAINER=     Adam Laurie \<adam@algroup.co.uk\>
 
-BROKEN=		repository copy
+
+RUN_DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
 
 EXTRACT_ONLY=   ${DISTNAME}${EXTRACT_SUFX}
 
 RESTRICTED=     "Contains cryptography"
 
-post-extract:
-	@cd ${WRKSRC} && tar xzf ${DISTDIR}/apache_1.2.6+ssl_1.15.tar.gz
-
-pre-patch:
-	@cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} < SSLpatch
+#
+# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
+#
 
-MAN1=		htpasswd.1
-MAN8=		httpd.8
-DOCDIR=		${PREFIX}/share/doc/apache
+GNU_CONFIGURE=  yes
+CONFIGURE_ARGS= \
+		--sysconfdir=${PREFIX}/etc/apache \
+		--includedir=${PREFIX}/include/apache \
+		--logfiledir=/var/log \
+		--runtimedir=/var/run \
+		--datadir=${PREFIX}/www \
+		--proxycachedir=${PREFIX}/www/proxy \
+		--libexecdir=${PREFIX}/libexec/apache \
+		--without-confadjust \
+		--enable-shared=remain \
+		--enable-module=most \
+		--enable-module=auth_db \
+		--disable-module=auth_dbm \
 
-# Set it for local-supplied patch, f.e.
-# VERS_ID = mods-1.0/me
+OPTIM=-DHARD_SERVER_LIMIT=512 \
+-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
+-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
 
-.if defined(VERS_ID)
-post-patch:
-	@cd ${WRKSRC}/src && \
-	${MV} Configuration Configuration.old && \
-	${SED} 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
-	< Configuration.old > Configuration
+.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
+OPTIM+= -DBUFFERED_LOGS
+CFLAGS+= -O6 -fomit-frame-pointer
 .endif
 
-post-install:
-	@if [ ! -f ${PREFIX}/etc/rc.d/apacheSSL.sh ]; then \
-		${ECHO} "Installing ${PREFIX}/etc/rc.d/apacheSSL.sh startup file."; \
-		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apacheSSL.sh; \
-		${ECHO} "[ -x ${PREFIX}/sbin/httpsd ] && ${PREFIX}/sbin/httpsd && ${ECHO} -n ' httpsd'" >> ${PREFIX}/etc/rc.d/apacheSSL.sh; \
-		chmod 751 ${PREFIX}/etc/rc.d/apacheSSL.sh; \
-	fi
-.for i in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/support/$i ${PREFIX}/man/man1
-.endfor
-.for i in ${MAN8}
-	${INSTALL_MAN} ${WRKSRC}/support/$i ${PREFIX}/man/man8
-.endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCDIR}
-.for i in README LICENSE ABOUT_APACHE
-	${INSTALL_DATA} ${WRKSRC}/$i ${DOCDIR}
-.endfor
-	@cd ${WRKSRC}/htdocs; tar cf - . | (cd ${DOCDIR}; tar xf -)
-.endif
+CONFIGURE_ENV+= OPTIM='${OPTIM}'
+
+MAN1=   ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1
 
-.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO
+.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES
 pre-fetch:
 	@${ECHO}
+	@${ECHO} "*** Warning!"
 	@${ECHO} You must set variable USA_RESIDENT to YES if you are USA
-	@${ECHO} resident or to NO if you aren\'t USA resident to build
-	@${ECHO} this package.
-	@false
-.elif defined(USA_RESIDENT)
-.if ${USA_RESIDENT} == YES
-pre-build:
-	cd ${WRKSRC} && ${PATCH} -p2 <${FILESDIR}/Makefile.rsa.patch
+	@${ECHO} resident and are using RSAREF otherwise package will not link
+	@${ECHO} correctly.
+	@${ECHO} 
+	@${ECHO} 
 .endif
+.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
+CONFIGURE_ENV=LDFLAGS="${LDFLAGS} -L/usr/local/lib -lRSAglue -lrsaref"
 .endif
 
+post-extract:
+	@cd ${WRKSRC} && tar xzf ${DISTDIR}/apache_${APACHE}+ssl_${APACHE-SSL}${EXTRACT_SUFX}
+
+post-patch:
+	@cd ${WRKSRC} && ./FixPatch
+
 certificate:
 	@if [ -f ${PREFIX}/etc/ssleay.cnf ]; then \
 		cd ${WRKSRC}; ${MAKE} ${MAKE_ENV} $@; \
diff --git a/www/apache13-ssl/distinfo b/www/apache13-ssl/distinfo
index 3ec83f120eb3..6cd5f154ddfa 100644
--- a/www/apache13-ssl/distinfo
+++ b/www/apache13-ssl/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.2.6.tar.gz) = ff292bc21fe4f53b0e39dc8024019f44
-MD5 (apache_1.2.6+ssl_1.15.tar.gz) = 4a12ff89265bc6c44ff7241a4670621a
+MD5 (apache_1.3.3.tar.gz) = bb6f14bbb369097a55969482d395d1ae
+MD5 (apache_1.3.3+ssl_1.28.tar.gz) = eb9cd9254763268f739afeb9bb0cd155
diff --git a/www/apache13-ssl/pkg-comment b/www/apache13-ssl/pkg-comment
index fa8e2bec4747..d64224e541cc 100644
--- a/www/apache13-ssl/pkg-comment
+++ b/www/apache13-ssl/pkg-comment
@@ -1 +1 @@
-Apache secure https server using SSL
+Apache-SSL: Apache secure webserver integrating SSLeay.
diff --git a/www/apache13-ssl/pkg-descr b/www/apache13-ssl/pkg-descr
index c7d91b211556..f8794ac828dd 100644
--- a/www/apache13-ssl/pkg-descr
+++ b/www/apache13-ssl/pkg-descr
@@ -1,8 +1,12 @@
-                             Apache + SSLeay
+                       Apache 1.3.3 + SSLeay 1.28 (Apache-SSL)
 
-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.
+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 and TLS version
+1.  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.
+
+Full details can be found on the web at:
+
+        http://www.apache-ssl.org
diff --git a/www/apache13-ssl/pkg-plist b/www/apache13-ssl/pkg-plist
index 69acdbdfd2c0..efb343e03feb 100644
--- a/www/apache13-ssl/pkg-plist
+++ b/www/apache13-ssl/pkg-plist
@@ -1,59 +1,118 @@
-etc/rc.d/apacheSSL.sh
-@exec mkdir -p %D/www/cgi-bin %D/www/data
-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
-libexec/gcache
+bin/dbmmanage
+bin/htdigest
+bin/htpasswd
+etc/apache/access.conf.default
+etc/apache/httpd.conf.default
+etc/apache/magic.default
+etc/apache/mime.types.default
+etc/apache/srm.conf.default
+include/apache/alloc.h
+include/apache/ap.h
+include/apache/ap_compat.h
+include/apache/ap_config.h
+include/apache/ap_config_auto.h
+include/apache/ap_ctype.h
+include/apache/ap_md5.h
+include/apache/ap_mmn.h
+include/apache/buff.h
+include/apache/compat.h
+include/apache/conf.h
+include/apache/explain.h
+include/apache/fnmatch.h
+include/apache/gcache.h
+include/apache/hsregex.h
+include/apache/http_conf_globals.h
+include/apache/http_config.h
+include/apache/http_core.h
+include/apache/http_log.h
+include/apache/http_main.h
+include/apache/http_protocol.h
+include/apache/http_request.h
+include/apache/http_vhost.h
+include/apache/httpd.h
+include/apache/multithread.h
+include/apache/os.h
+include/apache/rfc1413.h
+include/apache/scoreboard.h
+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/mod_auth_anon.so
+libexec/apache/mod_auth_db.so
+libexec/apache/mod_cern_meta.so
+libexec/apache/mod_digest.so
+libexec/apache/mod_expires.so
+libexec/apache/mod_headers.so
+libexec/apache/mod_info.so
+libexec/apache/mod_mime_magic.so
+libexec/apache/mod_rewrite.so
+libexec/apache/mod_speling.so
+libexec/apache/mod_unique_id.so
+libexec/apache/mod_usertrack.so
+sbin/ab
+sbin/apachectl
+sbin/apxs
 sbin/httpsd
-share/doc/apache/ABOUT_APACHE
-share/doc/apache/LICENSE
-share/doc/apache/README
+sbin/gcache
+sbin/logresolve
+sbin/rotatelogs
 share/doc/apache/apache_pb.gif
+@exec mkdir -p %D/www
+@exec ln -fs %B %D/www/data.default
+@unexec rm -f %D/www/data.default
 share/doc/apache/index.html
 share/doc/apache/manual/LICENSE
-share/doc/apache/manual/TODO
 share/doc/apache/manual/bind.html
 share/doc/apache/manual/cgi_path.html
 share/doc/apache/manual/content-negotiation.html
 share/doc/apache/manual/custom-error.html
 share/doc/apache/manual/dns-caveats.html
+share/doc/apache/manual/dso.html
+share/doc/apache/manual/ebcdic.html
 share/doc/apache/manual/env.html
 share/doc/apache/manual/footer.html
 share/doc/apache/manual/handler.html
 share/doc/apache/manual/header.html
-share/doc/apache/manual/host.html
+share/doc/apache/manual/images/custom_errordocs.gif
 share/doc/apache/manual/images/home.gif
 share/doc/apache/manual/images/index.gif
+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/sub.gif
 share/doc/apache/manual/index.html
 share/doc/apache/manual/install.html
-share/doc/apache/manual/install_1_1.html
 share/doc/apache/manual/invoking.html
 share/doc/apache/manual/keepalive.html
 share/doc/apache/manual/location.html
 share/doc/apache/manual/man-template.html
 share/doc/apache/manual/misc/API.html
 share/doc/apache/manual/misc/FAQ.html
+share/doc/apache/manual/misc/HTTP_Features.tsv
 share/doc/apache/manual/misc/client_block_api.html
 share/doc/apache/manual/misc/compat_notes.html
+share/doc/apache/manual/misc/custom_errordocs.html
 share/doc/apache/manual/misc/descriptors.html
 share/doc/apache/manual/misc/fin_wait_2.html
 share/doc/apache/manual/misc/footer.html
 share/doc/apache/manual/misc/header.html
 share/doc/apache/manual/misc/howto.html
 share/doc/apache/manual/misc/index.html
-share/doc/apache/manual/misc/known_bugs.html
+share/doc/apache/manual/misc/known_client_problems.html
 share/doc/apache/manual/misc/nopgp.html
 share/doc/apache/manual/misc/perf-bsd44.html
 share/doc/apache/manual/misc/perf-dec.html
+share/doc/apache/manual/misc/perf-hp.html
+share/doc/apache/manual/misc/perf-tuning.html
 share/doc/apache/manual/misc/perf.html
 share/doc/apache/manual/misc/security_tips.html
 share/doc/apache/manual/misc/vif-info.html
 share/doc/apache/manual/misc/windoz_keepalive.html
 share/doc/apache/manual/mod/core.html
+share/doc/apache/manual/mod/directive-dict.html
 share/doc/apache/manual/mod/directives.html
 share/doc/apache/manual/mod/footer.html
 share/doc/apache/manual/mod/header.html
@@ -66,7 +125,7 @@ share/doc/apache/manual/mod/mod_auth.html
 share/doc/apache/manual/mod/mod_auth_anon.html
 share/doc/apache/manual/mod/mod_auth_db.html
 share/doc/apache/manual/mod/mod_auth_dbm.html
-share/doc/apache/manual/mod/mod_auth_msql.html
+share/doc/apache/manual/mod/mod_autoindex.html
 share/doc/apache/manual/mod/mod_browser.html
 share/doc/apache/manual/mod/mod_cern_meta.html
 share/doc/apache/manual/mod/mod_cgi.html
@@ -74,6 +133,7 @@ share/doc/apache/manual/mod/mod_cookies.html
 share/doc/apache/manual/mod/mod_digest.html
 share/doc/apache/manual/mod/mod_dir.html
 share/doc/apache/manual/mod/mod_dld.html
+share/doc/apache/manual/mod/mod_dll.html
 share/doc/apache/manual/mod/mod_env.html
 share/doc/apache/manual/mod/mod_example.html
 share/doc/apache/manual/mod/mod_expires.html
@@ -81,32 +141,51 @@ share/doc/apache/manual/mod/mod_headers.html
 share/doc/apache/manual/mod/mod_imap.html
 share/doc/apache/manual/mod/mod_include.html
 share/doc/apache/manual/mod/mod_info.html
+share/doc/apache/manual/mod/mod_isapi.html
 share/doc/apache/manual/mod/mod_log_agent.html
 share/doc/apache/manual/mod/mod_log_common.html
 share/doc/apache/manual/mod/mod_log_config.html
 share/doc/apache/manual/mod/mod_log_referer.html
 share/doc/apache/manual/mod/mod_mime.html
+share/doc/apache/manual/mod/mod_mime_magic.html
+share/doc/apache/manual/mod/mod_mmap_static.html
 share/doc/apache/manual/mod/mod_negotiation.html
 share/doc/apache/manual/mod/mod_proxy.html
 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_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/multilogs.html
 share/doc/apache/manual/new_features_1_0.html
 share/doc/apache/manual/new_features_1_1.html
 share/doc/apache/manual/new_features_1_2.html
+share/doc/apache/manual/new_features_1_3.html
 share/doc/apache/manual/process-model.html
+share/doc/apache/manual/sections.html
+share/doc/apache/manual/sourcereorg.html
 share/doc/apache/manual/stopping.html
 share/doc/apache/manual/suexec.html
 share/doc/apache/manual/unixware.html
-share/doc/apache/manual/vhosts-in-depth.html
-share/doc/apache/manual/virtual-host.html
-@dirrm share/doc/apache/manual/images
-@dirrm share/doc/apache/manual/misc
-@dirrm share/doc/apache/manual/mod
-@dirrm share/doc/apache/manual
-@dirrm share/doc/apache
+share/doc/apache/manual/upgrading_to_1_3.html
+share/doc/apache/manual/vhosts/details.html
+share/doc/apache/manual/vhosts/details_1_2.html
+share/doc/apache/manual/vhosts/examples.html
+share/doc/apache/manual/vhosts/fd-limits.html
+share/doc/apache/manual/vhosts/footer.html
+share/doc/apache/manual/vhosts/header.html
+share/doc/apache/manual/vhosts/host.html
+share/doc/apache/manual/vhosts/index.html
+share/doc/apache/manual/vhosts/ip-based.html
+share/doc/apache/manual/vhosts/name-based.html
+share/doc/apache/manual/vhosts/vhosts-in-depth.html
+share/doc/apache/manual/vhosts/virtual-host.html
+share/doc/apache/manual/windows.html
+www/cgi-bin.default/printenv
+www/cgi-bin.default/test-cgi
 www/icons/README
 www/icons/a.gif
 www/icons/alert.black.gif
@@ -183,7 +262,18 @@ www/icons/uu.gif
 www/icons/uuencoded.gif
 www/icons/world1.gif
 www/icons/world2.gif
-@dirrm www/cgi-bin
-@dirrm www/data
+@exec mkdir -p %D/www/proxy
+@dirrm include/apache
+@dirrm libexec/apache
+@dirrm share/doc/apache/manual/images
+@dirrm share/doc/apache/manual/misc
+@dirrm share/doc/apache/manual/mod
+@dirrm share/doc/apache/manual/vhosts
+@dirrm share/doc/apache/manual
+@dirrm share/doc/apache
+@dirrm www/cgi-bin.default
+www/cgi-bin
+www/data
 @dirrm www/icons
+@dirrm www/proxy
 @dirrm www