Attachment #139429 for bug #185669

View | Details | Raw Unified | Return to bug 185669
Collapse All | Expand All




# Created by: Jui-Nan Lin <jnlin@csie.nctu.edu.tw>
# $FreeBSD: www/trafficserver/Makefile 331378 2013-10-23 12:12:40Z decke $

PORTNAME=	trafficserver
PORTVERSION=	4.1.2
CATEGORIES=	www
MASTER_SITES=	APACHE/${PORTNAME}

MAINTAINER=	jnlin@csie.nctu.edu.tw
COMMENT=	A fast, scalable and extensible HTTP proxy server

LICENSE=	APACHE20

LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
		libpcre.so:${PORTSDIR}/devel/pcre \
		libxml2.so:${PORTSDIR}/textproc/libxml2 \
		libboost_system.so:${PORTSDIR}/devel/boost-libs \
		libcurl.so:${PORTSDIR}/ftp/curl \
		libhwloc.so:${PORTSDIR}/devel/hwloc \
		libluajit-${LUA_VER}.so:${PORTSDIR}/lang/luajit

USE_AUTOTOOLS=	autoconf automake libtool aclocal
GNU_CONFIGURE=	yes
USE_BZIP2=	yes
USES=		pkgconfig tcl gmake perl5
USE_OPENSSL=	yes
USE_SQLITE=	yes
USE_RC_SUBR=	${PORTNAME}
USE_LUA=	5.1+
USE_LDCONFIG=	yes
USE_GCC=	any
ONLY_FOR_ARCHS=	i386 amd64
USERS=		tserv
GROUPS=		nogroup

LDFLAGS+=	-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 \
		--enable-cppapi \
		--with-user=tserv \
		--with-group=nogroup

ACLOCAL_ARGS=	-I build
OPTIONS_DEFINE=	WCCP INTERIM
OPTIONS_RADIO=	MEMMAN
OPTIONS_RADIO_MEMMAN=	ALLOCATORS FREELISTS RECLAIM
OPTIONS_DEFAULT=	FREELISTS
WCCP_CONFIGURE_ENABLE=	wccp
INTERIM_CONFIGURE_ENABLE=	interim-cache
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
.include <bsd.port.options.mk>

.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
FORBIDDEN=	No allocation strategy selected
.endif

post-patch:
	echo ${SITE_PERL}
	#@${REINPLACE_CMD} -e 's,|| mv,|| cp -p,' ${WRKSRC}/proxy/config/Makefile.am

post-install:
	@${MKDIR} ${STAGEDIR}${ETCDIR}/snapshots
	@cd ${STAGEDIR}${ETCDIR} && for f in *.config *.config.xml; do ${MV} $$f $$f.default; done
		-e 's,CFLAGS+=,AM_CFLAGS=,' \
		-e 's,CXXFLAGS+=,AM_CXXFLAGS=,'
	@cd ${WRKSRC} && ${AUTORECONF} -i

post-configure:
	@${FIND} ${WRKSRC} -name 'Makefile' | ${XARGS} ${REINPLACE_CMD} \
	    -e 's,LIBTOOL_LINK_FLAGS = -R -R,LIBTOOL_LINK_FLAGS = -R,' \
	    -e 's,LDFLAGS = -rdynamic  *-R -R,LDFLAGS = -rdynamic -R,'

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (trafficserver-3.2.5.tar.bz2) = 6cada59cb8d8800d48344fa711aec6964083a182deee21fa445c31227bcd1c90	1	SHA256 (trafficserver-4.1.2.tar.bz2) = 16bf75bd22ed2a1ee2bc6bac38add34feffa9c12e787d73b2721eb3042698ef9
2	SIZE (trafficserver-3.2.5.tar.bz2) = 2535498	2	SIZE (trafficserver-4.1.2.tar.bz2) = 6358857

Line 0 Link Here

(-)./files/patch-aio-am (+10 lines)
	1	--- iocore/aio/Makefile.am.orig 2013-12-05 23:07:48.000000000 +0100
	2	+++ iocore/aio/Makefile.am 2013-12-26 02:54:24.767612409 +0100
	3	@@ -15,6 +15,7 @@
	4	# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	5	# See the License for the specific language governing permissions and
	6	# limitations under the License.
	7	+AUTOMAKE_OPTIONS= subdir-objects
	8
	9	AM_CPPFLAGS = \
	10	-I$(top_srcdir)/iocore/eventsystem \

Line 0 Link Here

(-)./files/patch-async-httpfetch (+11 lines)
	1	--- lib/atscppapi/src/AsyncHttpFetch.cc.orig 2014-01-04 01:15:54.566369308 +0100
	2	+++ lib/atscppapi/src/AsyncHttpFetch.cc 2014-01-04 01:16:32.472862425 +0100
	3	@@ -82,7 +82,7 @@
	4	state->body_ = data_start; // data_start will now be pointing to body
	5	state->body_size_ = data_end - data_start;
	6	utils::internal::initResponse(state->response_, state->hdr_buf_, state->hdr_loc_);
	7	- LOG_DEBUG("Fetch result had a status code of %d with a body length of %ld", status, state->body_size_);
	8	+ LOG_DEBUG("Fetch result had a status code of %d with a body length of %zu", status, state->body_size_);
	9	} else {
	10	LOG_ERROR("Unable to parse response; Request URL [%s]; transaction %p",
	11	state->request_.getUrl().getUrlString().c_str(), txn);




--- configure.ac.orig	2013-07-03 04:17:28.000000000 +0800
+++ configure.ac	2013-08-30 05:23:44.089882723 +0800
@@ -40,7 +40,7 @@
 AC_CONFIG_AUX_DIR([build/aux])
 AC_CONFIG_SRCDIR([proxy/Main.cc])
 AC_CONFIG_MACRO_DIR([build])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign no-installinfo no-installman 1.9.2])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign no-installinfo no-installman 1.9.2 subdir-objects])
 AM_CONFIG_HEADER([lib/ts/ink_autoconf.h])
 
 # Configure with --disable-silent-rules to get verbose output. For more info, see
@@ -497,6 +497,10 @@
       [AM_PROG_AR])
 
 
+# required by automake-1.12
+m4_pattern_allow([AM_PROG_AR])
+AM_PROG_AR
+
 AC_PROG_CPP
 AC_PROG_CXXCPP
 AM_PROG_AS
@@ -506,7 +510,6 @@
 AC_PROG_LIBTOOL
 AC_CHECK_PROG(RM, rm, rm)
 AC_CHECK_PROG(ASCPP, cpp, cpp)
-AC_CHECK_TOOL(AR, ar, ar)
 AC_ISC_POSIX
 AS_IF([test "x$enable_wccp" = "xyes"],
   [

Line 0 Link Here

(-)./files/patch-cop-am (+11 lines)
	1	--- cop/Makefile.am.orig 2013-12-05 23:07:48.000000000 +0100
	2	+++ cop/Makefile.am 2013-12-26 02:02:22.606427574 +0100
	3	@@ -17,6 +17,8 @@
	4	# See the License for the specific language governing permissions and
	5	# limitations under the License.
	6
	7	+AUTOMAKE_OPTIONS= subdir-objects
	8	+
	9	AM_CPPFLAGS = $(iocore_include_dirs) \
	10	-I$(top_srcdir)/lib \
	11	-I$(top_srcdir)/lib/records \

Line 0 Link Here

(-)./files/patch-cop-ip4 (+11 lines)
	1	--- cop/TrafficCop.cc.orig 2013-12-05 23:07:48.000000000 +0100
	2	+++ cop/TrafficCop.cc 2014-01-10 21:23:59.575669120 +0100
	3	@@ -813,7 +813,7 @@
	4
	5	snprintf(port_str, sizeof(port_str), "%d", port);
	6	memset(&hints, 0, sizeof(hints));
	7	- hints.ai_family = AF_UNSPEC;
	8	+ hints.ai_family = AF_INET;
	9	hints.ai_socktype = SOCK_STREAM;
	10
	11	err = getaddrinfo(ip, port_str, &hints, &result);

Line 0 Link Here

(-)./files/patch-eventsystem-am (+10 lines)
	1	--- iocore/eventsystem//Makefile.am.orig 2013-12-26 02:59:32.366885091 +0100
	2	+++ iocore/eventsystem//Makefile.am 2013-12-26 03:00:25.109127835 +0100
	3	@@ -15,6 +15,7 @@
	4	# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	5	# See the License for the specific language governing permissions and
	6	# limitations under the License.
	7	+AUTOMAKE_OPTIONS= subdir-objects
	8
	9	AM_CPPFLAGS = \
	10	-I$(top_srcdir)/lib \

Line 0 Link Here

(-)./files/patch-example-am (+10 lines)
	1	--- example//Makefile.am.bak 2013-12-26 01:56:48.456531043 +0100
	2	+++ example/Makefile.am 2013-12-26 02:35:30.387048326 +0100
	3	@@ -13,6 +13,7 @@
	4	# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	5	# See the License for the specific language governing permissions and
	6	# limitations under the License.
	7	+AUTOMAKE_OPTIONS= subdir-objects
	8
	9	include $(top_srcdir)/build/plugins.mk
	10




--- lib/atscppapi/src/GzipDeflateTransformation.cc.orig	2013-12-05 23:07:48.000000000 +0100
+++ lib/atscppapi/src/GzipDeflateTransformation.cc	2014-01-03 23:26:24.384624249 +0100
@@ -97,20 +97,20 @@
   vector<unsigned char> buffer(buffer_size);
 
   do {
-    LOG_DEBUG("Iteration %d: Deflate will compress %ld bytes", ++iteration, data.size());
+    LOG_DEBUG("Iteration %d: Deflate will compress %zu bytes", ++iteration, data.size());
     state_->z_stream_.avail_out = buffer_size;
     state_->z_stream_.next_out = &buffer[0];
 
     int err = deflate(&state_->z_stream_, Z_SYNC_FLUSH);
     if (Z_OK != err) {
-      LOG_ERROR("Iteration %d: Deflate failed to compress %ld bytes with error code '%d'", iteration, data.size(), err);
+      LOG_ERROR("Iteration %d: Deflate failed to compress %zu bytes with error code '%d'", iteration, data.size(), err);
       return;
     }
 
     int bytes_to_write = buffer_size - state_->z_stream_.avail_out;
     state_->bytes_produced_ += bytes_to_write;
 
-    LOG_DEBUG("Iteration %d: Deflate compressed %ld bytes to %d bytes, producing output...", iteration, data.size(), bytes_to_write);
+    LOG_DEBUG("Iteration %d: Deflate compressed %zu bytes to %d bytes, producing output...", iteration, data.size(), bytes_to_write);
     produce(string(reinterpret_cast<char *>(&buffer[0]), static_cast<size_t>(bytes_to_write)));
   } while (state_->z_stream_.avail_out == 0);
 
@@ -148,7 +148,7 @@
 
   int64_t bytes_written = setOutputComplete();
   if (state_->bytes_produced_ != bytes_written) {
-    LOG_ERROR("Gzip bytes produced sanity check failed, deflated bytes = %ld != written bytes = %ld", state_->bytes_produced_, bytes_written);
+    LOG_ERROR("Gzip bytes produced sanity check failed, deflated bytes = %lld != written bytes = %lld", state_->bytes_produced_, bytes_written);
   }
 }
 

Line 0 Link Here

(-)./files/patch-gzip-inflate (+11 lines)
	1	--- lib/atscppapi/src/GzipInflateTransformation.cc.orig 2014-01-04 01:13:24.053492633 +0100
	2	+++ lib/atscppapi/src/GzipInflateTransformation.cc 2014-01-04 01:14:45.654204943 +0100
	3	@@ -122,7 +122,7 @@
	4	void GzipInflateTransformation::handleInputComplete() {
	5	int64_t bytes_written = setOutputComplete();
	6	if (state_->bytes_produced_ != bytes_written) {
	7	- LOG_ERROR("Gzip bytes produced sanity check failed, inflated bytes = %ld != written bytes = %ld", state_->bytes_produced_, bytes_written);
	8	+ LOG_ERROR("Gzip bytes produced sanity check failed, inflated bytes = %lld != written bytes = %lld", state_->bytes_produced_, bytes_written);
	9	}
	10	}
	11

Lines 1-11 Link Here

(-)./files/patch-lib_ts_Makefile.am (-11 lines)
1	--- lib/ts/Makefile.am.orig 2012-12-17 11:28:39.000000000 +0800
2	+++ lib/ts/Makefile.am 2012-12-17 11:29:12.000000000 +0800
3	@@ -153,7 +153,7 @@
4	Version.cc
5
6	# Special hacks to generate the parser rules
7	-$(srcdir)/ParseRules.cc: ParseRulesCType
8	+ParseRules.cc: ParseRulesCType
9
10	ParseRulesCType: CompileParseRules
11	./CompileParseRules

Line 0 Link Here

(-)./files/patch-libxml2-detect (+11 lines)
	1	--- build/xml.m4.orig 2013-12-05 23:07:48.000000000 +0100
	2	+++ build/xml.m4 2014-01-01 14:33:14.385053860 +0100
	3	@@ -59,7 +59,7 @@
	4	elif test "$withval" != "no"; then
	5	enable_libxml2=yes
	6	libxml2_include="$withval/include/libxml2"
	7	- libxml2_ldflags="$withval/lib"
	8	+ libxml2_ldflags="-L$withval/lib"
	9	fi
	10	fi
	11	])

Line 0 Link Here

(-)./files/patch-mgmt-am (+10 lines)
	1	--- mgmt/Makefile.am.orig 2013-12-26 03:08:10.186334243 +0100
	2	+++ mgmt/Makefile.am 2013-12-26 03:09:32.187469181 +0100
	3	@@ -16,6 +16,7 @@
	4	# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	5	# See the License for the specific language governing permissions and
	6	# limitations under the License.
	7	+AUTOMAKE_OPTIONS= subdir-objects
	8
	9	SUBDIRS = cluster preparse utils web2 stats api cli
	10

Line 0 Link Here

(-)./files/patch-mgmt-remote-am (+10 lines)
	1	--- mgmt/api/remote/Makefile.am.orig 2013-12-26 03:11:07.437395144 +0100
	2	+++ mgmt/api/remote/Makefile.am 2013-12-26 03:11:28.186089219 +0100
	3	@@ -13,6 +13,7 @@
	4	# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	5	# See the License for the specific language governing permissions and
	6	# limitations under the License.
	7	+AUTOMAKE_OPTIONS= subdir-objects
	8
	9	AM_CPPFLAGS = \
	10	$(iocore_include_dirs) \




--- mgmt/utils/Makefile.am.orig	2013-08-30 06:02:17.979883250 +0800
+++ mgmt/utils/Makefile.am	2013-08-30 06:02:36.918052210 +0800
@@ -40,8 +40,8 @@
 
 libutils_lm_a_CPPFLAGS = $(ink_with_modules_local) $(AM_CPPFLAGS)
 libutils_lm_a_SOURCES = \
-  $(top_srcdir)/lib/ts/MatcherUtils.cc \
-  $(top_srcdir)/proxy/DiagsConfig.cc \
+  ../../lib/ts/MatcherUtils.cc \
+  ../../proxy/DiagsConfig.cc \
   EnvBlock.cc \
   EnvBlock.h \
   ExpandingArray.cc \




--- proxy/Makefile.am.orig	2013-12-05 23:07:48.000000000 +0100
+++ proxy/Makefile.am	2014-01-05 01:31:46.463485495 +0100
@@ -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

Line 0 Link Here

(-)./files/patch-plugin-esi-am (+10 lines)
	1	--- plugins/experimental/esi//Makefile.am.orig 2013-12-26 03:14:38.806226779 +0100
	2	+++ plugins/experimental/esi/Makefile.am 2013-12-26 03:15:15.807903853 +0100
	3	@@ -13,6 +13,7 @@
	4	# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	5	# See the License for the specific language governing permissions and
	6	# limitations under the License.
	7	+AUTOMAKE_OPTIONS= subdir-objects
	8
	9	include $(top_srcdir)/build/plugins.mk
	10

Line 0 Link Here

(-)./files/patch-plugin-spdy-am (+10 lines)
	1	--- plugins/experimental/spdy/Makefile.am.orig 2013-12-26 03:15:29.036388192 +0100
	2	+++ plugins/experimental/spdy/Makefile.am 2013-12-26 03:15:49.366474957 +0100
	3	@@ -13,6 +13,7 @@
	4	# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	5	# See the License for the specific language governing permissions and
	6	# limitations under the License.
	7	+AUTOMAKE_OPTIONS= subdir-objects
	8
	9	include $(top_srcdir)/build/plugins.mk
	10




--- example/protocol/Protocol.c.orig	2013-12-05 23:07:48.000000000 +0100
+++ example/protocol/Protocol.c	2013-12-30 03:04:20.000454389 +0100
@@ -104,6 +104,7 @@
 TSPluginInit(int argc, const char *argv[])
 {
   TSPluginRegistrationInfo info;
+  char *end;
 
   info.plugin_name = "output-header";
   info.vendor_name = "MyCompany";
@@ -124,17 +125,19 @@
     printf("[protocol_plugin] Usage: protocol.so accept_port server_port\n");
     printf("[protocol_plugin] Wrong arguments. Using deafult ports.\n");
   } else {
-    if (!isnan(atoi(argv[1]))) {
-      accept_port = atoi(argv[1]);
+    strtol(argv[1], &end, 10);
+    if (*end == '\0') {
+      accept_port = strtol(argv[1], &end, 10);
       TSDebug("protocol", "using accept_port %d", accept_port);
       printf("[protocol_plugin] using accept_port %d\n", accept_port);
     } else {
       printf("[protocol_plugin] Wrong argument for accept_port.");
       printf("Using deafult port %d\n", accept_port);
     }
-
-    if (!isnan(atoi(argv[2]))) {
-      server_port = atoi(argv[2]);
+  
+    strtol(argv[2], &end, 10);
+    if (*end == '\0') {
+      server_port = strtol(argv[2], &end, 10);
       TSDebug("protocol", "using server_port %d", server_port);
       printf("[protocol_plugin] using server_port %d\n", server_port);
     } else {




--- lib/atscppapi/src/include/atscppapi/shared_ptr.h.orig	2013-12-05 23:07:48.000000000 +0100
+++ lib/atscppapi/src/include/atscppapi/shared_ptr.h	2014-01-03 12:41:01.344387908 +0100
@@ -25,7 +25,14 @@
 #ifndef ASTCPPAPI_SHARED_PTR_H_
 #define ASTCPPAPI_SHARED_PTR_H_
 
+#include <boost/config.hpp>
+#include <boost/tr1/detail/config.hpp>
+
+#ifndef BOOST_NO_CXX11_SMART_PTR
+#include <memory>
+#else
 #include <tr1/memory>
+#endif
 
 namespace atscppapi {
 
@@ -34,8 +41,11 @@
  * \todo Consider adding a simple macro to check if c++0x/11 is enabled
  * and if so change it to std::shared_ptr and #include <memory>s
  */
+#ifndef BOOST_NO_CXX11_SMART_PTR
+using std::shared_ptr;
+#else
 using std::tr1::shared_ptr;
-
+#endif
 } /* atscppapi */
 
 #endif /* SHARED_PTR_H_ */

Line 0 Link Here

(-)./files/patch-sizeof (+11 lines)
	1	--- lib/atscppapi/src/Logger.cc.orig 2014-01-03 20:21:37.302478901 +0100
	2	+++ lib/atscppapi/src/Logger.cc 2014-01-03 20:21:57.553546186 +0100
	3	@@ -189,7 +189,7 @@
	4	LOG_DEBUG("logging a " level " to '%s' with length %d", state_->filename_.c_str(), n); \
	5	TSTextLogObjectWrite(state_->text_log_obj_, const_cast<char*>("[" level "] %s"), buffer); \
	6	} else { \
	7	- LOG_ERROR("Unable to log " level " message to '%s' due to size exceeding %lud bytes.", state_->filename_.c_str(), sizeof(buffer)); \
	8	+ LOG_ERROR("Unable to log " level " message to '%s' due to size exceeding %zu bytes.", state_->filename_.c_str(), sizeof(buffer)); \
	9	} \
	10	return; \
	11	}

Line 0 Link Here

(-)./files/patch-tcl86 (+9 lines)
	1	--- mgmt/cli/cliMain.cc
	2	+++ mgmt/cli/cliMain.cc
	3	@@ -87,6 +87,7 @@ main(int argc, char *argv[])
	4	register_event_callback();
	5
	6	#if HAVE_LIBREADLINE
	7	+ Tcl_FindExecutable(NULL);
	8	Tcl_SetMainLoop(Tcl_ReadlineMain);
	9	#endif

Line 0 Link Here

(-)./files/patch-tools-am (+10 lines)
	1	--- tools/Makefile.am.orig 2013-12-26 03:17:49.755901012 +0100
	2	+++ tools/Makefile.am 2013-12-26 03:18:08.506640619 +0100
	3	@@ -16,6 +16,7 @@
	4	# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	5	# See the License for the specific language governing permissions and
	6	# limitations under the License.
	7	+AUTOMAKE_OPTIONS= subdir-objects
	8
	9	bin_SCRIPTS = tsxs tspush
	10	bin_PROGRAMS =




--- lib/atscppapi/src/TransformationPlugin.cc.orig	2013-12-05 23:07:48.000000000 +0100
+++ lib/atscppapi/src/TransformationPlugin.cc	2014-01-04 00:48:22.063292251 +0100
@@ -91,7 +91,7 @@
   TSVIO write_vio = TSVConnWriteVIOGet(contp);
   if (write_vio) {
     int64_t to_read = TSVIONTodoGet(write_vio);
-    LOG_DEBUG("Transformation contp=%p write_vio=%p, to_read=%ld", contp, write_vio, to_read);
+    LOG_DEBUG("Transformation contp=%p write_vio=%p, to_read=%lld", contp, write_vio, to_read);
 
     if (to_read > 0) {
       /*
@@ -99,11 +99,11 @@
        * the amount of data actually in the read buffer.
        **/
       int64_t avail = TSIOBufferReaderAvail(TSVIOReaderGet(write_vio));
-      LOG_DEBUG("Transformation contp=%p write_vio=%p, to_read=%ld, buffer reader avail=%ld", contp, write_vio, to_read, avail);
+      LOG_DEBUG("Transformation contp=%p write_vio=%p, to_read=%lld, buffer reader avail=%lld", contp, write_vio, to_read, avail);
 
       if (to_read > avail) {
         to_read = avail;
-        LOG_DEBUG("Transformation contp=%p write_vio=%p, to read > avail, fixing to_read to be equal to avail. to_read=%ld, buffer reader avail=%ld", contp, write_vio, to_read, avail);
+        LOG_DEBUG("Transformation contp=%p write_vio=%p, to read > avail, fixing to_read to be equal to avail. to_read=%lld, buffer reader avail=%lld", contp, write_vio, to_read, avail);
       }
 
       if (to_read > 0) {
@@ -122,7 +122,7 @@
         TSVIONDoneSet(write_vio, TSVIONDoneGet(write_vio) + to_read);
 
         std::string in_data = utils::internal::consumeFromTSIOBufferReader(input_reader);
-        LOG_DEBUG("Transformation contp=%p write_vio=%p consumed %ld bytes from bufferreader", contp, write_vio, in_data.length());
+        LOG_DEBUG("Transformation contp=%p write_vio=%p consumed %zu bytes from bufferreader", contp, write_vio, in_data.length());
 
         /* Clean up the buffer and reader */
         TSIOBufferReaderFree(input_reader);
@@ -232,7 +232,7 @@
 }
 
 size_t TransformationPlugin::produce(const std::string &data) {
-  LOG_DEBUG("TransformationPlugin=%p tshttptxn=%p producing output with length=%ld", this, state_->txn_, data.length());
+  LOG_DEBUG("TransformationPlugin=%p tshttptxn=%p producing output with length=%zu", this, state_->txn_, data.length());
   int64_t write_length = static_cast<int64_t>(data.length());
   if (!write_length) {
     return 0;
@@ -261,11 +261,11 @@
   // Finally we can copy this data into the output_buffer
   int64_t bytes_written = TSIOBufferWrite(state_->output_buffer_, data.c_str(), write_length);
   state_->bytes_written_ += bytes_written; // So we can set BytesDone on outputComplete().
-  LOG_DEBUG("TransformationPlugin=%p tshttptxn=%p write to TSIOBuffer %ld bytes total bytes written %ld", this, state_->txn_, bytes_written, state_->bytes_written_);
+  LOG_DEBUG("TransformationPlugin=%p tshttptxn=%p write to TSIOBuffer %lld bytes total bytes written %lld", this, state_->txn_, bytes_written, state_->bytes_written_);
 
   // Sanity Checks
   if (bytes_written != write_length) {
-    LOG_ERROR("TransformationPlugin=%p tshttptxn=%p bytes written < expected. bytes_written=%ld write_length=%ld", this, state_->txn_, bytes_written, write_length);
+    LOG_ERROR("TransformationPlugin=%p tshttptxn=%p bytes written < expected. bytes_written=%lld write_length=%lld", this, state_->txn_, bytes_written, write_length);
   }
 
   int connection_closed = TSVConnClosedGet(state_->vconn_);
@@ -282,7 +282,7 @@
 
 size_t TransformationPlugin::setOutputComplete() {
   int connection_closed = TSVConnClosedGet(state_->vconn_);
-  LOG_DEBUG("OutputComplete TransformationPlugin=%p tshttptxn=%p vconn=%p connection_closed=%d, total bytes written=%ld", this, state_->txn_, state_->vconn_, connection_closed,state_->bytes_written_);
+  LOG_DEBUG("OutputComplete TransformationPlugin=%p tshttptxn=%p vconn=%p connection_closed=%d, total bytes written=%lld", this, state_->txn_, state_->vconn_, connection_closed,state_->bytes_written_);
 
   if (!connection_closed && !state_->output_vio_) {
       LOG_DEBUG("TransformationPlugin=%p tshttptxn=%p output complete without writing any data, initiating write of 0 bytes.", this, state_->txn_);

Line 0 Link Here

(-)./files/patch-utilsh (+10 lines)
	1	--- lib/atscppapi/src/include/atscppapi/utils.h.orig 2013-12-05 23:07:48.000000000 +0100
	2	+++ lib/atscppapi/src/include/atscppapi/utils.h 2014-01-03 13:21:49.182889190 +0100
	3	@@ -27,6 +27,7 @@
	4	#define ATSCPPAPI_UTILS_H_
	5
	6	#include <string>
	7	+#include <netinet/in.h>
	8	#include <arpa/inet.h>
	9	#include <stdint.h>
	10




@comment $FreeBSD: www/trafficserver/pkg-plist 331378 2013-10-23 12:12:40Z decke $
@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
@unexec if cmp %D/%%ETCDIR%%/vaddrs.config %D/%%ETCDIR%%/vaddrs.config.default; then rm %D/%%ETCDIR%%/vaddrs.config; fi
bin/traffic_cop
bin/traffic_line
bin/traffic_logcat

bin/traffic_server
bin/traffic_shell
bin/trafficserver
bin/tspush
bin/tstop
bin/tsxs
include/ts/experimental.h
include/ts/mgmtapi.h
include/ts/remap.h
include/ts/ts.h
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/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/Url.h
include/atscppapi/noncopyable.h
include/atscppapi/shared_ptr.h
include/atscppapi/utils.h
lib/libatscppapi.la
lib/libatscppapi.so
lib/libatscppapi.so.5
lib/libtsmgmt.la
lib/libtsmgmt.so
lib/libtsmgmt.so.5
lib/libtsutil.a
lib/libtsutil.la
lib/libtsutil.so
lib/libtsutil.so.5
libexec/trafficserver/cacheurl.la
libexec/trafficserver/cacheurl.so
libexec/trafficserver/conf_remap.la
libexec/trafficserver/conf_remap.so
libexec/trafficserver/gzip.la
libexec/trafficserver/gzip.so
libexec/trafficserver/header_filter.la
libexec/trafficserver/header_filter.so
libexec/trafficserver/libloader.la
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
%%SITE_PERL%%/Apache/TS.pm
%%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
man/man1/traffic_shell.1.gz
@owner tserv
%%ETCDIR%%/body_factory/default/.body_factory_info
%%ETCDIR%%/body_factory/default/README
%%ETCDIR%%/body_factory/default/access#denied

%%ETCDIR%%/ip_allow.config.default
%%ETCDIR%%/log_hosts.config.default
%%ETCDIR%%/logs_xml.config.default
%%ETCDIR%%/mgr.cnf.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%%/ssl_multicert.config.default
%%ETCDIR%%/stats.config.xml.default
%%ETCDIR%%/storage.config.default
%%ETCDIR%%/trafficserver-release
%%ETCDIR%%/update.config.default
%%ETCDIR%%/vaddrs.config.default
%%ETCDIR%%/volume.config.default
@exec mkdir -p %D/%%ETCDIR%%/snapshots
@exec chown -f tserv %D/%%ETCDIR%%/snapshots
@owner root
%%ETCDIR%%/trafficserver-release
share/doc/trafficserver/trafficshell/config_alarms.1
share/doc/trafficserver/trafficshell/config_cache.1
share/doc/trafficserver/trafficshell/config_clock.1

share/doc/trafficserver/trafficshell/show_status.1
share/doc/trafficserver/trafficshell/show_version.1
share/doc/trafficserver/trafficshell/show_virtual-ip.1
@exec mkdir -p %D/var/log/trafficserver
@exec chown -f tserv %D/var/log/trafficserver
@exec chmod 700 %D/var/log/trafficserver
@exec mkdir -p %D/var/trafficserver
@exec chown -f tserv %D/var/trafficserver
@exec chmod 700 %D/var/trafficserver
@dirrm share/trafficserver
@dirrm share/doc/trafficserver/trafficshell
@dirrm share/doc/trafficserver
@dirrm libexec/trafficserver
@dirrm include/ts
@dirrm %%ETCDIR%%/internal
@dirrm %%ETCDIR%%/body_factory/default
@dirrmtry var/log/trafficserver
@dirrmtry var/trafficserver
@dirrmtry %%ETCDIR%%/body_factory
@dirrmtry %%ETCDIR%%/snapshots
@dirrmtry %%ETCDIR%%
@exec chown -f tserv %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%%/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%%/mgr.cnf ]; then cp -p %D/%%ETCDIR%%/mgr.cnf.default %D/%%ETCDIR%%/mgr.cnf; 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%%/volume.config ]; then cp -p %D/%%ETCDIR%%/volume.config.default %D/%%ETCDIR%%/volume.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%%/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

Return to bug 185669

Lines 1-50 Link Here

(-)./Makefile (-25 / +54 lines)
1	# Created by: Jui-Nan Lin <jnlin@csie.nctu.edu.tw>	1	# Created by: Jui-Nan Lin <jnlin@csie.nctu.edu.tw>
2	# $FreeBSD: www/trafficserver/Makefile 339370 2014-01-10 16:45:49Z gahr $	2	# $FreeBSD: www/trafficserver/Makefile 331378 2013-10-23 12:12:40Z decke $
3		3
4	PORTNAME= trafficserver	4	PORTNAME= trafficserver
5	PORTVERSION= 3.2.5	5	PORTVERSION= 4.1.2
6	CATEGORIES= www	6	CATEGORIES= www
7	MASTER_SITES= APACHE/${PORTNAME}	7	MASTER_SITES= APACHE/${PORTNAME}
8		8
9	MAINTAINER= jnlin@csie.nctu.edu.tw	9	MAINTAINER= jnlin@csie.nctu.edu.tw
10	COMMENT= Fast, scalable and extensible HTTP proxy server	10	COMMENT= A fast, scalable and extensible HTTP proxy server
11		11
12	LICENSE= APACHE20	12	LICENSE= APACHE20
13		13
14	LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \	14	LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
15	libexpat.so:${PORTSDIR}/textproc/expat2 \	15	libpcre.so:${PORTSDIR}/devel/pcre \
16	libpcre.so:${PORTSDIR}/devel/pcre	16	libxml2.so:${PORTSDIR}/textproc/libxml2 \
		17	libboost_system.so:${PORTSDIR}/devel/boost-libs \
		18	libcurl.so:${PORTSDIR}/ftp/curl \
		19	libhwloc.so:${PORTSDIR}/devel/hwloc \
		20	libluajit-${LUA_VER}.so:${PORTSDIR}/lang/luajit
17		21
18	USE_AUTOTOOLS= autoconf automake libtool	22	USE_AUTOTOOLS= autoconf automake libtool aclocal
		23	GNU_CONFIGURE= yes
19	USE_BZIP2= yes	24	USE_BZIP2= yes
20	USES= pkgconfig tcl	25	USES= pkgconfig tcl gmake perl5
21	USE_OPENSSL= yes	26	USE_OPENSSL= yes
22	USE_SQLITE= yes	27	USE_SQLITE= yes
23	USE_RC_SUBR= ${PORTNAME}	28	USE_RC_SUBR= ${PORTNAME}
		29	USE_LUA= 5.1+
24	USE_LDCONFIG= yes	30	USE_LDCONFIG= yes
25	USE_GCC= any
26	ONLY_FOR_ARCHS= i386 amd64	31	ONLY_FOR_ARCHS= i386 amd64
		32	USERS= tserv
		33	GROUPS= nogroup
27		34
28	LDFLAGS+= -L${LOCALBASE}/lib	35	LDFLAGS+= -L${LOCALBASE}/lib
29	CONFIGURE_ARGS= --with-expat=${LOCALBASE} \	36	CONFIGURE_ARGS+= --with-libxml2=${LOCALBASE} \
30	--with-pcre=${LOCALBASE} \	37	--with-pcre=${LOCALBASE} \
31	--with-openssl=${OPENSSLBASE}	38	--with-openssl=${OPENSSLBASE} \
32		39	--with-xml=libxml2 \
33	.include <bsd.port.pre.mk>	40	--with-lua=${LOCALBASE} --enable-luajit \
		41	--with-tcl=${TCL_LIBDIR} \
		42	--verbose \
		43	--enable-cppapi \
		44	--with-user=tserv \
		45	--with-group=nogroup
		46
		47	ACLOCAL_ARGS= -I build
		48	OPTIONS_DEFINE= WCCP INTERIM
		49	OPTIONS_RADIO= MEMMAN
		50	OPTIONS_RADIO_MEMMAN= ALLOCATORS FREELISTS RECLAIM
		51	OPTIONS_DEFAULT= FREELISTS
		52	WCCP_CONFIGURE_ENABLE= wccp
		53	INTERIM_CONFIGURE_ENABLE= interim-cache
		54	WCCP_DESC= Enable WCCPv2 protocol
		55	INTERIM_DESC= Enable interim cache (SSD)
		56	ALLOCATORS_DESC= Manage memory with allocators
		57	FREELISTS_DESC= Manage memory with freelists
		58	RECLAIM_DESC= Reclaim unused memory in freelists
		59	.include <bsd.port.options.mk>
		60
		61	.if ${PORT_OPTIONS:MRECLAIM}
		62	CONFIGURE_ARGS+= --enable-reclaimable-freelist --enable-freelist
		63	.elif ${PORT_OPTIONS:MFREELISTS}
		64	CONFIGURE_ARGS+= --enable-freelist
		65	.elif ${PORT_OPTIONS:MALLOCATORS}
		66	CONFIGURE_ARGS+= --disable-freelist
		67	.else
		68	FORBIDDEN= No allocation strategy selected
		69	.endif
34		70
35	post-patch:	71	post-patch:
36	@${REINPLACE_CMD} -e 's,\|\| mv,\|\| cp -p,' ${WRKSRC}/proxy/config/Makefile.am	72	echo ${SITE_PERL}
		73	#@${REINPLACE_CMD} -e 's,\|\| mv,\|\| cp -p,' ${WRKSRC}/proxy/config/Makefile.am
37		74
38	pre-configure:	75	post-install:
39	@${FIND} ${WRKSRC}/example ${WRKSRC}/plugins/conf_remap \	76	@${MKDIR} ${STAGEDIR}${ETCDIR}/snapshots
40	-name Makefile.am \| ${XARGS} ${REINPLACE_CMD} \	77	@cd ${STAGEDIR}${ETCDIR} && for f in .config .config.xml; do ${MV} $$f $$f.default; done
41	-e 's,CFLAGS+=,AM_CFLAGS=,' \
42	-e 's,CXXFLAGS+=,AM_CXXFLAGS=,'
43	@cd ${WRKSRC} && ${AUTORECONF} -i
44
45	post-configure:
46	@${FIND} ${WRKSRC} -name 'Makefile' \| ${XARGS} ${REINPLACE_CMD} \
47	-e 's,LIBTOOL_LINK_FLAGS = -R -R,LIBTOOL_LINK_FLAGS = -R,' \
48	-e 's,LDFLAGS = -rdynamic *-R -R,LDFLAGS = -rdynamic -R,'
49		78
50	.include <bsd.port.post.mk>	79	.include <bsd.port.mk>

Lines 1-30 Link Here

(-)./files/patch-configure.ac (-30 lines)
1	--- configure.ac.orig 2013-07-03 04:17:28.000000000 +0800
2	+++ configure.ac 2013-08-30 05:23:44.089882723 +0800
3	@@ -40,7 +40,7 @@
4	AC_CONFIG_AUX_DIR([build/aux])
5	AC_CONFIG_SRCDIR([proxy/Main.cc])
6	AC_CONFIG_MACRO_DIR([build])
7	-AM_INIT_AUTOMAKE([-Wall -Werror foreign no-installinfo no-installman 1.9.2])
8	+AM_INIT_AUTOMAKE([-Wall -Werror foreign no-installinfo no-installman 1.9.2 subdir-objects])
9	AM_CONFIG_HEADER([lib/ts/ink_autoconf.h])
10
11	# Configure with --disable-silent-rules to get verbose output. For more info, see
12	@@ -497,6 +497,10 @@
13	[AM_PROG_AR])
14
15
16	+# required by automake-1.12
17	+m4_pattern_allow([AM_PROG_AR])
18	+AM_PROG_AR
19	+
20	AC_PROG_CPP
21	AC_PROG_CXXCPP
22	AM_PROG_AS
23	@@ -506,7 +510,6 @@
24	AC_PROG_LIBTOOL
25	AC_CHECK_PROG(RM, rm, rm)
26	AC_CHECK_PROG(ASCPP, cpp, cpp)
27	-AC_CHECK_TOOL(AR, ar, ar)
28	AC_ISC_POSIX
29	AS_IF([test "x$enable_wccp" = "xyes"],
30	[

Line 0 Link Here

(-)./files/patch-gzip-deflate-log (+35 lines)
	1	--- lib/atscppapi/src/GzipDeflateTransformation.cc.orig 2013-12-05 23:07:48.000000000 +0100
	2	+++ lib/atscppapi/src/GzipDeflateTransformation.cc 2014-01-03 23:26:24.384624249 +0100
	3	@@ -97,20 +97,20 @@
	4	vector<unsigned char> buffer(buffer_size);
	5
	6	do {
	7	- LOG_DEBUG("Iteration %d: Deflate will compress %ld bytes", ++iteration, data.size());
	8	+ LOG_DEBUG("Iteration %d: Deflate will compress %zu bytes", ++iteration, data.size());
	9	state_->z_stream_.avail_out = buffer_size;
	10	state_->z_stream_.next_out = &buffer[0];
	11
	12	int err = deflate(&state_->z_stream_, Z_SYNC_FLUSH);
	13	if (Z_OK != err) {
	14	- LOG_ERROR("Iteration %d: Deflate failed to compress %ld bytes with error code '%d'", iteration, data.size(), err);
	15	+ LOG_ERROR("Iteration %d: Deflate failed to compress %zu bytes with error code '%d'", iteration, data.size(), err);
	16	return;
	17	}
	18
	19	int bytes_to_write = buffer_size - state_->z_stream_.avail_out;
	20	state_->bytes_produced_ += bytes_to_write;
	21
	22	- LOG_DEBUG("Iteration %d: Deflate compressed %ld bytes to %d bytes, producing output...", iteration, data.size(), bytes_to_write);
	23	+ LOG_DEBUG("Iteration %d: Deflate compressed %zu bytes to %d bytes, producing output...", iteration, data.size(), bytes_to_write);
	24	produce(string(reinterpret_cast<char *>(&buffer[0]), static_cast<size_t>(bytes_to_write)));
	25	} while (state_->z_stream_.avail_out == 0);
	26
	27	@@ -148,7 +148,7 @@
	28
	29	int64_t bytes_written = setOutputComplete();
	30	if (state_->bytes_produced_ != bytes_written) {
	31	- LOG_ERROR("Gzip bytes produced sanity check failed, deflated bytes = %ld != written bytes = %ld", state_->bytes_produced_, bytes_written);
	32	+ LOG_ERROR("Gzip bytes produced sanity check failed, deflated bytes = %lld != written bytes = %lld", state_->bytes_produced_, bytes_written);
	33	}
	34	}
	35

Lines 1-13 Link Here

(-)./files/patch-mgmt_utils_Makefile.am (-13 lines)
1	--- mgmt/utils/Makefile.am.orig 2013-08-30 06:02:17.979883250 +0800
2	+++ mgmt/utils/Makefile.am 2013-08-30 06:02:36.918052210 +0800
3	@@ -40,8 +40,8 @@
4
5	libutils_lm_a_CPPFLAGS = $(ink_with_modules_local) $(AM_CPPFLAGS)
6	libutils_lm_a_SOURCES = \
7	- $(top_srcdir)/lib/ts/MatcherUtils.cc \
8	- $(top_srcdir)/proxy/DiagsConfig.cc \
9	+ ../../lib/ts/MatcherUtils.cc \
10	+ ../../proxy/DiagsConfig.cc \
11	EnvBlock.cc \
12	EnvBlock.h \
13	ExpandingArray.cc \

Line 0 Link Here

(-)./files/patch-nonrootinstall (+20 lines)
	1	--- proxy/Makefile.am.orig 2013-12-05 23:07:48.000000000 +0100
	2	+++ proxy/Makefile.am 2014-01-05 01:31:46.463485495 +0100
	3	@@ -291,7 +291,7 @@
	4	versiondir = $(pkgsysconfdir)
	5
	6	install-data-local:
	7	- if [ `id -un` != "root" ]; then \
	8	+ if true ; then \
	9	$(INSTALL) -d $(DESTDIR)$(pkglocalstatedir) $(DESTDIR)$(pkglogdir) $(DESTDIR)$(pkgruntimedir) \
	10	$(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(pkgcachedir); \
	11	else \
	12	@@ -302,7 +302,7 @@
	13	fi
	14
	15	install-data-hook:
	16	- if [ `id -un` == "root" ]; then \
	17	+ if false; then \
	18	chown -R $(pkgsysuser):$(pkgsysgroup) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkgdatadir);\
	19	fi
	20	-echo "<TS_VERSION> $(PACKAGE_VERSION)" > $(DESTDIR)$(pkgsysconfdir)/trafficserver-release

Line 0 Link Here

(-)./files/patch-protocol-atoi (+35 lines)
	1	--- example/protocol/Protocol.c.orig 2013-12-05 23:07:48.000000000 +0100
	2	+++ example/protocol/Protocol.c 2013-12-30 03:04:20.000454389 +0100
	3	@@ -104,6 +104,7 @@
	4	TSPluginInit(int argc, const char *argv[])
	5	{
	6	TSPluginRegistrationInfo info;
	7	+ char *end;
	8
	9	info.plugin_name = "output-header";
	10	info.vendor_name = "MyCompany";
	11	@@ -124,17 +125,19 @@
	12	printf("[protocol_plugin] Usage: protocol.so accept_port server_port\n");
	13	printf("[protocol_plugin] Wrong arguments. Using deafult ports.\n");
	14	} else {
	15	- if (!isnan(atoi(argv[1]))) {
	16	- accept_port = atoi(argv[1]);
	17	+ strtol(argv[1], &end, 10);
	18	+ if (*end == '\0') {
	19	+ accept_port = strtol(argv[1], &end, 10);
	20	TSDebug("protocol", "using accept_port %d", accept_port);
	21	printf("[protocol_plugin] using accept_port %d\n", accept_port);
	22	} else {
	23	printf("[protocol_plugin] Wrong argument for accept_port.");
	24	printf("Using deafult port %d\n", accept_port);
	25	}
	26	-
	27	- if (!isnan(atoi(argv[2]))) {
	28	- server_port = atoi(argv[2]);
	29	+
	30	+ strtol(argv[2], &end, 10);
	31	+ if (*end == '\0') {
	32	+ server_port = strtol(argv[2], &end, 10);
	33	TSDebug("protocol", "using server_port %d", server_port);
	34	printf("[protocol_plugin] using server_port %d\n", server_port);
	35	} else {

Line 0 Link Here

(-)./files/patch-sharedptr (+30 lines)
	1	--- lib/atscppapi/src/include/atscppapi/shared_ptr.h.orig 2013-12-05 23:07:48.000000000 +0100
	2	+++ lib/atscppapi/src/include/atscppapi/shared_ptr.h 2014-01-03 12:41:01.344387908 +0100
	3	@@ -25,7 +25,14 @@
	4	#ifndef ASTCPPAPI_SHARED_PTR_H_
	5	#define ASTCPPAPI_SHARED_PTR_H_
	6
	7	+#include <boost/config.hpp>
	8	+#include <boost/tr1/detail/config.hpp>
	9	+
	10	+#ifndef BOOST_NO_CXX11_SMART_PTR
	11	+#include <memory>
	12	+#else
	13	#include <tr1/memory>
	14	+#endif
	15
	16	namespace atscppapi {
	17
	18	@@ -34,8 +41,11 @@
	19	* \todo Consider adding a simple macro to check if c++0x/11 is enabled
	20	* and if so change it to std::shared_ptr and #include <memory>s
	21	*/
	22	+#ifndef BOOST_NO_CXX11_SMART_PTR
	23	+using std::shared_ptr;
	24	+#else
	25	using std::tr1::shared_ptr;
	26	-
	27	+#endif
	28	} /* atscppapi */
	29
	30	#endif /* SHARED_PTR_H_ */

Line 0 Link Here

(-)./files/patch-transformationplugin-format (+66 lines)
		1	--- lib/atscppapi/src/TransformationPlugin.cc.orig 2013-12-05 23:07:48.000000000 +0100
		2	+++ lib/atscppapi/src/TransformationPlugin.cc 2014-01-04 00:48:22.063292251 +0100
		3	@@ -91,7 +91,7 @@
		4	TSVIO write_vio = TSVConnWriteVIOGet(contp);
		5	if (write_vio) {
		6	int64_t to_read = TSVIONTodoGet(write_vio);
		7	- LOG_DEBUG("Transformation contp=%p write_vio=%p, to_read=%ld", contp, write_vio, to_read);
		8	+ LOG_DEBUG("Transformation contp=%p write_vio=%p, to_read=%lld", contp, write_vio, to_read);
		9
		10	if (to_read > 0) {
		11	/*
		12	@@ -99,11 +99,11 @@
		13	* the amount of data actually in the read buffer.
		14	**/
		15	int64_t avail = TSIOBufferReaderAvail(TSVIOReaderGet(write_vio));
		16	- LOG_DEBUG("Transformation contp=%p write_vio=%p, to_read=%ld, buffer reader avail=%ld", contp, write_vio, to_read, avail);
		17	+ LOG_DEBUG("Transformation contp=%p write_vio=%p, to_read=%lld, buffer reader avail=%lld", contp, write_vio, to_read, avail);
		18
		19	if (to_read > avail) {
		20	to_read = avail;
		21	- LOG_DEBUG("Transformation contp=%p write_vio=%p, to read > avail, fixing to_read to be equal to avail. to_read=%ld, buffer reader avail=%ld", contp, write_vio, to_read, avail);
		22	+ LOG_DEBUG("Transformation contp=%p write_vio=%p, to read > avail, fixing to_read to be equal to avail. to_read=%lld, buffer reader avail=%lld", contp, write_vio, to_read, avail);
		23	}
		24
		25	if (to_read > 0) {
		26	@@ -122,7 +122,7 @@
		27	TSVIONDoneSet(write_vio, TSVIONDoneGet(write_vio) + to_read);
		28
		29	std::string in_data = utils::internal::consumeFromTSIOBufferReader(input_reader);
		30	- LOG_DEBUG("Transformation contp=%p write_vio=%p consumed %ld bytes from bufferreader", contp, write_vio, in_data.length());
		31	+ LOG_DEBUG("Transformation contp=%p write_vio=%p consumed %zu bytes from bufferreader", contp, write_vio, in_data.length());
		32
		33	/* Clean up the buffer and reader */
		34	TSIOBufferReaderFree(input_reader);
		35	@@ -232,7 +232,7 @@
		36	}
		37
		38	size_t TransformationPlugin::produce(const std::string &data) {
		39	- LOG_DEBUG("TransformationPlugin=%p tshttptxn=%p producing output with length=%ld", this, state_->txn_, data.length());
		40	+ LOG_DEBUG("TransformationPlugin=%p tshttptxn=%p producing output with length=%zu", this, state_->txn_, data.length());
		41	int64_t write_length = static_cast<int64_t>(data.length());
		42	if (!write_length) {
		43	return 0;
		44	@@ -261,11 +261,11 @@
		45	// Finally we can copy this data into the output_buffer
		46	int64_t bytes_written = TSIOBufferWrite(state_->output_buffer_, data.c_str(), write_length);
		47	state_->bytes_written_ += bytes_written; // So we can set BytesDone on outputComplete().
		48	- LOG_DEBUG("TransformationPlugin=%p tshttptxn=%p write to TSIOBuffer %ld bytes total bytes written %ld", this, state_->txn_, bytes_written, state_->bytes_written_);
		49	+ LOG_DEBUG("TransformationPlugin=%p tshttptxn=%p write to TSIOBuffer %lld bytes total bytes written %lld", this, state_->txn_, bytes_written, state_->bytes_written_);
		50
		51	// Sanity Checks
		52	if (bytes_written != write_length) {
		53	- LOG_ERROR("TransformationPlugin=%p tshttptxn=%p bytes written < expected. bytes_written=%ld write_length=%ld", this, state_->txn_, bytes_written, write_length);
		54	+ LOG_ERROR("TransformationPlugin=%p tshttptxn=%p bytes written < expected. bytes_written=%lld write_length=%lld", this, state_->txn_, bytes_written, write_length);
		55	}
		56
		57	int connection_closed = TSVConnClosedGet(state_->vconn_);
		58	@@ -282,7 +282,7 @@
		59
		60	size_t TransformationPlugin::setOutputComplete() {
		61	int connection_closed = TSVConnClosedGet(state_->vconn_);
		62	- LOG_DEBUG("OutputComplete TransformationPlugin=%p tshttptxn=%p vconn=%p connection_closed=%d, total bytes written=%ld", this, state_->txn_, state_->vconn_, connection_closed,state_->bytes_written_);
		63	+ LOG_DEBUG("OutputComplete TransformationPlugin=%p tshttptxn=%p vconn=%p connection_closed=%d, total bytes written=%lld", this, state_->txn_, state_->vconn_, connection_closed,state_->bytes_written_);
		64
65	if (!connection_closed && !state_->output_vio_) {
66	LOG_DEBUG("TransformationPlugin=%p tshttptxn=%p output complete without writing any data, initiating write of 0 bytes.", this, state_->txn_);

Lines 1-27 Link Here

(-)./pkg-plist (-35 / +87 lines)
1	@comment $FreeBSD: www/trafficserver/pkg-plist 331378 2013-10-23 12:12:40Z decke $	1	@comment $FreeBSD: www/trafficserver/pkg-plist 331378 2013-10-23 12:12:40Z decke $
2	@unexec if cmp %D/%%ETCDIR%%/ae_ua.config %D/%%ETCDIR%%/ae_ua.config.default; then rm %D/%%ETCDIR%%/ae_ua.config; fi	2	@unexec if cmp -s %D/%%ETCDIR%%/cache.config %D/%%ETCDIR%%/cache.config.default; then rm %D/%%ETCDIR%%/cache.config; fi
3	@unexec if cmp %D/%%ETCDIR%%/cache.config %D/%%ETCDIR%%/cache.config.default; then rm %D/%%ETCDIR%%/cache.config; fi	3	@unexec if cmp -s %D/%%ETCDIR%%/cluster.config %D/%%ETCDIR%%/cluster.config.default; then rm %D/%%ETCDIR%%/cluster.config; fi
4	@unexec if cmp %D/%%ETCDIR%%/cluster.config %D/%%ETCDIR%%/cluster.config.default; then rm %D/%%ETCDIR%%/cluster.config; fi	4	@unexec if cmp -s %D/%%ETCDIR%%/congestion.config %D/%%ETCDIR%%/congestion.config.default; then rm %D/%%ETCDIR%%/congestion.config; fi
5	@unexec if cmp %D/%%ETCDIR%%/congestion.config %D/%%ETCDIR%%/congestion.config.default; then rm %D/%%ETCDIR%%/congestion.config; fi	5	@unexec if cmp -s %D/%%ETCDIR%%/hosting.config %D/%%ETCDIR%%/hosting.config.default; then rm %D/%%ETCDIR%%/hosting.config; fi
6	@unexec if cmp %D/%%ETCDIR%%/hosting.config %D/%%ETCDIR%%/hosting.config.default; then rm %D/%%ETCDIR%%/hosting.config; fi	6	@unexec if cmp -s %D/%%ETCDIR%%/icp.config %D/%%ETCDIR%%/icp.config.default; then rm %D/%%ETCDIR%%/icp.config; fi
7	@unexec if cmp %D/%%ETCDIR%%/icp.config %D/%%ETCDIR%%/icp.config.default; then rm %D/%%ETCDIR%%/icp.config; fi	7	@unexec if cmp -s %D/%%ETCDIR%%/ip_allow.config %D/%%ETCDIR%%/ip_allow.config.default; then rm %D/%%ETCDIR%%/ip_allow.config; fi
8	@unexec if cmp %D/%%ETCDIR%%/ip_allow.config %D/%%ETCDIR%%/ip_allow.config.default; then rm %D/%%ETCDIR%%/ip_allow.config; fi	8	@unexec if cmp -s %D/%%ETCDIR%%/log_hosts.config %D/%%ETCDIR%%/log_hosts.config.default; then rm %D/%%ETCDIR%%/log_hosts.config; fi
9	@unexec if cmp %D/%%ETCDIR%%/log_hosts.config %D/%%ETCDIR%%/log_hosts.config.default; then rm %D/%%ETCDIR%%/log_hosts.config; fi	9	@unexec if cmp -s %D/%%ETCDIR%%/logs_xml.config %D/%%ETCDIR%%/logs_xml.config.default; then rm %D/%%ETCDIR%%/logs_xml.config; fi
10	@unexec if cmp %D/%%ETCDIR%%/logs_xml.config %D/%%ETCDIR%%/logs_xml.config.default; then rm %D/%%ETCDIR%%/logs_xml.config; fi	10	@unexec if cmp -s %D/%%ETCDIR%%/parent.config %D/%%ETCDIR%%/parent.config.default; then rm %D/%%ETCDIR%%/parent.config; fi
11	@unexec if cmp %D/%%ETCDIR%%/mgr.cnf %D/%%ETCDIR%%/mgr.cnf.default; then rm %D/%%ETCDIR%%/mgr.cnf; fi	11	@unexec if cmp -s %D/%%ETCDIR%%/plugin.config %D/%%ETCDIR%%/plugin.config.default; then rm %D/%%ETCDIR%%/plugin.config; fi
12	@unexec if cmp %D/%%ETCDIR%%/parent.config %D/%%ETCDIR%%/parent.config.default; then rm %D/%%ETCDIR%%/parent.config; fi	12	@unexec if cmp -s %D/%%ETCDIR%%/prefetch.config %D/%%ETCDIR%%/prefetch.config.default; then rm %D/%%ETCDIR%%/prefetch.config; fi
13	@unexec if cmp %D/%%ETCDIR%%/volume.config %D/%%ETCDIR%%/volume.config.default; then rm %D/%%ETCDIR%%/volume.config; fi	13	@unexec if cmp -s %D/%%ETCDIR%%/records.config %D/%%ETCDIR%%/records.config.default; then rm %D/%%ETCDIR%%/records.config; fi
14	@unexec if cmp %D/%%ETCDIR%%/plugin.config %D/%%ETCDIR%%/plugin.config.default; then rm %D/%%ETCDIR%%/plugin.config; fi	14	@unexec if cmp -s %D/%%ETCDIR%%/remap.config %D/%%ETCDIR%%/remap.config.default; then rm %D/%%ETCDIR%%/remap.config; fi
15	@unexec if cmp %D/%%ETCDIR%%/plugin.db %D/%%ETCDIR%%/plugin.db.default; then rm %D/%%ETCDIR%%/plugin.db; fi	15	@unexec if cmp -s %D/%%ETCDIR%%/socks.config %D/%%ETCDIR%%/socks.config.default; then rm %D/%%ETCDIR%%/socks.config; fi
16	@unexec if cmp %D/%%ETCDIR%%/remap.config %D/%%ETCDIR%%/remap.config.default; then rm %D/%%ETCDIR%%/remap.config; fi	16	@unexec if cmp -s %D/%%ETCDIR%%/splitdns.config %D/%%ETCDIR%%/splitdns.config.default; then rm %D/%%ETCDIR%%/splitdns.config; fi
17	@unexec if cmp %D/%%ETCDIR%%/records.config %D/%%ETCDIR%%/records.config.default; then rm %D/%%ETCDIR%%/records.config; fi	17	@unexec if cmp -s %D/%%ETCDIR%%/ssl_multicert.config %D/%%ETCDIR%%/ssl_multicert.config.default; then rm %D/%%ETCDIR%%/ssl_multicert.config; fi
18	@unexec if cmp %D/%%ETCDIR%%/socks.config %D/%%ETCDIR%%/socks.config.default; then rm %D/%%ETCDIR%%/socks.config; fi	18	@unexec if cmp -s %D/%%ETCDIR%%/stats.config.xml %D/%%ETCDIR%%/stats.config.xml.default; then rm %D/%%ETCDIR%%/stats.config.xml; fi
19	@unexec if cmp %D/%%ETCDIR%%/splitdns.config %D/%%ETCDIR%%/splitdns.config.default; then rm %D/%%ETCDIR%%/splitdns.config; fi	19	@unexec if cmp -s %D/%%ETCDIR%%/storage.config %D/%%ETCDIR%%/storage.config.default; then rm %D/%%ETCDIR%%/storage.config; fi
20	@unexec if cmp %D/%%ETCDIR%%/ssl_multicert.config %D/%%ETCDIR%%/ssl_multicert.config.default; then rm %D/%%ETCDIR%%/ssl_multicert.config; fi	20	@unexec if cmp -s %D/%%ETCDIR%%/update.config %D/%%ETCDIR%%/update.config.default; then rm %D/%%ETCDIR%%/update.config; fi
21	@unexec if cmp %D/%%ETCDIR%%/stats.config.xml %D/%%ETCDIR%%/stats.config.xml.default; then rm %D/%%ETCDIR%%/stats.config.xml; fi	21	@unexec if cmp -s %D/%%ETCDIR%%/vaddrs.config %D/%%ETCDIR%%/vaddrs.config.default; then rm %D/%%ETCDIR%%/vaddrs.config; fi
22	@unexec if cmp %D/%%ETCDIR%%/storage.config %D/%%ETCDIR%%/storage.config.default; then rm %D/%%ETCDIR%%/storage.config; fi	22	@unexec if cmp -s %D/%%ETCDIR%%/volume.config %D/%%ETCDIR%%/volume.config.default; then rm %D/%%ETCDIR%%/volume.config; fi
23	@unexec if cmp %D/%%ETCDIR%%/update.config %D/%%ETCDIR%%/update.config.default; then rm %D/%%ETCDIR%%/update.config; fi	23	@unexec if [ ! -s %D/%%ETCDIR%%/proxy.pac ]; then rm -f %D/%%ETCDIR%%/proxy.pac; fi
24	@unexec if cmp %D/%%ETCDIR%%/vaddrs.config %D/%%ETCDIR%%/vaddrs.config.default; then rm %D/%%ETCDIR%%/vaddrs.config; fi
25	bin/traffic_cop	24	bin/traffic_cop
26	bin/traffic_line	25	bin/traffic_line
27	bin/traffic_logcat	26	bin/traffic_logcat
Lines 31-59 Link Here
31	bin/traffic_server	30	bin/traffic_server
32	bin/traffic_shell	31	bin/traffic_shell
33	bin/trafficserver	32	bin/trafficserver
		33	bin/tspush
		34	bin/tstop
34	bin/tsxs	35	bin/tsxs
35	include/ts/experimental.h	36	include/ts/experimental.h
36	include/ts/mgmtapi.h	37	include/ts/mgmtapi.h
37	include/ts/remap.h	38	include/ts/remap.h
38	include/ts/ts.h	39	include/ts/ts.h
39	lib/libtsmgmt.a	40	include/atscppapi/Async.h
		41	include/atscppapi/AsyncHttpFetch.h
		42	include/atscppapi/AsyncTimer.h
		43	include/atscppapi/CaseInsensitiveStringComparator.h
		44	include/atscppapi/ClientRequest.h
		45	include/atscppapi/GlobalPlugin.h
		46	include/atscppapi/GzipDeflateTransformation.h
		47	include/atscppapi/GzipInflateTransformation.h
		48	include/atscppapi/Headers.h
		49	include/atscppapi/HttpMethod.h
		50	include/atscppapi/HttpStatus.h
		51	include/atscppapi/HttpVersion.h
		52	include/atscppapi/Logger.h
		53	include/atscppapi/Mutex.h
		54	include/atscppapi/Plugin.h
		55	include/atscppapi/PluginInit.h
		56	include/atscppapi/RemapPlugin.h
		57	include/atscppapi/Request.h
		58	include/atscppapi/Response.h
		59	include/atscppapi/Stat.h
		60	include/atscppapi/Transaction.h
		61	include/atscppapi/TransactionPlugin.h
		62	include/atscppapi/Url.h
		63	include/atscppapi/noncopyable.h
		64	include/atscppapi/shared_ptr.h
		65	include/atscppapi/utils.h
		66	lib/libatscppapi.la
		67	lib/libatscppapi.so
		68	lib/libatscppapi.so.5
40	lib/libtsmgmt.la	69	lib/libtsmgmt.la
41	lib/libtsmgmt.so	70	lib/libtsmgmt.so
42	lib/libtsmgmt.so.5	71	lib/libtsmgmt.so.5
43	lib/libtsutil.a
44	lib/libtsutil.la	72	lib/libtsutil.la
45	lib/libtsutil.so	73	lib/libtsutil.so
46	lib/libtsutil.so.5	74	lib/libtsutil.so.5
		75	libexec/trafficserver/cacheurl.la
		76	libexec/trafficserver/cacheurl.so
47	libexec/trafficserver/conf_remap.la	77	libexec/trafficserver/conf_remap.la
48	libexec/trafficserver/conf_remap.so	78	libexec/trafficserver/conf_remap.so
		79	libexec/trafficserver/gzip.la
		80	libexec/trafficserver/gzip.so
49	libexec/trafficserver/header_filter.la	81	libexec/trafficserver/header_filter.la
50	libexec/trafficserver/header_filter.so	82	libexec/trafficserver/header_filter.so
		83	libexec/trafficserver/libloader.la
		84	libexec/trafficserver/libloader.so
51	libexec/trafficserver/regex_remap.la	85	libexec/trafficserver/regex_remap.la
52	libexec/trafficserver/regex_remap.so	86	libexec/trafficserver/regex_remap.so
53	libexec/trafficserver/stats_over_http.la	87	libexec/trafficserver/stats_over_http.la
54	libexec/trafficserver/stats_over_http.so	88	libexec/trafficserver/stats_over_http.so
		89	%%SITE_PERL%%/Apache/TS.pm
		90	%%SITE_PERL%%/Apache/TS/AdminClient.pm
		91	%%SITE_PERL%%/Apache/TS/Config.pm
		92	%%SITE_PERL%%/Apache/TS/Config/Records.pm
		93	%%PERL5_MAN3%%/Apache::TS.3.gz
		94	%%PERL5_MAN3%%/Apache::TS::AdminClient.3.gz
		95	%%PERL5_MAN3%%/Apache::TS::Config::Records.3.gz
55	man/man1/traffic_shell.1.gz	96	man/man1/traffic_shell.1.gz
56	%%ETCDIR%%/ae_ua.config.default	97	@owner tserv
57	%%ETCDIR%%/body_factory/default/.body_factory_info	98	%%ETCDIR%%/body_factory/default/.body_factory_info
58	%%ETCDIR%%/body_factory/default/README	99	%%ETCDIR%%/body_factory/default/README
59	%%ETCDIR%%/body_factory/default/access#denied	100	%%ETCDIR%%/body_factory/default/access#denied
Lines 88-97 Link Here
88	%%ETCDIR%%/ip_allow.config.default	129	%%ETCDIR%%/ip_allow.config.default
89	%%ETCDIR%%/log_hosts.config.default	130	%%ETCDIR%%/log_hosts.config.default
90	%%ETCDIR%%/logs_xml.config.default	131	%%ETCDIR%%/logs_xml.config.default
91	%%ETCDIR%%/mgr.cnf.default
92	%%ETCDIR%%/parent.config.default	132	%%ETCDIR%%/parent.config.default
93	%%ETCDIR%%/plugin.config.default	133	%%ETCDIR%%/plugin.config.default
94	%%ETCDIR%%/plugin.db.default	134	%%ETCDIR%%/prefetch.config.default
95	%%ETCDIR%%/records.config.default	135	%%ETCDIR%%/records.config.default
96	%%ETCDIR%%/remap.config.default	136	%%ETCDIR%%/remap.config.default
97	%%ETCDIR%%/socks.config.default	137	%%ETCDIR%%/socks.config.default
Lines 99-108 Link Here
99	%%ETCDIR%%/ssl_multicert.config.default	139	%%ETCDIR%%/ssl_multicert.config.default
100	%%ETCDIR%%/stats.config.xml.default	140	%%ETCDIR%%/stats.config.xml.default
101	%%ETCDIR%%/storage.config.default	141	%%ETCDIR%%/storage.config.default
102	%%ETCDIR%%/trafficserver-release
103	%%ETCDIR%%/update.config.default	142	%%ETCDIR%%/update.config.default
104	%%ETCDIR%%/vaddrs.config.default	143	%%ETCDIR%%/vaddrs.config.default
105	%%ETCDIR%%/volume.config.default	144	%%ETCDIR%%/volume.config.default
		145	@exec mkdir -p %D/%%ETCDIR%%/snapshots
		146	@exec chown -f tserv %D/%%ETCDIR%%/snapshots
		147	@owner root
		148	%%ETCDIR%%/trafficserver-release
106	share/doc/trafficserver/trafficshell/config_alarms.1	149	share/doc/trafficserver/trafficshell/config_alarms.1
107	share/doc/trafficserver/trafficshell/config_cache.1	150	share/doc/trafficserver/trafficshell/config_cache.1
108	share/doc/trafficserver/trafficshell/config_clock.1	151	share/doc/trafficserver/trafficshell/config_clock.1
Lines 161-176 Link Here
161	share/doc/trafficserver/trafficshell/show_status.1	204	share/doc/trafficserver/trafficshell/show_status.1
162	share/doc/trafficserver/trafficshell/show_version.1	205	share/doc/trafficserver/trafficshell/show_version.1
163	share/doc/trafficserver/trafficshell/show_virtual-ip.1	206	share/doc/trafficserver/trafficshell/show_virtual-ip.1
		207	@exec mkdir -p %D/var/log/trafficserver
		208	@exec chown -f tserv %D/var/log/trafficserver
		209	@exec chmod 700 %D/var/log/trafficserver
		210	@exec mkdir -p %D/var/trafficserver
		211	@exec chown -f tserv %D/var/trafficserver
		212	@exec chmod 700 %D/var/trafficserver
164	@dirrm share/trafficserver	213	@dirrm share/trafficserver
165	@dirrm share/doc/trafficserver/trafficshell	214	@dirrm share/doc/trafficserver/trafficshell
166	@dirrm share/doc/trafficserver	215	@dirrm share/doc/trafficserver
167	@dirrm libexec/trafficserver	216	@dirrm libexec/trafficserver
168	@dirrm include/ts	217	@dirrm include/ts
169	@dirrm %%ETCDIR%%/internal
170	@dirrm %%ETCDIR%%/body_factory/default	218	@dirrm %%ETCDIR%%/body_factory/default
171	@dirrm %%ETCDIR%%/body_factory	219	@dirrmtry var/log/trafficserver
		220	@dirrmtry var/trafficserver
		221	@dirrmtry %%ETCDIR%%/body_factory
		222	@dirrmtry %%ETCDIR%%/snapshots
172	@dirrmtry %%ETCDIR%%	223	@dirrmtry %%ETCDIR%%
173	@exec if [ ! -f %D/%%ETCDIR%%/ae_ua.config ]; then cp -p %D/%%ETCDIR%%/ae_ua.config.default %D/%%ETCDIR%%/ae_ua.config; fi	224	@exec chown -f tserv %D/%%ETCDIR%%
		225	@exec chmod 700 %D/%%ETCDIR%%
174	@exec if [ ! -f %D/%%ETCDIR%%/cache.config ]; then cp -p %D/%%ETCDIR%%/cache.config.default %D/%%ETCDIR%%/cache.config; fi	226	@exec if [ ! -f %D/%%ETCDIR%%/cache.config ]; then cp -p %D/%%ETCDIR%%/cache.config.default %D/%%ETCDIR%%/cache.config; fi
175	@exec if [ ! -f %D/%%ETCDIR%%/cluster.config ]; then cp -p %D/%%ETCDIR%%/cluster.config.default %D/%%ETCDIR%%/cluster.config; fi	227	@exec if [ ! -f %D/%%ETCDIR%%/cluster.config ]; then cp -p %D/%%ETCDIR%%/cluster.config.default %D/%%ETCDIR%%/cluster.config; fi
176	@exec if [ ! -f %D/%%ETCDIR%%/congestion.config ]; then cp -p %D/%%ETCDIR%%/congestion.config.default %D/%%ETCDIR%%/congestion.config; fi	228	@exec if [ ! -f %D/%%ETCDIR%%/congestion.config ]; then cp -p %D/%%ETCDIR%%/congestion.config.default %D/%%ETCDIR%%/congestion.config; fi
Lines 179-189 Link Here
179	@exec if [ ! -f %D/%%ETCDIR%%/ip_allow.config ]; then cp -p %D/%%ETCDIR%%/ip_allow.config.default %D/%%ETCDIR%%/ip_allow.config; fi	231	@exec if [ ! -f %D/%%ETCDIR%%/ip_allow.config ]; then cp -p %D/%%ETCDIR%%/ip_allow.config.default %D/%%ETCDIR%%/ip_allow.config; fi
180	@exec if [ ! -f %D/%%ETCDIR%%/log_hosts.config ]; then cp -p %D/%%ETCDIR%%/log_hosts.config.default %D/%%ETCDIR%%/log_hosts.config; fi	232	@exec if [ ! -f %D/%%ETCDIR%%/log_hosts.config ]; then cp -p %D/%%ETCDIR%%/log_hosts.config.default %D/%%ETCDIR%%/log_hosts.config; fi
181	@exec if [ ! -f %D/%%ETCDIR%%/logs_xml.config ]; then cp -p %D/%%ETCDIR%%/logs_xml.config.default %D/%%ETCDIR%%/logs_xml.config; fi	233	@exec if [ ! -f %D/%%ETCDIR%%/logs_xml.config ]; then cp -p %D/%%ETCDIR%%/logs_xml.config.default %D/%%ETCDIR%%/logs_xml.config; fi
182	@exec if [ ! -f %D/%%ETCDIR%%/mgr.cnf ]; then cp -p %D/%%ETCDIR%%/mgr.cnf.default %D/%%ETCDIR%%/mgr.cnf; fi
183	@exec if [ ! -f %D/%%ETCDIR%%/parent.config ]; then cp -p %D/%%ETCDIR%%/parent.config.default %D/%%ETCDIR%%/parent.config; fi	234	@exec if [ ! -f %D/%%ETCDIR%%/parent.config ]; then cp -p %D/%%ETCDIR%%/parent.config.default %D/%%ETCDIR%%/parent.config; fi
184	@exec if [ ! -f %D/%%ETCDIR%%/volume.config ]; then cp -p %D/%%ETCDIR%%/volume.config.default %D/%%ETCDIR%%/volume.config; fi
185	@exec if [ ! -f %D/%%ETCDIR%%/plugin.config ]; then cp -p %D/%%ETCDIR%%/plugin.config.default %D/%%ETCDIR%%/plugin.config; fi	235	@exec if [ ! -f %D/%%ETCDIR%%/plugin.config ]; then cp -p %D/%%ETCDIR%%/plugin.config.default %D/%%ETCDIR%%/plugin.config; fi
186	@exec if [ ! -f %D/%%ETCDIR%%/plugin.db ]; then cp -p %D/%%ETCDIR%%/plugin.db.default %D/%%ETCDIR%%/plugin.db; fi	236	@exec if [ ! -f %D/%%ETCDIR%%/prefetch.config ]; then cp -p %D/%%ETCDIR%%/prefetch.config.default %D/%%ETCDIR%%/prefetch.config; fi
187	@exec if [ ! -f %D/%%ETCDIR%%/records.config ]; then cp -p %D/%%ETCDIR%%/records.config.default %D/%%ETCDIR%%/records.config; fi	237	@exec if [ ! -f %D/%%ETCDIR%%/records.config ]; then cp -p %D/%%ETCDIR%%/records.config.default %D/%%ETCDIR%%/records.config; fi
188	@exec if [ ! -f %D/%%ETCDIR%%/remap.config ]; then cp -p %D/%%ETCDIR%%/remap.config.default %D/%%ETCDIR%%/remap.config; fi	238	@exec if [ ! -f %D/%%ETCDIR%%/remap.config ]; then cp -p %D/%%ETCDIR%%/remap.config.default %D/%%ETCDIR%%/remap.config; fi
189	@exec if [ ! -f %D/%%ETCDIR%%/socks.config ]; then cp -p %D/%%ETCDIR%%/socks.config.default %D/%%ETCDIR%%/socks.config; fi	239	@exec if [ ! -f %D/%%ETCDIR%%/socks.config ]; then cp -p %D/%%ETCDIR%%/socks.config.default %D/%%ETCDIR%%/socks.config; fi
Lines 193-195 Link Here
193	@exec if [ ! -f %D/%%ETCDIR%%/storage.config ]; then cp -p %D/%%ETCDIR%%/storage.config.default %D/%%ETCDIR%%/storage.config; fi	243	@exec if [ ! -f %D/%%ETCDIR%%/storage.config ]; then cp -p %D/%%ETCDIR%%/storage.config.default %D/%%ETCDIR%%/storage.config; fi
194	@exec if [ ! -f %D/%%ETCDIR%%/update.config ]; then cp -p %D/%%ETCDIR%%/update.config.default %D/%%ETCDIR%%/update.config; fi	244	@exec if [ ! -f %D/%%ETCDIR%%/update.config ]; then cp -p %D/%%ETCDIR%%/update.config.default %D/%%ETCDIR%%/update.config; fi
195	@exec if [ ! -f %D/%%ETCDIR%%/vaddrs.config ]; then cp -p %D/%%ETCDIR%%/vaddrs.config.default %D/%%ETCDIR%%/vaddrs.config; fi	245	@exec if [ ! -f %D/%%ETCDIR%%/vaddrs.config ]; then cp -p %D/%%ETCDIR%%/vaddrs.config.default %D/%%ETCDIR%%/vaddrs.config; fi
		246	@exec if [ ! -f %D/%%ETCDIR%%/volume.config ]; then cp -p %D/%%ETCDIR%%/volume.config.default %D/%%ETCDIR%%/volume.config; fi
		247	@exec chmod -f 600 %D/%%ETCDIR%%/*.config