From 8b20e64d2c6144fb876c7f5363452d3c422b41c5 Mon Sep 17 00:00:00 2001 From: Dirk Froemberg Date: Sat, 10 Apr 1999 07:53:03 +0000 Subject: Upgrade to Apache 1.3.6 and Apache-SSL 1.32. PR: ports/10966 Submitted by: Adam Laurie --- www/apache13-ssl/Makefile | 65 ++++----- www/apache13-ssl/distinfo | 4 +- www/apache13-ssl/files/patch-aq | 26 ++++ www/apache13-ssl/pkg-comment | 2 +- www/apache13-ssl/pkg-descr | 12 +- www/apache13-ssl/pkg-plist | 313 ++++++++++++++++++++++------------------ 6 files changed, 240 insertions(+), 182 deletions(-) create mode 100644 www/apache13-ssl/files/patch-aq diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile index e596ddad9bca..864678624cae 100644 --- a/www/apache13-ssl/Makefile +++ b/www/apache13-ssl/Makefile @@ -1,80 +1,65 @@ # New ports collection makefile for: apache-ssl HTTPSD -# Version required: apache 1.3.3 and ssl 1.28 +# Version required: 1.2.x+ # Date created: 8th November, 1998 # Whom: Adam Laurie # based on apache port by ache@nagual.pp.ru # and apache-ssl port by Mark Murray . # Oh, and with a little bit of help from Ben :) # -# $Id: Makefile,v 1.54 1999/03/13 17:11:04 billf Exp $ +# $Id: Makefile,v 1.4 1999/04/05 19:19:45 addy Exp $ -APACHE= 1.3.3 -APACHE-SSL= 1.28 +APACHE= 1.3.6 +APACHE-SSL= 1.32 DISTNAME= apache_${APACHE} PKGNAME= apache-${APACHE}+ssl_${APACHE-SSL} CATEGORIES= www security -MASTER_SITES= http://www.apache.org/dist/ \ +MASTER_SITES= ftp://www.apache.org/dist/ \ ftp://ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/ \ + ftp://ftp.gbnet.net/pub/apache/dist/ \ ftp://ftp.MASTER.pgp.net/pub/crypto/SSL/Apache-SSL/ \ + ftp://ftp.flirble.org/pub/web/apache/dist/ \ ftp://ftp.replay.com/pub/crypto/apache/Apache-SSL/ \ - ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \ - ftp://ftp.rge.com/pub/infosystems/apache/dist/ \ + ftp://ukug.uk.freebsd.org/pub/mirrors/apache/dist/ \ 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://apache.compuex.com/pub/apache/dist/ \ - ftp://apache.arctic.org/pub/apache/dist/ \ ftp://ftp.vwv.com/pub/crypto/SSL/Apache-SSL/ \ ftp://mirror.aarnet.edu.au/www/servers/apache-ssl/ \ - ftp://ftp.epix.net/pub/apache/dist/ \ - ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/ \ ftp://ftp.it.net.au/mirrors/crypto/SSL/Apache-SSL/ \ ftp://ftp.infoscience.co.jp/pub/Crypto/SSL/Apache-SSL/Apache-SSL/ \ - ftp://ftp.connectnet.com/pub/www/apache/ \ - ftp://apache.technomancer.com/mirrors/apache/dist/ \ 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/ \ - ftp://ftp.raver.net/pub/ftp.apache.org/ \ - ftp://www3.service.digital.com/apache/dist/ \ http://mirror.aarnet.edu.au/www/servers/apache-ssl/ \ http://ftp.it.net.au/mirrors/crypto/SSL/Apache-SSL/ \ - ftp://galileo.galilei.com/pub/apache/ \ - ftp://ftp.mtnranch.net/pub/apache/dist/ \ - ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \ - ftp://apache.nextpath.com/pub/apache/dist/ \ http://www.asap.cs.nott.ac.uk/SSL/ +Y2K= http://www.apache-ssl.org/#Y2K + DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ apache_${APACHE}+ssl_${APACHE-SSL}${EXTRACT_SUFX} MAINTAINER= adam@algroup.co.uk - +BUILD_DEPENDS= ${PREFIX}/lib/libcrypto.a:${PORTSDIR}/security/openssl \ + ${PREFIX}/lib/libssl.a:${PORTSDIR}/security/openssl RUN_DEPENDS= openssl:${PORTSDIR}/security/openssl -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -RESTRICTED= "Contains cryptography" - -# -# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance -# - -HAS_CONFIGURE= yes -CONFIGURE_ARGS= \ +HAS_CONFIGURE= yes +CONFIGURE_ARGS= \ --prefix=${PREFIX} \ + --with-layout=GNU \ --sysconfdir=${PREFIX}/etc/apache \ --includedir=${PREFIX}/include/apache \ - --logfiledir=/var/log \ - --runtimedir=/var/run \ + --localstatedir=/var \ --datadir=${PREFIX}/www \ + --suexec-docroot=${PREFIX}/www/data \ --proxycachedir=${PREFIX}/www/proxy \ --libexecdir=${PREFIX}/libexec/apache \ --without-confadjust \ --enable-shared=remain \ --enable-module=most \ --enable-module=auth_db \ - --disable-module=auth_dbm \ + --disable-module=auth_dbm OPTIM=-DHARD_SERVER_LIMIT=512 \ -DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \ @@ -85,12 +70,17 @@ OPTIM+= -DBUFFERED_LOGS CFLAGS+= -O6 -fomit-frame-pointer .endif -CONFIGURE_ENV+= OPTIM='${OPTIM}' +CONFIGURE_ENV= OPTIM='${OPTIM}' -MAN1= ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1 +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} + +RESTRICTED= "Contains cryptography" + +MAN1= dbmmanage.1 htdigest.1 htpasswd.1 +MAN8= ab.8 httpsdctl.8 apxs.8 httpsd.8 logresolve.8 rotatelogs.8 -.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES pre-fetch: +.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES @${ECHO} @${ECHO} "*** Warning!" @${ECHO} You must set variable USA_RESIDENT to YES if you are USA @@ -107,7 +97,7 @@ post-extract: @cd ${WRKSRC} && tar xzf ${DISTDIR}/apache_${APACHE}+ssl_${APACHE-SSL}${EXTRACT_SUFX} post-patch: - @cd ${WRKSRC} && ./FixPatch ${PREFIX} + @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ./FixPatch certificate: @if [ -f ${PREFIX}/lib/openssl.cnf ]; then \ @@ -115,6 +105,5 @@ certificate: ${CP} ${WRKSRC}/SSLconf/conf/httpsd.pem ${PREFIX}/certs/cert.pem; \ else \ ${ECHO} "You must create the file ${PREFIX}/lib/openssl.cnf first."; \ - fi .include diff --git a/www/apache13-ssl/distinfo b/www/apache13-ssl/distinfo index 6cd5f154ddfa..4acbc5776c36 100644 --- a/www/apache13-ssl/distinfo +++ b/www/apache13-ssl/distinfo @@ -1,2 +1,2 @@ -MD5 (apache_1.3.3.tar.gz) = bb6f14bbb369097a55969482d395d1ae -MD5 (apache_1.3.3+ssl_1.28.tar.gz) = eb9cd9254763268f739afeb9bb0cd155 +MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643 +MD5 (apache_1.3.6+ssl_1.32.tar.gz) = 28ab03ea49cd923ccac16275790f42e8 diff --git a/www/apache13-ssl/files/patch-aq b/www/apache13-ssl/files/patch-aq new file mode 100644 index 000000000000..7ffd4f220bc3 --- /dev/null +++ b/www/apache13-ssl/files/patch-aq @@ -0,0 +1,26 @@ +--- FixPatch.orig Mon Jan 18 17:22:23 1999 ++++ FixPatch Wed Apr 7 21:50:59 1999 +@@ -15,7 +15,7 @@ + SSL_ABS_PATHS="/usr/local/*/SSLeay-* /usr/local/*/*/SSLeay-* /opt/*/SSLeay-* + /opt/*/*/SSLeay-* /usr/local/*/openssl-* /usr/local/*/*/openssl-* + /opt/*/openssl-* /opt/*/*/openssl-*"; +-SSL_INST_DIR=/usr/local/ssl ++SSL_INST_DIR="/usr/local/ssl $PREFIX" + + # Sort the paths + RELDIRS=`echo $SSL_REL_PATHS | xargs -n 1 echo | sort -r` +@@ -111,13 +111,6 @@ + echo "Your version of patch is out-of-date. You need patch 2.1 or 2.5." + fi + +-echo -n "Do you want me to apply the fixed-up Apache-SSL patch for you? [n] " +-read ans +-echo $ans | grep -i "^[ \t]*y" >/dev/null +-if [ $? = 0 ]; then +- patch -p1