Skip site navigation (1)Skip section navigation (2)
Date:      16 Apr 2000 18:46:16 -0000
From:      adam@algroup.co.uk
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/18036: update port to apache_1.3.12+ssl-1.40
Message-ID:  <20000416184616.3838.qmail@sepulchre.aldigital.co.uk>

next in thread | raw e-mail | index | archive | help

>Number:         18036
>Category:       ports
>Synopsis:       another attempty to get this port up to date
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 16 11:50:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Adam Laurie
>Release:        FreeBSD current
>Organization:
apache-ssl.org
>Environment:
>Description:
 
 diff -ru --exclude=CVS apache13-ssl-previous/Makefile apache13-ssl/Makefile
 --- apache13-ssl-previous/Makefile	Sat Feb 12 11:26:45 2000
 +++ apache13-ssl/Makefile	Sun Apr 16 18:43:14 2000
 @@ -8,18 +8,19 @@
  #
  # $FreeBSD: ports/www/apache13-ssl/Makefile,v 1.63 2000/02/12 09:02:43 kris Exp $
  
 -APACHE= 	1.3.9
 -APACHE-SSL=	1.37
 +APACHE= 	1.3.12
 +APACHE-SSL=	1.40
  
  DISTNAME=       apache_${APACHE}
  PKGNAME=        apache+ssl-${APACHE}+${APACHE-SSL}
  CATEGORIES=	www security
  MASTER_SITES=   ftp://www.apache.org/dist/ \
  		ftp://ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/ \
 +		ftp://src.doc.ic.ac.uk/packages/apache/dist/ \
  		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.zedz.net/pub/crypto/apache/Apache-SSL/ \
  		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/ \
 @@ -28,7 +29,13 @@
  		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/
 +		ftp://apache-ssl.raver.net/pub/ftp.apache-ssl.org/Apache-SSL/ \
 +		ftp://ftp.pca.dfn.de/pub/tools/net/sslapache/Apache-SSL/ \
 +		ftp://ftp.sekure.net/pub/apache-ssl/ \
 +		ftp://ftp.clinet.fi/mirrors/ftp.apache-ssl.org/pub/ \
 +		ftp://opensores.thebunker.net/pub/mirrors/apache-ssl \
 +		ftp://ftp.gin.cz/pub/MIRRORS/ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL \
 +		ftp://ftp.cordef.com.pl/pub/apache-ssl/Apache-SSL
  
  Y2K=		http://www.apache-ssl.org/#Y2K
  
 @@ -41,7 +48,16 @@
  .include <bsd.port.pre.mk>
  
  HAS_CONFIGURE=	yes
 +
 +.if !defined(OPENSSLINC)
 +OPENSSLINC=/usr/local/ssl/include
 +.endif
  CFLAGS+=	-I${OPENSSLINC}/openssl
 +
 +.if !defined(OPENSSLLIB)
 +OPENSSLLIB=/usr/local/ssl/lib
 +.endif
 +
  CONFIGURE_ARGS=	\
  		--prefix=${PREFIX} \
  		--with-layout=GNU \
 @@ -70,6 +86,8 @@
  CONFIGURE_ENV= OPTIM='${OPTIM}'
  .if defined(OPENSSL_RSAREF)
  CONFIGURE_ENV+= EXTRA_SSL_LIBS="-L${OPENSSLLIB} -lRSAglue -L${LOCALBASE}/lib -lrsaref"
 +.else
 +CONFIGURE_ENV+= EXTRA_SSL_LIBS="-L${OPENSSLLIB} -L${LOCALBASE}/lib"
  .endif
  
  EXTRACT_ONLY=   ${DISTNAME}${EXTRACT_SUFX}
 diff -ru --exclude=CVS apache13-ssl-previous/files/md5 apache13-ssl/files/md5
 --- apache13-ssl-previous/files/md5	Mon Sep 27 11:16:27 1999
 +++ apache13-ssl/files/md5	Sun Apr 16 19:39:50 2000
 @@ -1,2 +1,2 @@
 -MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32
 -MD5 (apache_1.3.9+ssl_1.37.tar.gz) = 921442231677fb06d52e8640f66f6528
 +MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2
 +MD5 (apache_1.3.12+ssl_1.40.tar.gz) = de6d24d2f590984ad08f0a87969253be
 diff -ru --exclude=CVS apache13-ssl-previous/patches/patch-ar apache13-ssl/patches/patch-ar
 --- apache13-ssl-previous/patches/patch-ar	Sat Feb 12 11:26:45 2000
 +++ apache13-ssl/patches/patch-ar	Sun Feb 13 21:23:08 2000
 @@ -5,7 +5,7 @@
   +SSL_CFLAGS= -DAPACHE_SSL
   +SSL_LIB_DIR= $(SSL_BASE)
  -+SSL_LIBS= -L$(SSL_LIB_DIR) -lssl -lcrypto
 -++SSL_LIBS= -L$(OPENSSLLIB) -lssl -lcrypto $(EXTRA_SSL_LIBS)
 +++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 -ru --exclude=CVS apache13-ssl-previous/patches/patch-as apache13-ssl/patches/patch-as
 --- apache13-ssl-previous/patches/patch-as	Wed Nov  3 06:58:40 1999
 +++ apache13-ssl/patches/patch-as	Sun Feb 13 21:23:08 2000
 @@ -1,11 +1,10 @@
 ---- configure.org       Wed Nov  3 14:52:06 1999
 -+++ configure   Wed Nov  3 14:52:26 1999
 -@@ -1086,7 +1086,7 @@
 - ##  UID/GID as production oriented as a web server in NIS anyway.
 +--- configure.org       Sun Feb 13 11:11:46 2000
 ++++ configure   Sun Feb 13 11:12:16 2000
 +@@ -366,8 +366,8 @@
   ##
 - conf_user="nobody"
 --conf_group="#-1"
 + ##  Initialize server user ID and group ID variables
 + ##
 +-conf_user=""
 +-conf_group=""
 ++conf_user="nobody"
  +conf_group="nogroup"
 - conf_port="80"
 - conf_serveradmin="you@your.address"
 - conf_servername="new.host.name"
 diff -ru --exclude=CVS apache13-ssl-previous/pkg/COMMENT apache13-ssl/pkg/COMMENT
 --- apache13-ssl-previous/pkg/COMMENT	Sat Jun 26 23:53:08 1999
 +++ apache13-ssl/pkg/COMMENT	Tue Apr  6 09:11:29 1999
 @@ -1 +1 @@
 -Apache-SSL: Apache secure webserver integrating OpenSSL
 +Apache-SSL: Apache secure webserver integrating OpenSSL.
 diff -ru --exclude=CVS apache13-ssl-previous/pkg/PLIST apache13-ssl/pkg/PLIST
 --- apache13-ssl-previous/pkg/PLIST	Mon Sep 27 11:16:27 1999
 +++ apache13-ssl/pkg/PLIST	Thu Mar  9 20:47:33 2000
 @@ -41,42 +41,58 @@
  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/xmlrole.h
 +include/apache/xml/xmlparse.h
 +include/apache/xml/xmldef.h
 +include/apache/xml/utf8tab.h
 +include/apache/xml/nametab.h
 +include/apache/xml/latin1tab.h
 +include/apache/xml/iasciitab.h
 +include/apache/xml/hashtable.h
  include/apache/xml/xmltok_impl.h
  libexec/apache/httpd.exp
 -libexec/apache/libproxy.so
 +libexec/apache/mod_vhost_alias.so
 +libexec/apache/mod_mime_magic.so
 +libexec/apache/mod_info.so
 +libexec/apache/mod_speling.so
 +libexec/apache/mod_rewrite.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/libproxy.so
 +libexec/apache/mod_cern_meta.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
 -libexec/apache/mod_vhost_alias.so
 +libexec/apache/mod_unique_id.so
  sbin/ab
 -sbin/httpsdctl
  sbin/apxs
 +sbin/gcache
  sbin/httpsd
 +sbin/httpsdctl
  sbin/logresolve
  sbin/rotatelogs
  @exec mkdir -p %D/www
  @exec ln -fs %B %D/www/data.default
  @unexec rm -f %D/www/data.default
  www/htdocs/apache_pb.gif
 -www/htdocs/index.html
 +www/htdocs/index.html.ca
 +www/htdocs/index.html.cz
 +www/htdocs/index.html.de
 +www/htdocs/index.html.dk
 +www/htdocs/index.html.ee
 +www/htdocs/index.html.en
 +www/htdocs/index.html.es
 +www/htdocs/index.html.fr
 +www/htdocs/index.html.it
 +www/htdocs/index.html.po.iso-pl
 +www/htdocs/index.html.ja.jis
 +www/htdocs/index.html.lu
 +www/htdocs/index.html.nl
 +www/htdocs/index.html.pt
 +www/htdocs/index.html.pt-br
 +www/htdocs/index.html.se
  www/htdocs/manual/mod/core.html
  www/htdocs/manual/mod/directive-dict.html
  www/htdocs/manual/mod/directives.html
 @@ -91,10 +107,10 @@
  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
 +www/htdocs/manual/mod/mod_so.html
  www/htdocs/manual/mod/mod_cgi.html
  www/htdocs/manual/mod/mod_cookies.html
  www/htdocs/manual/mod/mod_digest.html
 @@ -120,13 +136,11 @@
  www/htdocs/manual/mod/mod_proxy.html
  www/htdocs/manual/mod/mod_rewrite.html
  www/htdocs/manual/mod/mod_setenvif.html
 -www/htdocs/manual/mod/mod_so.html
  www/htdocs/manual/mod/mod_speling.html
  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
 @@ -170,27 +184,27 @@
  www/htdocs/manual/images/mod_rewrite_fig2.gif
  www/htdocs/manual/images/sub.gif
  www/htdocs/manual/misc/API.html
 +www/htdocs/manual/misc/fin_wait_2.html
  www/htdocs/manual/misc/FAQ.html
 -www/htdocs/manual/misc/HTTP_Features.tsv
 +www/htdocs/manual/misc/known_client_problems.html
  www/htdocs/manual/misc/client_block_api.html
  www/htdocs/manual/misc/compat_notes.html
  www/htdocs/manual/misc/custom_errordocs.html
  www/htdocs/manual/misc/descriptors.html
 -www/htdocs/manual/misc/fin_wait_2.html
 +www/htdocs/manual/misc/HTTP_Features.tsv
  www/htdocs/manual/misc/footer.html
  www/htdocs/manual/misc/header.html
  www/htdocs/manual/misc/howto.html
  www/htdocs/manual/misc/index.html
 -www/htdocs/manual/misc/known_client_problems.html
 -www/htdocs/manual/misc/nopgp.html
  www/htdocs/manual/misc/perf-bsd44.html
 +www/htdocs/manual/misc/nopgp.html
 +www/htdocs/manual/misc/perf-tuning.html
  www/htdocs/manual/misc/perf-dec.html
  www/htdocs/manual/misc/perf-hp.html
 -www/htdocs/manual/misc/perf-tuning.html
  www/htdocs/manual/misc/perf.html
 +www/htdocs/manual/misc/windoz_keepalive.html
  www/htdocs/manual/misc/security_tips.html
  www/htdocs/manual/misc/vif-info.html
 -www/htdocs/manual/misc/windoz_keepalive.html
  www/htdocs/manual/search/manual-index.cgi
  www/htdocs/manual/vhosts/details.html
  www/htdocs/manual/vhosts/details_1_2.html
 @@ -205,6 +219,10 @@
  www/htdocs/manual/vhosts/name-based.html
  www/htdocs/manual/vhosts/vhosts-in-depth.html
  www/htdocs/manual/vhosts/virtual-host.html
 +www/htdocs/manual/mod/mod_auth_digest.html
 +www/htdocs/manual/mod/mod_vhost_alias.html
 +www/htdocs/manual/netware.html
 +www/htdocs/manual/misc/rewriteguide.html
  www/icons/README
  www/icons/a.gif
  www/icons/alert.black.gif
 
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000416184616.3838.qmail>