From owner-svn-ports-head@freebsd.org Sun Mar 3 14:59:56 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 35AC1150D4B0; Sun, 3 Mar 2019 14:59:56 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C825A87966; Sun, 3 Mar 2019 14:59:55 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BA4531E2EF; Sun, 3 Mar 2019 14:59:55 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x23ExtRo085076; Sun, 3 Mar 2019 14:59:55 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x23ExsRE085071; Sun, 3 Mar 2019 14:59:54 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201903031459.x23ExsRE085071@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 3 Mar 2019 14:59:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494511 - in head/www/trafficserver: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: in head/www/trafficserver: . files X-SVN-Commit-Revision: 494511 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C825A87966 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.94)[-0.942,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Mar 2019 14:59:56 -0000 Author: pi Date: Sun Mar 3 14:59:54 2019 New Revision: 494511 URL: https://svnweb.freebsd.org/changeset/ports/494511 Log: www/trafficserver: upgrade 6.2.3 -> 8.0.2 PR: 236049 Submitted by: Hung-Yi Chen (maintainer) Reviewed by: meta, pi Relnotes: https://cwiki.apache.org/confluence/display/TS/What%27s+New+in+v7.0.x https://cwiki.apache.org/confluence/display/TS/What%27s+New+in+v7.1.x https://cwiki.apache.org/confluence/display/TS/What%27s+New+in+v8.0.x Deleted: head/www/trafficserver/files/patch-lib__luajit__src__Makefile head/www/trafficserver/files/patch-lib__perl__Makefile.in Modified: head/www/trafficserver/Makefile head/www/trafficserver/distinfo head/www/trafficserver/files/trafficserver.in head/www/trafficserver/pkg-descr head/www/trafficserver/pkg-plist Modified: head/www/trafficserver/Makefile ============================================================================== --- head/www/trafficserver/Makefile Sun Mar 3 13:58:21 2019 (r494510) +++ head/www/trafficserver/Makefile Sun Mar 3 14:59:54 2019 (r494511) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= trafficserver -PORTVERSION= 6.2.3 +PORTVERSION= 8.0.2 CATEGORIES= www MASTER_SITES= APACHE/${PORTNAME} @@ -11,22 +11,27 @@ COMMENT= Fast, scalable and extensible HTTP proxy serv LICENSE= APACHE20 +ONLY_FOR_ARCHS= amd64 + LIB_DEPENDS= libcurl.so:ftp/curl \ libhwloc.so:devel/hwloc \ + libluajit-5.1.so:lang/luajit \ libpcre.so:devel/pcre \ - libxml2.so:textproc/libxml2 + libxml2.so:textproc/libxml2 \ + libbrotlienc.so:archivers/brotli -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -USES= cpe gmake libtool ncurses pathfix perl5 pkgconfig \ - sqlite ssl tar:bzip2 tcl +USES= compiler:c++17-lang cpe gmake libtool ncurses pathfix \ + perl5 pkgconfig sqlite ssl tar:bzip2 tcl + CPE_VENDOR= apache CPE_PRODUCT= traffic_server +USE_GCC= 7+ USE_PERL5= build run USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} -ONLY_FOR_ARCHS= amd64 +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip USERS= ${WWWOWN} GROUPS= ${WWWGRP} @@ -38,17 +43,50 @@ CONFIGURE_ARGS= --with-libxml2=${LOCALBASE} \ --with-openssl=${OPENSSLBASE} \ --with-xml=libxml2 \ --with-tcl=${TCL_LIBDIR} \ - --enable-cppapi \ --localstatedir=/var \ --with-user=${USERS} \ - --with-group=${GROUPS} + --with-group=${GROUPS} \ + --disable-maintainer-mode \ + --disable-dependency-tracking \ + --enable-mime-sanity-check \ + --enable-experimental-plugins -OPTIONS_DEFINE= DOCS WCCP +OPTIONS_DEFINE= DOCS WCCP MEMCACHED IMAGEMAGICK X11 +OPTIONS_SUB= yes WCCP_DESC= Enable WCCPv2 protocol - WCCP_CONFIGURE_ENABLE= wccp +MEMCACHED_DESC= Enable memcache & memcached_remap plugin + +IMAGEMAGICK_DESC= Enable ats-magick & webp convert plugin + +.include + +.if ${PORT_OPTIONS:MMEMCACHED} +LIB_DEPENDS+= libmemcached.so:databases/libmemcached +PLIST_SUB+= MEMCACHED="" +.else +PLIST_SUB+= MEMCACHED="@comment " +.endif + +.if ${PORT_OPTIONS:MIMAGEMAGICK} +.if ${PORT_OPTIONS:MX11} +RUN_DEPENDS+= ${LOCALBASE}/bin/convert:graphics/ImageMagick6 +.else +RUN_DEPENDS+= ${LOCALBASE}/bin/convert:graphics/ImageMagick6-nox11 +.endif +PLIST_SUB+= IMAGEMAGICK="" +.else +PLIST_SUB+= IMAGEMAGICK="@comment " +.endif + +.if ${PORT_OPTIONS:MWCCP} +PLIST_SUB+= WCCP="" +.else +PLIST_SUB+= WCCP="@comment " +.endif + post-patch: @${REINPLACE_CMD} \ -e '/cachedir:/s,$${localstatedir}+,$${localstatedir}/cache+,' \ @@ -57,9 +95,12 @@ post-patch: @${REINPLACE_CMD} '/^LUA_LDFLAGS =/s/$$/ @LDFLAGS@/' \ ${WRKSRC}/lib/Makefile.in + post-install: - @${RMDIR} ${STAGEDIR}${DATADIR} - @${MKDIR} ${STAGEDIR}${ETCDIR}/snapshots - (cd ${STAGEDIR}${ETCDIR} && for f in *.config *.config.xml; do ${MV} $$f $$f.sample; done) + ${RMDIR} ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${ETCDIR}/snapshots + (cd ${STAGEDIR}${ETCDIR} && for f in *.config *.yaml; do ${MV} $$f $$f.sample; done) + ${SED} -i '' -e 's|^${STAGEDIR}||g' \ + ${STAGEDIR}${PREFIX}/lib/perl5/amd64-freebsd-thread-multi/auto/Apache/TS/.packlist -.include +.include Modified: head/www/trafficserver/distinfo ============================================================================== --- head/www/trafficserver/distinfo Sun Mar 3 13:58:21 2019 (r494510) +++ head/www/trafficserver/distinfo Sun Mar 3 14:59:54 2019 (r494511) @@ -1,3 +1,3 @@ -TIMESTAMP = 1536003051 -SHA256 (trafficserver-6.2.3.tar.bz2) = 333875815e62cecda480b0626f72c7d5a730544d92a80aef6dcccdad6216190d -SIZE (trafficserver-6.2.3.tar.bz2) = 8433443 +TIMESTAMP = 1551158324 +SHA256 (trafficserver-8.0.2.tar.bz2) = bad24d1cf03f6bf9567848d4dd4f5284468c92f51c2844263cd1c0ff485ba552 +SIZE (trafficserver-8.0.2.tar.bz2) = 8917575 Modified: head/www/trafficserver/files/trafficserver.in ============================================================================== --- head/www/trafficserver/files/trafficserver.in Sun Mar 3 13:58:21 2019 (r494510) +++ head/www/trafficserver/files/trafficserver.in Sun Mar 3 14:59:54 2019 (r494511) @@ -12,10 +12,10 @@ rcvar=trafficserver_enable name="trafficserver" trafficserver_enable=${trafficserver_enable:-"NO"} -pidfile="/var/run/trafficserver/traffic_cop.lock" +pidfile="/var/run/trafficserver/traffic_manager.lock" command=/usr/sbin/daemon -command_args="-p ${pidfile} %%PREFIX%%/bin/traffic_cop" -procname="%%PREFIX%%/bin/traffic_cop" +command_args="-p ${pidfile} %%PREFIX%%/bin/traffic_manager" +procname="%%PREFIX%%/bin/traffic_manager" load_rc_config "$name" run_rc_command "$1" Modified: head/www/trafficserver/pkg-descr ============================================================================== --- head/www/trafficserver/pkg-descr Sun Mar 3 13:58:21 2019 (r494510) +++ head/www/trafficserver/pkg-descr Sun Mar 3 14:59:54 2019 (r494511) @@ -3,4 +3,4 @@ cache that improves network efficiency and performance by caching frequently-accessed information at the edge of the network. -WWW: http://trafficserver.apache.org/ +WWW: https://trafficserver.apache.org/ Modified: head/www/trafficserver/pkg-plist ============================================================================== --- head/www/trafficserver/pkg-plist Sun Mar 3 13:58:21 2019 (r494510) +++ head/www/trafficserver/pkg-plist Sun Mar 3 14:59:54 2019 (r494511) @@ -1,17 +1,15 @@ @postunexec if [ ! -s %D/%%ETCDIR%%/proxy.pac ]; then rm -f %D/%%ETCDIR%%/proxy.pac; fi -bin/header_rewrite_test -bin/traffic_cop +bin/traffic_cache_tool bin/traffic_crashlog bin/traffic_ctl bin/traffic_layout -bin/traffic_line bin/traffic_logcat bin/traffic_logstats bin/traffic_manager -bin/traffic_sac bin/traffic_server bin/traffic_top bin/traffic_via +%%WCCP%%bin/traffic_wccp bin/trafficserver bin/tspush bin/tsxs @@ -25,7 +23,6 @@ bin/tsxs @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/access#ssl_forbidden @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/cache#not_in_cache @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/cache#read_error -@(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/congestion#retryAfter @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/connect#dns_failed @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/connect#failed_connect @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/connect#hangup @@ -46,14 +43,9 @@ bin/tsxs @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/transcoding#unsupported @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/urlrouting#no_mapping @sample %%ETCDIR%%/cache.config.sample -@sample %%ETCDIR%%/cluster.config.sample -@sample %%ETCDIR%%/congestion.config.sample @sample %%ETCDIR%%/hosting.config.sample -@sample %%ETCDIR%%/icp.config.sample @sample %%ETCDIR%%/ip_allow.config.sample -@sample %%ETCDIR%%/log_hosts.config.sample -@sample %%ETCDIR%%/logs_xml.config.sample -@sample %%ETCDIR%%/metrics.config.sample +@sample %%ETCDIR%%/logging.yaml.sample @sample %%ETCDIR%%/parent.config.sample @sample %%ETCDIR%%/plugin.config.sample @sample %%ETCDIR%%/records.config.sample @@ -61,97 +53,124 @@ bin/tsxs @sample %%ETCDIR%%/socks.config.sample @sample %%ETCDIR%%/splitdns.config.sample @sample %%ETCDIR%%/ssl_multicert.config.sample -@sample %%ETCDIR%%/stats.config.xml.sample +@sample %%ETCDIR%%/ssl_server_name.yaml.sample @sample %%ETCDIR%%/storage.config.sample -@sample %%ETCDIR%%/vaddrs.config.sample @sample %%ETCDIR%%/volume.config.sample -include/atscppapi/Async.h -include/atscppapi/AsyncHttpFetch.h -include/atscppapi/AsyncTimer.h -include/atscppapi/CaseInsensitiveStringComparator.h -include/atscppapi/ClientRequest.h -include/atscppapi/GlobalPlugin.h -include/atscppapi/GzipDeflateTransformation.h -include/atscppapi/GzipInflateTransformation.h -include/atscppapi/Headers.h -include/atscppapi/HttpMethod.h -include/atscppapi/HttpStatus.h -include/atscppapi/HttpVersion.h -include/atscppapi/InterceptPlugin.h -include/atscppapi/Logger.h -include/atscppapi/Mutex.h -include/atscppapi/Plugin.h -include/atscppapi/PluginInit.h -include/atscppapi/RemapPlugin.h -include/atscppapi/Request.h -include/atscppapi/Response.h -include/atscppapi/Stat.h -include/atscppapi/Transaction.h -include/atscppapi/TransactionPlugin.h -include/atscppapi/TransformationPlugin.h -include/atscppapi/Url.h -include/atscppapi/noncopyable.h -include/atscppapi/shared_ptr.h -include/atscppapi/utils.h include/ts/apidefs.h include/ts/experimental.h include/ts/mgmtapi.h include/ts/remap.h include/ts/ts.h -lib/libatscppapi.so -lib/libatscppapi.so.6 -lib/libatscppapi.so.%%PORTVERSION%% +include/tscpp/api/Async.h +include/tscpp/api/AsyncHttpFetch.h +include/tscpp/api/AsyncTimer.h +include/tscpp/api/CaseInsensitiveStringComparator.h +include/tscpp/api/ClientRequest.h +include/tscpp/api/Continuation.h +include/tscpp/api/GlobalPlugin.h +include/tscpp/api/GzipDeflateTransformation.h +include/tscpp/api/GzipInflateTransformation.h +include/tscpp/api/Headers.h +include/tscpp/api/HttpMethod.h +include/tscpp/api/HttpStatus.h +include/tscpp/api/HttpVersion.h +include/tscpp/api/InterceptPlugin.h +include/tscpp/api/Logger.h +include/tscpp/api/Plugin.h +include/tscpp/api/PluginInit.h +include/tscpp/api/RemapPlugin.h +include/tscpp/api/Request.h +include/tscpp/api/Response.h +include/tscpp/api/Stat.h +include/tscpp/api/Transaction.h +include/tscpp/api/TransactionPlugin.h +include/tscpp/api/TransformationPlugin.h +include/tscpp/api/Url.h +include/tscpp/api/noncopyable.h +include/tscpp/api/utils.h +include/tscpp/util/TextView.h lib/libtsconfig.so -lib/libtsconfig.so.6 +lib/libtsconfig.so.8 lib/libtsconfig.so.%%PORTVERSION%% +lib/libtscore.so +lib/libtscore.so.8 +lib/libtscore.so.%%PORTVERSION%% +lib/libtscppapi.so +lib/libtscppapi.so.8 +lib/libtscppapi.so.%%PORTVERSION%% +lib/libtscpputil.so +lib/libtscpputil.so.8 +lib/libtscpputil.so.%%PORTVERSION%% lib/libtsmgmt.so -lib/libtsmgmt.so.6 +lib/libtsmgmt.so.8 lib/libtsmgmt.so.%%PORTVERSION%% -lib/libtsutil.so -lib/libtsutil.so.6 -lib/libtsutil.so.%%PORTVERSION%% libdata/pkgconfig/trafficserver.pc -libexec/trafficserver/AsyncHttpFetch.so -libexec/trafficserver/AsyncHttpFetchStreaming.so -libexec/trafficserver/AsyncTimer.so -libexec/trafficserver/ClientRedirect.so -libexec/trafficserver/ClientRequest.so -libexec/trafficserver/CustomErrorRemapPlugin.so -libexec/trafficserver/CustomResponse.so -libexec/trafficserver/GlobalHookPlugin.so -libexec/trafficserver/GzipTransformationPlugin.so -libexec/trafficserver/HelloWorldPlugin.so -libexec/trafficserver/InternalTransactionHandling.so -libexec/trafficserver/LoggerExample.so -libexec/trafficserver/MultipleTransactionHookPlugins.so -libexec/trafficserver/NullTransformationPlugin.so -libexec/trafficserver/PostBuffer.so -libexec/trafficserver/RemapPlugin.so -libexec/trafficserver/ServerResponse.so -libexec/trafficserver/StatExample.so -libexec/trafficserver/TimeoutExamplePlugin.so -libexec/trafficserver/TransactionHookPlugin.so -libexec/trafficserver/boom.so -libexec/trafficserver/cacheurl.so +%%IMAGEMAGICK%%libexec/trafficserver/WebpTransform.so +libexec/trafficserver/access_control.so +libexec/trafficserver/acme.so +libexec/trafficserver/authproxy.so +libexec/trafficserver/background_fetch.so +libexec/trafficserver/balancer.so +libexec/trafficserver/buffer_upload.so +libexec/trafficserver/cache_promote.so +libexec/trafficserver/cache_range_requests.so +libexec/trafficserver/cachekey.so +libexec/trafficserver/certifier.so +libexec/trafficserver/collapsed_forwarding.so +libexec/trafficserver/combo_handler.so +libexec/trafficserver/compress.so libexec/trafficserver/conf_remap.so -libexec/trafficserver/gzip.so +libexec/trafficserver/custom_redirect.so +libexec/trafficserver/escalate.so +libexec/trafficserver/esi.so +libexec/trafficserver/fq_pacing.so +libexec/trafficserver/generator.so +libexec/trafficserver/geoip_acl.so +libexec/trafficserver/header_freq.so +libexec/trafficserver/header_normalize.so libexec/trafficserver/header_rewrite.so -libexec/trafficserver/intercept.so +libexec/trafficserver/hipes.so +libexec/trafficserver/hook-trace.so +libexec/trafficserver/inliner.so libexec/trafficserver/libloader.so +%%IMAGEMAGICK%%libexec/trafficserver/magick.so +%%MEMCACHED%%libexec/trafficserver/memcached_remap.so +libexec/trafficserver/metalink.so +libexec/trafficserver/money_trace.so +libexec/trafficserver/mp4.so +libexec/trafficserver/multiplexer.so +libexec/trafficserver/prefetch.so libexec/trafficserver/regex_remap.so +libexec/trafficserver/regex_revalidate.so +libexec/trafficserver/remap_purge.so +libexec/trafficserver/remap_stats.so +libexec/trafficserver/s3_auth.so +libexec/trafficserver/server_push_preload.so +libexec/trafficserver/ssl_cert_loader.so +libexec/trafficserver/sslheaders.so +libexec/trafficserver/stale_while_revalidate.so libexec/trafficserver/stats_over_http.so +libexec/trafficserver/stream_editor.so +libexec/trafficserver/system_stats.so libexec/trafficserver/tcpinfo.so -%%SITE_PERL%%/Apache/TS.pm -%%SITE_PERL%%/Apache/TS.pm.in -%%SITE_PERL%%/Apache/TS/AdminClient.pm -%%SITE_PERL%%/Apache/TS/Config.pm -%%SITE_PERL%%/Apache/TS/Config/Records.pm -%%PERL5_MAN3%%/Apache::TS.3.gz -%%PERL5_MAN3%%/Apache::TS::AdminClient.3.gz -%%PERL5_MAN3%%/Apache::TS::Config::Records.3.gz +libexec/trafficserver/test_cppapi.so +libexec/trafficserver/tls_bridge.so +libexec/trafficserver/traffic_dump.so +libexec/trafficserver/tslua.so +libexec/trafficserver/tsmemcache.so +libexec/trafficserver/url_sig.so +libexec/trafficserver/xdebug.so +lib/perl5/amd64-freebsd-thread-multi/auto/Apache/TS/.packlist +lib/perl5/amd64-freebsd-thread-multi/perllocal.pod +lib/perl5/Apache/TS.pm +lib/perl5/Apache/TS/AdminClient.pm +lib/perl5/Apache/TS/Config.pm +lib/perl5/Apache/TS/Config/Records.pm +man/man3/Apache::TS.3.gz +man/man3/Apache::TS::AdminClient.3.gz +man/man3/Apache::TS::Config::Records.3.gz @dir(,,) libexec/trafficserver @dir(,,) include/ts -@dir(,,) include/atscppapi @dir(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default @dir(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory @dir(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/snapshots