Upgrade to 5.3.1.

PR:		200114
Submitted by:	maintainer

9 files changed, 90 insertions, 131 deletions

diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile
index 5dfd5cf14606..bde5a23fbd41 100644
--- a/www/trafficserver/Makefile
+++ b/www/trafficserver/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	trafficserver
-PORTVERSION=	5.0.1
-PORTREVISION=	2
+PORTVERSION=	5.3.1
 CATEGORIES=	www
 MASTER_SITES=	APACHE/${PORTNAME}
 
@@ -14,14 +13,13 @@ LICENSE=	APACHE20
 
 LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
 		libcurl.so:${PORTSDIR}/ftp/curl \
-		libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
 		libhwloc.so:${PORTSDIR}/devel/hwloc \
 		libpcre.so:${PORTSDIR}/devel/pcre \
 		libxml2.so:${PORTSDIR}/textproc/libxml2
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		cpe gmake libtool perl5 pkgconfig tar:bzip2 tcl
+USES=		cpe execinfo gmake libtool perl5 pkgconfig tar:bzip2 tcl
 CPE_VENDOR=	apache
 CPE_PRODUCT=	traffic_server
 USE_PERL5=	build run
@@ -32,8 +30,9 @@ USE_SQLITE=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USERS=		www
-GROUPS=		www
+USERS=		${WWWOWN}
+GROUPS=		${WWWGRP}
+PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" PORTVERSION="${PORTVERSION}"
 
 LIBS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-libxml2=${LOCALBASE} \
@@ -81,7 +80,7 @@ CXX=		clang++
 
 .if ! exists(/var/cache)
 # FreeBSD 8.x
-PLIST_DIRSTRY+=	/var/cache
+PLIST_DIRS+=	/var/cache
 .endif
 
 post-patch:
diff --git a/www/trafficserver/distinfo b/www/trafficserver/distinfo
index f203cfce2ed5..bb5b0facd684 100644
--- a/www/trafficserver/distinfo
+++ b/www/trafficserver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (trafficserver-5.0.1.tar.bz2) = dfbdfef7240d9462f4b5eb0a68f71ae49e21ef0b0fa4b20f8e9f2dc2cd321621
-SIZE (trafficserver-5.0.1.tar.bz2) = 7440366
+SHA256 (trafficserver-5.3.1.tar.bz2) = e6c33c7cfb629406a320a61217e08db3123cfe4b77c2eaef0eaa520065dbeb43
+SIZE (trafficserver-5.3.1.tar.bz2) = 7739777
diff --git a/www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc b/www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc
index 97c6c83ec1fa..e943bcaad58c 100644
--- a/www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc
+++ b/www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc
@@ -1,7 +1,7 @@
---- iocore/eventsystem/UnixEventProcessor.cc.orig	2014-07-07 00:33:37.106586000 +0800
-+++ iocore/eventsystem/UnixEventProcessor.cc	2014-07-07 00:34:18.143512000 +0800
+--- iocore/eventsystem/UnixEventProcessor.cc.orig	2015-06-30 04:11:56 UTC
++++ iocore/eventsystem/UnixEventProcessor.cc
 @@ -24,7 +24,6 @@
- #include "P_EventSystem.h"      /* MAGIC_EDITING_TAG */
+ #include "P_EventSystem.h" /* MAGIC_EDITING_TAG */
  #include <sched.h>
  #if TS_USE_HWLOC
 -#include <alloca.h>
diff --git a/www/trafficserver/files/patch-lib__atscppapi__src__AsyncHttpFetch.cc b/www/trafficserver/files/patch-lib__atscppapi__src__AsyncHttpFetch.cc
index 959322de3453..fe2c9bb4a819 100644
--- a/www/trafficserver/files/patch-lib__atscppapi__src__AsyncHttpFetch.cc
+++ b/www/trafficserver/files/patch-lib__atscppapi__src__AsyncHttpFetch.cc
@@ -1,11 +1,11 @@
---- ./lib/atscppapi/src/AsyncHttpFetch.cc.orig	2013-12-05 22:07:48.000000000 +0000
-+++ ./lib/atscppapi/src/AsyncHttpFetch.cc	2014-01-27 08:45:49.000000000 +0000
-@@ -82,7 +82,7 @@
-       state->body_ = data_start; // data_start will now be pointing to body
-       state->body_size_ = data_end - data_start;
-       utils::internal::initResponse(state->response_, state->hdr_buf_, state->hdr_loc_);
--      LOG_DEBUG("Fetch result had a status code of %d with a body length of %ld", status, state->body_size_);
-+      LOG_DEBUG("Fetch result had a status code of %d with a body length of %zu", status, state->body_size_);
-     } else {
-       LOG_ERROR("Unable to parse response; Request URL [%s]; transaction %p",
-                 state->request_.getUrl().getUrlString().c_str(), txn);
+--- lib/atscppapi/src/AsyncHttpFetch.cc.orig	2015-06-30 04:11:56 UTC
++++ lib/atscppapi/src/AsyncHttpFetch.cc
+@@ -107,7 +107,7 @@ handleFetchEvents(TSCont cont, TSEvent e
+           state->body_ = data_start; // data_start will now be pointing to body
+           state->body_size_ = data_end - data_start;
+           utils::internal::initResponse(state->response_, state->hdr_buf_, state->hdr_loc_);
+-          LOG_DEBUG("Fetch result had a status code of %d with a body length of %ld", status, state->body_size_);
++          LOG_DEBUG("Fetch result had a status code of %d with a body length of %zu", status, state->body_size_);
+         } else {
+           LOG_ERROR("Unable to parse response; Request URL [%s]; transaction %p", state->request_->getUrl().getUrlString().c_str(),
+                     txn);
diff --git a/www/trafficserver/files/patch-lib__luajit__src__Makefile b/www/trafficserver/files/patch-lib__luajit__src__Makefile
index 3ec6d4f3f19b..92dd7a54405d 100644
--- a/www/trafficserver/files/patch-lib__luajit__src__Makefile
+++ b/www/trafficserver/files/patch-lib__luajit__src__Makefile
@@ -1,6 +1,6 @@
---- lib/luajit/src/Makefile.orig	2014-06-16 05:17:49.000000000 +0800
-+++ lib/luajit/src/Makefile	2014-07-07 01:09:35.726810000 +0800
-@@ -25,7 +25,7 @@
+--- lib/luajit/src/Makefile.orig	2015-06-30 04:11:56 UTC
++++ lib/luajit/src/Makefile
+@@ -25,7 +25,7 @@ NODOTABIVER= 51
  # with "make clean", followed by "make" if you change any options.
  #
  # LuaJIT builds as a native 32 or 64 bit binary by default.
@@ -9,7 +9,7 @@
  #
  # Use this if you want to force a 32 bit build on a 64 bit multilib OS.
  #CC= gcc -m32
-@@ -313,7 +313,7 @@
+@@ -313,7 +313,7 @@ ifeq (iOS,$(TARGET_SYS))
    TARGET_DYNXLDOPTS=
    TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER)
  else
diff --git a/www/trafficserver/files/patch-lib__ts__Compatability.h b/www/trafficserver/files/patch-lib__ts__Compatability.h
deleted file mode 100644
index 82e72c34a725..000000000000
--- a/www/trafficserver/files/patch-lib__ts__Compatability.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/ts/Compatability.h.orig	2014-10-08 13:41:39.000000000 -0400
-+++ lib/ts/Compatability.h	2014-10-08 13:42:29.000000000 -0400
-@@ -55,7 +55,7 @@
- #if defined(linux)
- #define NEED_ALTZONE_DEFINED
- #define MAP_SHARED_MAP_NORESERVE (MAP_SHARED)
--#elif defined(darwin)
-+#elif defined(darwin) || defined(__FreeBSD__)
- #define MAP_SHARED_MAP_NORESERVE (MAP_SHARED)
- #elif defined(solaris)
- #define NEED_ALTZONE_DEFINED
diff --git a/www/trafficserver/files/patch-tools_Makefile.in b/www/trafficserver/files/patch-tools_Makefile.in
new file mode 100644
index 000000000000..c83c9c0ceb4f
--- /dev/null
+++ b/www/trafficserver/files/patch-tools_Makefile.in
@@ -0,0 +1,11 @@
+--- tools/Makefile.in.orig	2015-07-07 14:35:35.993832221 +0800
++++ tools/Makefile.in	2015-07-07 14:35:49.432831048 +0800
+@@ -614,7 +614,7 @@ valuesh = @valuesh@
+ waith = @waith@
+ zlibh = @zlibh@
+ bin_SCRIPTS = tsxs tspush
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = trafficserver.pc
+ AM_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
+ AM_CPPFLAGS = $(iocore_include_dirs) \
diff --git a/www/trafficserver/files/patch-tools__jtest__jtest.cc b/www/trafficserver/files/patch-tools__jtest__jtest.cc
deleted file mode 100644
index 3ba14b752708..000000000000
--- a/www/trafficserver/files/patch-tools__jtest__jtest.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/jtest/jtest.cc.orig	2014-10-08 13:50:58.000000000 -0400
-+++ tools/jtest/jtest.cc	2014-10-08 13:51:12.000000000 -0400
-@@ -2689,7 +2689,7 @@
-     ink_assert( !ftruncate(fd,numbytes) );
-     bytes = (unsigned char *)
-       mmap(NULL,numbytes,PROT_READ|PROT_WRITE,
--           MAP_SHARED|MAP_NORESERVE,
-+           MAP_SHARED,
-            fd, 0);
-     if (bytes == (unsigned char*)MAP_FAILED || !bytes)
-       panic("unable to map URL Hash file\n");
diff --git a/www/trafficserver/pkg-plist b/www/trafficserver/pkg-plist
index f0a250541767..43da186e1512 100644
--- a/www/trafficserver/pkg-plist
+++ b/www/trafficserver/pkg-plist
@@ -1,5 +1,8 @@
 @unexec if [ ! -s %D/%%ETCDIR%%/proxy.pac ]; then rm -f %D/%%ETCDIR%%/proxy.pac; fi
 bin/traffic_cop
+bin/traffic_crashlog
+bin/traffic_ctl
+bin/traffic_layout
 bin/traffic_line
 bin/traffic_logcat
 bin/traffic_logstats
@@ -7,40 +10,42 @@ bin/traffic_manager
 bin/traffic_sac
 bin/traffic_server
 bin/traffic_top
+bin/traffic_via
 bin/trafficserver
 bin/tspush
 bin/tstop
 bin/tsxs
 %%ETCDIR%%/trafficserver-release
-@owner www
-@group www
-%%ETCDIR%%/body_factory/default/.body_factory_info
-%%ETCDIR%%/body_factory/default/README
-%%ETCDIR%%/body_factory/default/access#denied
-%%ETCDIR%%/body_factory/default/access#proxy_auth_required
-%%ETCDIR%%/body_factory/default/access#redirect_url
-%%ETCDIR%%/body_factory/default/access#ssl_forbidden
-%%ETCDIR%%/body_factory/default/cache#not_in_cache
-%%ETCDIR%%/body_factory/default/cache#read_error
-%%ETCDIR%%/body_factory/default/congestion#retryAfter
-%%ETCDIR%%/body_factory/default/connect#dns_failed
-%%ETCDIR%%/body_factory/default/connect#failed_connect
-%%ETCDIR%%/body_factory/default/connect#hangup
-%%ETCDIR%%/body_factory/default/default
-%%ETCDIR%%/body_factory/default/interception#no_host
-%%ETCDIR%%/body_factory/default/redirect#moved_temporarily
-%%ETCDIR%%/body_factory/default/request#cycle_detected
-%%ETCDIR%%/body_factory/default/request#invalid_content_length
-%%ETCDIR%%/body_factory/default/request#no_content_length
-%%ETCDIR%%/body_factory/default/request#no_host
-%%ETCDIR%%/body_factory/default/request#scheme_unsupported
-%%ETCDIR%%/body_factory/default/request#syntax_error
-%%ETCDIR%%/body_factory/default/response#bad_response
-%%ETCDIR%%/body_factory/default/response#bad_version
-%%ETCDIR%%/body_factory/default/timeout#activity
-%%ETCDIR%%/body_factory/default/timeout#inactivity
-%%ETCDIR%%/body_factory/default/transcoding#unsupported
-%%ETCDIR%%/body_factory/default/urlrouting#no_mapping
+@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
@@ -62,8 +67,6 @@ bin/tsxs
 @sample %%ETCDIR%%/update.config.sample
 @sample %%ETCDIR%%/vaddrs.config.sample
 @sample %%ETCDIR%%/volume.config.sample
-@owner root
-@group wheel
 include/atscppapi/Async.h
 include/atscppapi/AsyncHttpFetch.h
 include/atscppapi/AsyncTimer.h
@@ -92,24 +95,26 @@ include/atscppapi/Url.h
 include/atscppapi/noncopyable.h
 include/atscppapi/shared_ptr.h
 include/atscppapi/utils.h
-include/ts/apidefs.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.5
-lib/libatscppapi.so.5.0.1
+lib/libatscppapi.so.%%PORTVERSION%%
+lib/libtsconfig.so
+lib/libtsconfig.so.5
+lib/libtsconfig.so.%%PORTVERSION%%
 lib/libtsmgmt.so
 lib/libtsmgmt.so.5
-lib/libtsmgmt.so.5.0.1
-lib/libtsmgmtshare.so
-lib/libtsmgmtshare.so.5
-lib/libtsmgmtshare.so.5.0.1
+lib/libtsmgmt.so.%%PORTVERSION%%
 lib/libtsutil.so
 lib/libtsutil.so.5
-lib/libtsutil.so.5.0.1
+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
@@ -145,47 +150,13 @@ libexec/trafficserver/tcpinfo.so
 %%PERL5_MAN3%%/Apache::TS.3.gz
 %%PERL5_MAN3%%/Apache::TS::AdminClient.3.gz
 %%PERL5_MAN3%%/Apache::TS::Config::Records.3.gz
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_alarms.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_cache-stats.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_cache.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_cluster.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_dns-resolver.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_dns-stats.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_hostdb-stats.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_hostdb.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_http-stats.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_http-trans-stats.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_http.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_icp-stats.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_icp.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_logging-stats.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_logging.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_network.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_parent.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_port-tunnels.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_proxy-stats.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_proxy.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_remap.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_scheduled-update.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_security.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_socks.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_ssl.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_status.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_version.1
-%%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_virtual-ip.1
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/trafficshell
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm libexec/trafficserver
-@dirrm include/ts
-@dirrm include/atscppapi
-@owner www
-@group www
-@dirrm %%ETCDIR%%/body_factory/default
-@dirrmtry %%ETCDIR%%/body_factory
-@dirrmtry %%ETCDIR%%/snapshots
-@dirrmtry %%ETCDIR%%
-@dirrmtry /var/cache/trafficserver
-@dirrmtry /var/log/trafficserver
-@dirrmtry /var/run/trafficserver
-@owner root
-@group wheel
+@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