- Update to 5.0.1 to fix CVE-2014-3525

- Patch Makefile.in instead of Makefile.am to avoid USE_AUTOTOOLS
- Add USES=cpe, USES=libtool and INSTALL_TARGET=install-strip
- Use /var instead of PREFIX/var
- Use @sample

14 files changed, 161 insertions, 251 deletions

diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile
index d85230354d19..e7a3bc655088 100644
--- a/www/trafficserver/Makefile
+++ b/www/trafficserver/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	trafficserver
-PORTVERSION=	5.0.0
+PORTVERSION=	5.0.1
 CATEGORIES=	www
 MASTER_SITES=	APACHE/${PORTNAME}
 
@@ -19,8 +19,11 @@ LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
 		libxml2.so:${PORTSDIR}/textproc/libxml2
 
 GNU_CONFIGURE=	yes
-USES=	gmake perl5 pkgconfig tar:bzip2 tcl
-USE_AUTOTOOLS=	aclocal autoconf automake libtool
+INSTALL_TARGET=	install-strip
+USES=		cpe gmake libtool perl5 pkgconfig tar:bzip2 tcl
+CPE_VENDOR=	apache
+CPE_PRODUCT=	traffic_server
+USE_PERL5=	build run fixpacklist
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 USE_RC_SUBR=	${PORTNAME}
@@ -29,27 +32,22 @@ USE_SQLITE=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 
 USERS=		www
-GROUPS=		nogroup
+GROUPS=		www
 
-LOGDIR=		/var/log/${PORTNAME}
-
-PLIST_SUB=	LOGDIR="${LOGDIR}"
-
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-libxml2=${LOCALBASE} \
 		--with-pcre=${LOCALBASE} \
 		--with-openssl=${OPENSSLBASE} \
 		--with-xml=libxml2 \
-		--with-lua=${LOCALBASE} --enable-luajit \
 		--with-tcl=${TCL_LIBDIR} \
-		--verbose \
+		--disable-silent-rules \
 		--enable-cppapi \
+		--enable-luajit \
+		--localstatedir=/var \
 		--with-user=${USERS} \
 		--with-group=${GROUPS}
 
-ACLOCAL_ARGS=	-I build
-
-OPTIONS_DEFINE=	WCCP INTERIM
+OPTIONS_DEFINE=	DOCS INTERIM WCCP
 OPTIONS_RADIO=	MEMMAN
 OPTIONS_RADIO_MEMMAN=	ALLOCATORS FREELISTS RECLAIM
 OPTIONS_DEFAULT=	FREELISTS
@@ -80,8 +78,23 @@ CC=		clang
 CXX=		clang++
 .endif
 
+.if ! exists(/var/cache)
+# FreeBSD 8.x
+PLIST_DIRSTRY+=	/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:
+	@${RM} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod
+	@${RMDIR} ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/snapshots
-	@cd ${STAGEDIR}${ETCDIR} && for f in *.config *.config.xml; do ${MV} $$f $$f.default; done
+	(cd ${STAGEDIR}${ETCDIR} && for f in *.config *.config.xml; do ${MV} $$f $$f.sample; done)
 
 .include <bsd.port.mk>
diff --git a/www/trafficserver/distinfo b/www/trafficserver/distinfo
index c055e0e606f8..f203cfce2ed5 100644
--- a/www/trafficserver/distinfo
+++ b/www/trafficserver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (trafficserver-5.0.0.tar.bz2) = 2fce878bdb8072c9434a7acb6510752a969877541af082360f28e2caf64ba547
-SIZE (trafficserver-5.0.0.tar.bz2) = 7440958
+SHA256 (trafficserver-5.0.1.tar.bz2) = dfbdfef7240d9462f4b5eb0a68f71ae49e21ef0b0fa4b20f8e9f2dc2cd321621
+SIZE (trafficserver-5.0.1.tar.bz2) = 7440366
diff --git a/www/trafficserver/files/patch-cmd__traffic_cop__Makefile.am b/www/trafficserver/files/patch-cmd__traffic_cop__Makefile.am
deleted file mode 100644
index 948f726a3aad..000000000000
--- a/www/trafficserver/files/patch-cmd__traffic_cop__Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmd/traffic_cop/Makefile.am.orig	2014-07-06 22:47:46.211841000 +0800
-+++ cmd/traffic_cop/Makefile.am	2014-07-06 22:49:18.103855000 +0800
-@@ -17,6 +17,8 @@
- #  See the License for the specific language governing permissions and
- #  limitations under the License.
- 
-+AUTOMAKE_OPTIONS=	subdir-objects
-+
- AM_CPPFLAGS = $(iocore_include_dirs) \
-   -I$(top_srcdir)/lib \
-   -I$(top_srcdir)/lib/records \
diff --git a/www/trafficserver/files/patch-example__Makefile.am b/www/trafficserver/files/patch-example__Makefile.am
deleted file mode 100644
index 5d921fdec7d0..000000000000
--- a/www/trafficserver/files/patch-example__Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./example/Makefile.am.orig	2013-12-05 22:07:48.000000000 +0000
-+++ ./example/Makefile.am	2014-01-27 08:45:49.000000000 +0000
-@@ -13,6 +13,7 @@
- #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- #  See the License for the specific language governing permissions and
- #  limitations under the License.
-+AUTOMAKE_OPTIONS=	subdir-objects
- 
- include $(top_srcdir)/build/plugins.mk
- 
diff --git a/www/trafficserver/files/patch-iocore__aio__Makefile.am b/www/trafficserver/files/patch-iocore__aio__Makefile.am
deleted file mode 100644
index b14751feb1b2..000000000000
--- a/www/trafficserver/files/patch-iocore__aio__Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./iocore/aio/Makefile.am.orig	2013-12-05 22:07:48.000000000 +0000
-+++ ./iocore/aio/Makefile.am	2014-01-27 08:45:49.000000000 +0000
-@@ -15,6 +15,7 @@
- #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- #  See the License for the specific language governing permissions and
- #  limitations under the License.
-+AUTOMAKE_OPTIONS=	subdir-objects
- 
- AM_CPPFLAGS = \
-   -I$(top_srcdir)/iocore/eventsystem \
diff --git a/www/trafficserver/files/patch-iocore__eventsystem__Makefile.am b/www/trafficserver/files/patch-iocore__eventsystem__Makefile.am
deleted file mode 100644
index ca15bff831ad..000000000000
--- a/www/trafficserver/files/patch-iocore__eventsystem__Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./iocore/eventsystem/Makefile.am.orig	2013-12-05 22:07:48.000000000 +0000
-+++ ./iocore/eventsystem/Makefile.am	2014-01-27 08:45:49.000000000 +0000
-@@ -15,6 +15,7 @@
- #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- #  See the License for the specific language governing permissions and
- #  limitations under the License.
-+AUTOMAKE_OPTIONS=	subdir-objects
- 
- AM_CPPFLAGS = \
-   -I$(top_srcdir)/lib \
diff --git a/www/trafficserver/files/patch-lib__Makefile.am b/www/trafficserver/files/patch-lib__Makefile.am
deleted file mode 100644
index e327c199a9bf..000000000000
--- a/www/trafficserver/files/patch-lib__Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Makefile.am.orig	2014-07-07 03:26:27.267047000 +0800
-+++ lib/Makefile.am	2014-07-07 03:26:40.961339000 +0800
-@@ -49,7 +49,7 @@
- 	test -d "$(top_srcdir)/$(subdir)/luajit/src" || (cd "$(top_srcdir)" && git submodule update --init)
- 	test -d "$(top_builddir)/$(subdir)/luajit/src" || cp -rf "$(srcdir)/luajit" "$(top_builddir)/$(subdir)/"
- 	cd luajit && $(MAKE) $(AM_MAKEFLAGS) BUILDMODE="static" PREFIX="$(prefix)" CC="$(CC)" \
--	                     CFLAGS="$(LUA_CFLAGS)" LDFLAGS="@LUA_LDFLAGS@"
-+	                     CFLAGS="$(LUA_CFLAGS)" LDFLAGS="@LUA_LDFLAGS@ ${LDFLAGS}"
- 
- clean-local:
- 	test "$(top_srcdir)" != "$(top_builddir)" || (cd "$(top_builddir)/$(subdir)/luajit" && make clean)
diff --git a/www/trafficserver/files/patch-mgmt__Makefile.am b/www/trafficserver/files/patch-mgmt__Makefile.am
deleted file mode 100644
index 089dbd75abb8..000000000000
--- a/www/trafficserver/files/patch-mgmt__Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./mgmt/Makefile.am.orig	2013-12-05 22:07:48.000000000 +0000
-+++ ./mgmt/Makefile.am	2014-01-27 08:45:49.000000000 +0000
-@@ -16,6 +16,7 @@
- #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- #  See the License for the specific language governing permissions and
- #  limitations under the License.
-+AUTOMAKE_OPTIONS=	subdir-objects
- 
- SUBDIRS = cluster preparse utils web2 stats api cli
- 
diff --git a/www/trafficserver/files/patch-plugins__experimental__esi__Makefile.am b/www/trafficserver/files/patch-plugins__experimental__esi__Makefile.am
deleted file mode 100644
index 9e71c25fbd81..000000000000
--- a/www/trafficserver/files/patch-plugins__experimental__esi__Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./plugins/experimental/esi/Makefile.am.orig	2013-12-05 22:07:48.000000000 +0000
-+++ ./plugins/experimental/esi/Makefile.am	2014-01-27 08:45:49.000000000 +0000
-@@ -13,6 +13,7 @@
- #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- #  See the License for the specific language governing permissions and
- #  limitations under the License.
-+AUTOMAKE_OPTIONS=	subdir-objects
- 
- include $(top_srcdir)/build/plugins.mk
- 
diff --git a/www/trafficserver/files/patch-plugins__experimental__spdy__Makefile.am b/www/trafficserver/files/patch-plugins__experimental__spdy__Makefile.am
deleted file mode 100644
index a9c5ec271cc3..000000000000
--- a/www/trafficserver/files/patch-plugins__experimental__spdy__Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./plugins/experimental/spdy/Makefile.am.orig	2013-12-05 22:07:48.000000000 +0000
-+++ ./plugins/experimental/spdy/Makefile.am	2014-01-27 08:45:49.000000000 +0000
-@@ -13,6 +13,7 @@
- #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- #  See the License for the specific language governing permissions and
- #  limitations under the License.
-+AUTOMAKE_OPTIONS=	subdir-objects
- 
- include $(top_srcdir)/build/plugins.mk
- 
diff --git a/www/trafficserver/files/patch-proxy__Makefile.am b/www/trafficserver/files/patch-proxy__Makefile.am
deleted file mode 100644
index 4d2408dfe131..000000000000
--- a/www/trafficserver/files/patch-proxy__Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./proxy/Makefile.am.orig	2013-12-05 22:07:48.000000000 +0000
-+++ ./proxy/Makefile.am	2014-01-27 08:45:49.000000000 +0000
-@@ -291,7 +291,7 @@
- versiondir = $(pkgsysconfdir)
- 
- install-data-local:
--	if [ `id -un` != "root" ]; then \
-+	if true ; then \
- 		$(INSTALL) -d $(DESTDIR)$(pkglocalstatedir) $(DESTDIR)$(pkglogdir) $(DESTDIR)$(pkgruntimedir) \
- 				$(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(pkgcachedir); \
- 	else \
-@@ -302,7 +302,7 @@
- 	fi
- 
- install-data-hook:
--	if [ `id -un` == "root" ]; then \
-+	if false; then \
- 		chown -R $(pkgsysuser):$(pkgsysgroup) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkgdatadir);\
- 	fi
- 	-echo "<TS_VERSION> $(PACKAGE_VERSION)" > $(DESTDIR)$(pkgsysconfdir)/trafficserver-release
diff --git a/www/trafficserver/files/patch-tools__Makefile.am b/www/trafficserver/files/patch-tools__Makefile.am
deleted file mode 100644
index 73605ac26fd4..000000000000
--- a/www/trafficserver/files/patch-tools__Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./tools/Makefile.am.orig	2013-12-05 22:07:48.000000000 +0000
-+++ ./tools/Makefile.am	2014-01-27 08:45:49.000000000 +0000
-@@ -16,6 +16,7 @@
- #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- #  See the License for the specific language governing permissions and
- #  limitations under the License.
-+AUTOMAKE_OPTIONS=	subdir-objects
- 
- bin_SCRIPTS = tsxs tspush
- bin_PROGRAMS =
diff --git a/www/trafficserver/files/trafficserver.in b/www/trafficserver/files/trafficserver.in
index daa2ede69867..765c8ce9d18f 100644
--- a/www/trafficserver/files/trafficserver.in
+++ b/www/trafficserver/files/trafficserver.in
@@ -12,9 +12,9 @@
 rcvar=trafficserver_enable
 name="trafficserver"
 trafficserver_enable=${trafficserver_enable:-"NO"}
-trafficserver_tm_pidfile=${trafficserver_tm_pidfile:-"/usr/local/var/trafficserver/manager.lock"}
-trafficserver_ts_pidfile=${trafficserver_ts_pidfile:-"/usr/local/var/trafficserver/server.lock"}
-pidfile="/var/run/traffic_cop.lock"
+trafficserver_tm_pidfile=${trafficserver_tm_pidfile:-"/var/run/trafficserver/manager.lock"}
+trafficserver_ts_pidfile=${trafficserver_ts_pidfile:-"/var/run/trafficserver/server.lock"}
+pidfile="/var/run/trafficserver/cop.lock"
 stop_cmd="trafficserver_stop"
 command=/usr/sbin/daemon
 command_args="-p ${pidfile} %%PREFIX%%/bin/traffic_cop"
diff --git a/www/trafficserver/pkg-plist b/www/trafficserver/pkg-plist
index 271c23cd00a6..eb6337fe3e65 100644
--- a/www/trafficserver/pkg-plist
+++ b/www/trafficserver/pkg-plist
@@ -1,24 +1,3 @@
-@unexec if cmp -s %D/%%ETCDIR%%/cache.config %D/%%ETCDIR%%/cache.config.default; then rm %D/%%ETCDIR%%/cache.config; fi
-@unexec if cmp -s %D/%%ETCDIR%%/cluster.config %D/%%ETCDIR%%/cluster.config.default; then rm %D/%%ETCDIR%%/cluster.config; fi
-@unexec if cmp -s %D/%%ETCDIR%%/congestion.config %D/%%ETCDIR%%/congestion.config.default; then rm %D/%%ETCDIR%%/congestion.config; fi
-@unexec if cmp -s %D/%%ETCDIR%%/hosting.config %D/%%ETCDIR%%/hosting.config.default; then rm %D/%%ETCDIR%%/hosting.config; fi
-@unexec if cmp -s %D/%%ETCDIR%%/icp.config %D/%%ETCDIR%%/icp.config.default; then rm %D/%%ETCDIR%%/icp.config; fi
-@unexec if cmp -s %D/%%ETCDIR%%/ip_allow.config %D/%%ETCDIR%%/ip_allow.config.default; then rm %D/%%ETCDIR%%/ip_allow.config; fi
-@unexec if cmp -s %D/%%ETCDIR%%/log_hosts.config %D/%%ETCDIR%%/log_hosts.config.default; then rm %D/%%ETCDIR%%/log_hosts.config; fi
-@unexec if cmp -s %D/%%ETCDIR%%/logs_xml.config %D/%%ETCDIR%%/logs_xml.config.default; then rm %D/%%ETCDIR%%/logs_xml.config; fi
-@unexec if cmp -s %D/%%ETCDIR%%/parent.config %D/%%ETCDIR%%/parent.config.default; then rm %D/%%ETCDIR%%/parent.config; fi
-@unexec if cmp -s %D/%%ETCDIR%%/plugin.config %D/%%ETCDIR%%/plugin.config.default; then rm %D/%%ETCDIR%%/plugin.config; fi
-@unexec if cmp -s %D/%%ETCDIR%%/prefetch.config %D/%%ETCDIR%%/prefetch.config.default; then rm %D/%%ETCDIR%%/prefetch.config; fi
-@unexec if cmp -s %D/%%ETCDIR%%/records.config %D/%%ETCDIR%%/records.config.default; then rm %D/%%ETCDIR%%/records.config; fi
-@unexec if cmp -s %D/%%ETCDIR%%/remap.config %D/%%ETCDIR%%/remap.config.default; then rm %D/%%ETCDIR%%/remap.config; fi
-@unexec if cmp -s %D/%%ETCDIR%%/socks.config %D/%%ETCDIR%%/socks.config.default; then rm %D/%%ETCDIR%%/socks.config; fi
-@unexec if cmp -s %D/%%ETCDIR%%/splitdns.config %D/%%ETCDIR%%/splitdns.config.default; then rm %D/%%ETCDIR%%/splitdns.config; fi
-@unexec if cmp -s %D/%%ETCDIR%%/ssl_multicert.config %D/%%ETCDIR%%/ssl_multicert.config.default; then rm %D/%%ETCDIR%%/ssl_multicert.config; fi
-@unexec if cmp -s %D/%%ETCDIR%%/stats.config.xml %D/%%ETCDIR%%/stats.config.xml.default; then rm %D/%%ETCDIR%%/stats.config.xml; fi
-@unexec if cmp -s %D/%%ETCDIR%%/storage.config %D/%%ETCDIR%%/storage.config.default; then rm %D/%%ETCDIR%%/storage.config; fi
-@unexec if cmp -s %D/%%ETCDIR%%/update.config %D/%%ETCDIR%%/update.config.default; then rm %D/%%ETCDIR%%/update.config; fi
-@unexec if cmp -s %D/%%ETCDIR%%/vaddrs.config %D/%%ETCDIR%%/vaddrs.config.default; then rm %D/%%ETCDIR%%/vaddrs.config; fi
-@unexec if cmp -s %D/%%ETCDIR%%/volume.config %D/%%ETCDIR%%/volume.config.default; then rm %D/%%ETCDIR%%/volume.config; fi
 @unexec if [ ! -s %D/%%ETCDIR%%/proxy.pac ]; then rm -f %D/%%ETCDIR%%/proxy.pac; fi
 bin/traffic_cop
 bin/traffic_line
@@ -27,14 +6,64 @@ bin/traffic_logstats
 bin/traffic_manager
 bin/traffic_sac
 bin/traffic_server
+bin/traffic_top
 bin/trafficserver
 bin/tspush
 bin/tstop
 bin/tsxs
-include/ts/experimental.h
-include/ts/mgmtapi.h
-include/ts/remap.h
-include/ts/ts.h
+%%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
+@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%%/parent.config.sample
+@sample %%ETCDIR%%/plugin.config.sample
+@sample %%ETCDIR%%/prefetch.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%%/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
@@ -47,6 +76,7 @@ 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
@@ -57,132 +87,111 @@ 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
-lib/libatscppapi.la
+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/libtsmgmt.la
+lib/libatscppapi.so.5.0.1
 lib/libtsmgmt.so
 lib/libtsmgmt.so.5
-lib/libtsmgmtshare.la
+lib/libtsmgmt.so.5.0.1
 lib/libtsmgmtshare.so
 lib/libtsmgmtshare.so.5
-lib/libtsutil.la
+lib/libtsmgmtshare.so.5.0.1
 lib/libtsutil.so
 lib/libtsutil.so.5
-libexec/trafficserver/cacheurl.la
+lib/libtsutil.so.5.0.1
+libexec/trafficserver/AsyncHttpFetch.so
+libexec/trafficserver/AsyncTimer.so
+libexec/trafficserver/ClientRedirect.so
+libexec/trafficserver/ClientRequest.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.la
 libexec/trafficserver/conf_remap.so
-libexec/trafficserver/gzip.la
 libexec/trafficserver/gzip.so
-libexec/trafficserver/libloader.la
+libexec/trafficserver/header_rewrite.so
+libexec/trafficserver/intercept.so
 libexec/trafficserver/libloader.so
-libexec/trafficserver/regex_remap.la
 libexec/trafficserver/regex_remap.so
-libexec/trafficserver/stats_over_http.la
 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
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/TS/.packlist
 %%PERL5_MAN3%%/Apache::TS.3.gz
 %%PERL5_MAN3%%/Apache::TS::AdminClient.3.gz
 %%PERL5_MAN3%%/Apache::TS::Config::Records.3.gz
-@owner 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#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
-%%ETCDIR%%/cache.config.default
-%%ETCDIR%%/cluster.config.default
-%%ETCDIR%%/congestion.config.default
-%%ETCDIR%%/hosting.config.default
-%%ETCDIR%%/icp.config.default
-%%ETCDIR%%/ip_allow.config.default
-%%ETCDIR%%/log_hosts.config.default
-%%ETCDIR%%/logs_xml.config.default
-%%ETCDIR%%/parent.config.default
-%%ETCDIR%%/plugin.config.default
-%%ETCDIR%%/prefetch.config.default
-%%ETCDIR%%/records.config.default
-%%ETCDIR%%/remap.config.default
-%%ETCDIR%%/socks.config.default
-%%ETCDIR%%/splitdns.config.default
-%%ETCDIR%%/ssl_multicert.config.default
-%%ETCDIR%%/stats.config.xml.default
-%%ETCDIR%%/storage.config.default
-%%ETCDIR%%/update.config.default
-%%ETCDIR%%/vaddrs.config.default
-%%ETCDIR%%/volume.config.default
-@exec mkdir -p %D/%%ETCDIR%%/snapshots
-@exec chown -f www %D/%%ETCDIR%%/snapshots
-@owner root
-%%ETCDIR%%/trafficserver-release
+%%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 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/TS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
 @dirrm %%SITE_PERL%%/Apache/TS/Config
 @dirrm %%SITE_PERL%%/Apache/TS
 @dirrm %%SITE_PERL%%/Apache
 @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%%
-@unexec rmdir "%%LOGDIR%%" 2>/dev/null || true
-@exec mkdir -p "%%LOGDIR%%"
-@exec chown -f www "%%LOGDIR%%"
-@exec chmod 700 "%%LOGDIR%%"
-@unexec rmdir "%%VARDIR%%" 2>/dev/null || true
-@exec mkdir -p "%%VARDIR%%"
-@exec chown -f www "%%VARDIR%%"
-@exec chmod 700 "%%VARDIR%%"
-@exec chown -f www %D/%%ETCDIR%%
-@exec chmod 700 %D/%%ETCDIR%%
-@exec if [ ! -f %D/%%ETCDIR%%/cache.config ]; then cp -p %D/%%ETCDIR%%/cache.config.default %D/%%ETCDIR%%/cache.config; fi
-@exec if [ ! -f %D/%%ETCDIR%%/cluster.config ]; then cp -p %D/%%ETCDIR%%/cluster.config.default %D/%%ETCDIR%%/cluster.config; fi
-@exec if [ ! -f %D/%%ETCDIR%%/congestion.config ]; then cp -p %D/%%ETCDIR%%/congestion.config.default %D/%%ETCDIR%%/congestion.config; fi
-@exec if [ ! -f %D/%%ETCDIR%%/hosting.config ]; then cp -p %D/%%ETCDIR%%/hosting.config.default %D/%%ETCDIR%%/hosting.config; fi
-@exec if [ ! -f %D/%%ETCDIR%%/icp.config ]; then cp -p %D/%%ETCDIR%%/icp.config.default %D/%%ETCDIR%%/icp.config; fi
-@exec if [ ! -f %D/%%ETCDIR%%/ip_allow.config ]; then cp -p %D/%%ETCDIR%%/ip_allow.config.default %D/%%ETCDIR%%/ip_allow.config; fi
-@exec if [ ! -f %D/%%ETCDIR%%/log_hosts.config ]; then cp -p %D/%%ETCDIR%%/log_hosts.config.default %D/%%ETCDIR%%/log_hosts.config; fi
-@exec if [ ! -f %D/%%ETCDIR%%/logs_xml.config ]; then cp -p %D/%%ETCDIR%%/logs_xml.config.default %D/%%ETCDIR%%/logs_xml.config; fi
-@exec if [ ! -f %D/%%ETCDIR%%/parent.config ]; then cp -p %D/%%ETCDIR%%/parent.config.default %D/%%ETCDIR%%/parent.config; fi
-@exec if [ ! -f %D/%%ETCDIR%%/plugin.config ]; then cp -p %D/%%ETCDIR%%/plugin.config.default %D/%%ETCDIR%%/plugin.config; fi
-@exec if [ ! -f %D/%%ETCDIR%%/prefetch.config ]; then cp -p %D/%%ETCDIR%%/prefetch.config.default %D/%%ETCDIR%%/prefetch.config; fi
-@exec if [ ! -f %D/%%ETCDIR%%/records.config ]; then cp -p %D/%%ETCDIR%%/records.config.default %D/%%ETCDIR%%/records.config; fi
-@exec if [ ! -f %D/%%ETCDIR%%/remap.config ]; then cp -p %D/%%ETCDIR%%/remap.config.default %D/%%ETCDIR%%/remap.config; fi
-@exec if [ ! -f %D/%%ETCDIR%%/socks.config ]; then cp -p %D/%%ETCDIR%%/socks.config.default %D/%%ETCDIR%%/socks.config; fi
-@exec if [ ! -f %D/%%ETCDIR%%/splitdns.config ]; then cp -p %D/%%ETCDIR%%/splitdns.config.default %D/%%ETCDIR%%/splitdns.config; fi
-@exec if [ ! -f %D/%%ETCDIR%%/ssl_multicert.config ]; then cp -p %D/%%ETCDIR%%/ssl_multicert.config.default %D/%%ETCDIR%%/ssl_multicert.config; fi
-@exec if [ ! -f %D/%%ETCDIR%%/stats.config.xml ]; then cp -p %D/%%ETCDIR%%/stats.config.xml.default %D/%%ETCDIR%%/stats.config.xml; fi
-@exec if [ ! -f %D/%%ETCDIR%%/storage.config ]; then cp -p %D/%%ETCDIR%%/storage.config.default %D/%%ETCDIR%%/storage.config; fi
-@exec if [ ! -f %D/%%ETCDIR%%/update.config ]; then cp -p %D/%%ETCDIR%%/update.config.default %D/%%ETCDIR%%/update.config; fi
-@exec if [ ! -f %D/%%ETCDIR%%/vaddrs.config ]; then cp -p %D/%%ETCDIR%%/vaddrs.config.default %D/%%ETCDIR%%/vaddrs.config; fi
-@exec if [ ! -f %D/%%ETCDIR%%/volume.config ]; then cp -p %D/%%ETCDIR%%/volume.config.default %D/%%ETCDIR%%/volume.config; fi
-@exec chmod -f 600 %D/%%ETCDIR%%/*.config
+@dirrmtry /var/cache/trafficserver
+@dirrmtry /var/log/trafficserver
+@dirrmtry /var/run/trafficserver
+@owner root
+@group wheel