From e3b6d84e850a7e79f6f3db32d64d8df58693ad26 Mon Sep 17 00:00:00 2001 From: Steve Price Date: Mon, 27 Sep 1999 02:21:33 +0000 Subject: Update this to version 1.3.9+1.37. PR: 13804 Submitted by: maintainer --- www/apache13-ssl/Makefile | 17 ++++++++--------- www/apache13-ssl/distinfo | 4 ++-- www/apache13-ssl/files/patch-ar | 11 +++++++++++ www/apache13-ssl/pkg-plist | 17 +++++++++++++++++ 4 files changed, 38 insertions(+), 11 deletions(-) create mode 100644 www/apache13-ssl/files/patch-ar (limited to 'www') diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile index b5727823835c..ad3570c8126a 100644 --- a/www/apache13-ssl/Makefile +++ b/www/apache13-ssl/Makefile @@ -8,8 +8,8 @@ # # $FreeBSD$ -APACHE= 1.3.6 -APACHE-SSL= 1.35 +APACHE= 1.3.9 +APACHE-SSL= 1.37 DISTNAME= apache_${APACHE} PKGNAME= apache+ssl-${APACHE}+${APACHE-SSL} @@ -28,10 +28,7 @@ MASTER_SITES= ftp://www.apache.org/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.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/ + ftp://apache-ssl.raver.net/pub/ftp.apache-ssl.org/Apache-SSL/ Y2K= http://www.apache-ssl.org/#Y2K @@ -40,6 +37,8 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= adam@algroup.co.uk +BUILD_DEPENDS= openssl:${PORTSDIR}/security/openssl + BUILD_DEPENDS= ${PREFIX}/lib/libcrypto.a:${PORTSDIR}/security/openssl \ ${PREFIX}/lib/libssl.a:${PORTSDIR}/security/openssl RUN_DEPENDS= openssl:${PORTSDIR}/security/openssl @@ -72,6 +71,9 @@ CFLAGS+= -O6 -fomit-frame-pointer .endif CONFIGURE_ENV= OPTIM='${OPTIM}' +.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES +MAKE_ENV+=EXTRA_SSL_LIBS="-lRSAglue -lrsaref" +.endif EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -96,9 +98,6 @@ pre-configure: @${ECHO} @${ECHO} .endif -.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES -CONFIGURE_ENV=LDFLAGS="${LDFLAGS} -L/usr/local/lib -lRSAglue -lrsaref" -.endif certificate: @if [ -f ${PREFIX}/lib/openssl.cnf ]; then \ diff --git a/www/apache13-ssl/distinfo b/www/apache13-ssl/distinfo index dc28ab74129d..33c4b80aebe5 100644 --- a/www/apache13-ssl/distinfo +++ b/www/apache13-ssl/distinfo @@ -1,2 +1,2 @@ -MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643 -MD5 (apache_1.3.6+ssl_1.35.tar.gz) = ecf16c247f02c41b2b2a3f84030b9dc5 +MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32 +MD5 (apache_1.3.9+ssl_1.37.tar.gz) = 921442231677fb06d52e8640f66f6528 diff --git a/www/apache13-ssl/files/patch-ar b/www/apache13-ssl/files/patch-ar new file mode 100644 index 000000000000..d1f2bdc79cc9 --- /dev/null +++ b/www/apache13-ssl/files/patch-ar @@ -0,0 +1,11 @@ +--- SSLpatch.orig Thu Sep 9 14:40:45 1999 ++++ SSLpatch Sun Sep 26 20:21:09 1999 +@@ -95,7 +95,7 @@ + +SSL_INCLUDE= -I$(SSL_BASE)/include + +SSL_CFLAGS= -DAPACHE_SSL + +SSL_LIB_DIR= $(SSL_BASE) +-+SSL_LIBS= -L$(SSL_LIB_DIR) -lssl -lcrypto +++SSL_LIBS= -L$(SSL_LIB_DIR) -lssl -lcrypto $(EXTRA_SSL_LIBS) + +SSL_APP_DIR= $(SSL_BASE)/apps + +SSL_APP=/usr/home/ben/work/openssl/apps/openssl + + diff --git a/www/apache13-ssl/pkg-plist b/www/apache13-ssl/pkg-plist index aecc9226ad53..60153b31debe 100644 --- a/www/apache13-ssl/pkg-plist +++ b/www/apache13-ssl/pkg-plist @@ -14,6 +14,7 @@ include/apache/ap_config_auto.h include/apache/ap_ctype.h include/apache/ap_md5.h include/apache/ap_mmn.h +include/apache/ap_sha1.h include/apache/buff.h include/apache/compat.h include/apache/conf.h @@ -39,6 +40,18 @@ include/apache/util_date.h include/apache/util_md5.h include/apache/util_script.h include/apache/util_uri.h +include/apache/xml/asciitab.h +include/apache/xml/hashtable.h +include/apache/xml/iasciitab.h +include/apache/xml/latin1tab.h +include/apache/xml/nametab.h +include/apache/xml/utf8tab.h +include/apache/xml/xmldef.h +include/apache/xml/xmlparse.h +include/apache/xml/xmlrole.h +include/apache/xml/xmltok.h +include/apache/xml/xmltok_impl.h +libexec/apache/httpd.exp libexec/apache/libproxy.so libexec/apache/mod_auth_anon.so libexec/apache/mod_auth_db.so @@ -52,6 +65,7 @@ libexec/apache/mod_rewrite.so libexec/apache/mod_speling.so libexec/apache/mod_unique_id.so libexec/apache/mod_usertrack.so +libexec/apache/mod_vhost_alias.so sbin/ab sbin/httpsdctl sbin/apxs @@ -77,6 +91,7 @@ www/htdocs/manual/mod/mod_auth.html www/htdocs/manual/mod/mod_auth_anon.html www/htdocs/manual/mod/mod_auth_db.html www/htdocs/manual/mod/mod_auth_dbm.html +www/htdocs/manual/mod/mod_auth_digest.html www/htdocs/manual/mod/mod_autoindex.html www/htdocs/manual/mod/mod_browser.html www/htdocs/manual/mod/mod_cern_meta.html @@ -111,6 +126,7 @@ www/htdocs/manual/mod/mod_status.html www/htdocs/manual/mod/mod_unique_id.html www/htdocs/manual/mod/mod_userdir.html www/htdocs/manual/mod/mod_usertrack.html +www/htdocs/manual/mod/mod_vhost_alias.html www/htdocs/manual/LICENSE www/htdocs/manual/bind.html www/htdocs/manual/cgi_path.html @@ -302,6 +318,7 @@ www/cgi-bin/printenv www/cgi-bin/test-cgi @exec mkdir -p %D/www/proxy @dirrm etc/apache +@dirrm include/apache/xml @dirrm include/apache @dirrm libexec/apache @dirrm www/cgi-bin -- cgit v1.2.3