Index: head/www/trafficserver/Makefile =================================================================== --- head/www/trafficserver/Makefile (revision 421052) +++ head/www/trafficserver/Makefile (revision 421053) @@ -1,96 +1,75 @@ # Created by: Jui-Nan Lin # $FreeBSD$ PORTNAME= trafficserver -PORTVERSION= 6.1.1 +PORTVERSION= 6.2.0 CATEGORIES= www MASTER_SITES= APACHE/${PORTNAME} MAINTAINER= gaod@hychen.org COMMENT= Fast, scalable and extensible HTTP proxy server LICENSE= APACHE20 LIB_DEPENDS= libcurl.so:ftp/curl \ libhwloc.so:devel/hwloc \ libpcre.so:devel/pcre \ libxml2.so:textproc/libxml2 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USES= cpe execinfo gmake libtool perl5 pkgconfig sqlite tar:bzip2 tcl +USES= cpe execinfo gmake libtool perl5 pkgconfig sqlite ssl tar:bzip2 tcl CPE_VENDOR= apache CPE_PRODUCT= traffic_server USE_PERL5= build run USE_LDCONFIG= yes -USE_OPENSSL= yes USE_RC_SUBR= ${PORTNAME} ONLY_FOR_ARCHS= amd64 USERS= ${WWWOWN} GROUPS= ${WWWGRP} PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" PORTVERSION="${PORTVERSION}" LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-libxml2=${LOCALBASE} \ --with-pcre=${LOCALBASE} \ --with-openssl=${OPENSSLBASE} \ --with-xml=libxml2 \ --with-tcl=${TCL_LIBDIR} \ --disable-silent-rules \ --enable-cppapi \ --localstatedir=/var \ --with-user=${USERS} \ --with-group=${GROUPS} -OPTIONS_DEFINE= DOCS INTERIM WCCP SPDY -OPTIONS_RADIO= MEMMAN -OPTIONS_RADIO_MEMMAN= ALLOCATORS FREELISTS RECLAIM -OPTIONS_DEFAULT= FREELISTS +OPTIONS_DEFINE= DOCS WCCP SPDY WCCP_DESC= Enable WCCPv2 protocol -INTERIM_DESC= Enable interim cache (SSD) -ALLOCATORS_DESC= Manage memory with allocators -FREELISTS_DESC= Manage memory with freelists -RECLAIM_DESC= Reclaim unused memory in freelists SPDY_DESC= Enable SPDY WCCP_CONFIGURE_ENABLE= wccp -INTERIM_CONFIGURE_ENABLE= interim-cache SPDY_CONFIGURE_ENABLE= spdy SPDY_LIB_DEPENDS= libspdylay.so:www/spdylay BROKEN_FreeBSD_9= Trafficserver is only supported on FreeBSD 10.1 or newer - -.include - -.if ${PORT_OPTIONS:MRECLAIM} -CONFIGURE_ARGS+= --enable-reclaimable-freelist --enable-freelist -.elif ${PORT_OPTIONS:MFREELISTS} -CONFIGURE_ARGS+= --enable-freelist -.elif ${PORT_OPTIONS:MALLOCATORS} -CONFIGURE_ARGS+= --disable-freelist -.else -IGNORE= no allocation strategy selected -.endif .if ! exists(/var/cache) # FreeBSD 8.x PLIST_DIRS+= /var/cache .endif post-patch: @${REINPLACE_CMD} \ -e '/cachedir:/s,$${localstatedir}+,$${localstatedir}/cache+,' \ -e '/runtimedir:/s,$${localstatedir}+,$${localstatedir}/run+,' \ ${WRKSRC}/config.layout @${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) .include Index: head/www/trafficserver/distinfo =================================================================== --- head/www/trafficserver/distinfo (revision 421052) +++ head/www/trafficserver/distinfo (revision 421053) @@ -1,2 +1,3 @@ -SHA256 (trafficserver-6.1.1.tar.bz2) = 67ddd7fc79e4435f353b2aa8937a7b205f217ca15beba3adb5213a92f9527d8b -SIZE (trafficserver-6.1.1.tar.bz2) = 7849045 +TIMESTAMP = 1472401430 +SHA256 (trafficserver-6.2.0.tar.bz2) = bd5e8c178d02957b89a81d1e428ee50bcca0831a6917f32408915c56f486fd85 +SIZE (trafficserver-6.2.0.tar.bz2) = 8437286 Index: head/www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc =================================================================== --- head/www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc (revision 421052) +++ head/www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc (nonexistent) @@ -1,10 +0,0 @@ ---- iocore/eventsystem/UnixEventProcessor.cc.orig 2015-09-08 17:43:45 UTC -+++ iocore/eventsystem/UnixEventProcessor.cc -@@ -24,7 +24,6 @@ - #include "P_EventSystem.h" /* MAGIC_EDITING_TAG */ - #include - #if TS_USE_HWLOC --#include - #include - #endif - #include "ts/ink_defs.h" Property changes on: head/www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/trafficserver/files/patch-lib__perl__Makefile.in =================================================================== --- head/www/trafficserver/files/patch-lib__perl__Makefile.in (nonexistent) +++ head/www/trafficserver/files/patch-lib__perl__Makefile.in (revision 421053) @@ -0,0 +1,11 @@ +--- lib/perl/Makefile.in.orig 2016-08-29 00:27:40.715518000 +0800 ++++ lib/perl/Makefile.in 2016-08-29 00:28:18.123308000 +0800 +@@ -717,7 +717,7 @@ + # copy them to the build directory if we are building out of tree. + Makefile-pl: Makefile.PL + test -f "$(top_builddir)/$(subdir)/Makefile.PL" || cp -rf "$(srcdir)/." "$(top_builddir)/$(subdir)/" +- $(PERL) Makefile.PL INSTALLDIRS=$(INSTALLDIRS) INSTALL_BASE=$(prefix) PREFIX= ++ $(PERL) Makefile.PL + + distclean-local: + -rm -rf Makefile-pl MYMETA.* blip Property changes on: head/www/trafficserver/files/patch-lib__perl__Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/trafficserver/pkg-plist =================================================================== --- head/www/trafficserver/pkg-plist (revision 421052) +++ head/www/trafficserver/pkg-plist (revision 421053) @@ -1,160 +1,161 @@ @postunexec if [ ! -s %D/%%ETCDIR%%/proxy.pac ]; then rm -f %D/%%ETCDIR%%/proxy.pac; fi bin/header_rewrite_test bin/traffic_cop 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 bin/trafficserver bin/tspush bin/tsxs %%ETCDIR%%/trafficserver-release @owner %%WWWOWN%% @group %%WWWGRP%% @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/.body_factory_info @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/README @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/access#denied @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/access#proxy_auth_required -@(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/access#redirect_url @(%%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 @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/default @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/interception#no_host @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/redirect#moved_permanently @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/redirect#moved_temporarily @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/request#cycle_detected @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/request#invalid_content_length @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/request#no_content_length @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/request#no_host @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/request#scheme_unsupported @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/request#syntax_error @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/response#bad_response @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/response#bad_version @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/timeout#activity @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/timeout#inactivity @(%%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%%/parent.config.sample @sample %%ETCDIR%%/plugin.config.sample @sample %%ETCDIR%%/records.config.sample @sample %%ETCDIR%%/remap.config.sample @sample %%ETCDIR%%/socks.config.sample @sample %%ETCDIR%%/splitdns.config.sample @sample %%ETCDIR%%/ssl_multicert.config.sample @sample %%ETCDIR%%/stats.config.xml.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%% lib/libtsconfig.so lib/libtsconfig.so.6 lib/libtsconfig.so.%%PORTVERSION%% lib/libtsmgmt.so lib/libtsmgmt.so.6 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 libexec/trafficserver/conf_remap.so libexec/trafficserver/gzip.so libexec/trafficserver/header_rewrite.so libexec/trafficserver/intercept.so libexec/trafficserver/libloader.so libexec/trafficserver/regex_remap.so libexec/trafficserver/stats_over_http.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 @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 @dir(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%% @dir(%%WWWOWN%%,%%WWWGRP%%,) /var/cache/trafficserver @dir(%%WWWOWN%%,%%WWWGRP%%,) /var/log/trafficserver @dir(%%WWWOWN%%,%%WWWGRP%%,) /var/run/trafficserver