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

(-)Makefile (-11 / +14 lines)
Lines 2-29 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	trafficserver
4
PORTNAME=	trafficserver
5
PORTVERSION=	4.1.2
5
PORTVERSION=	5.0.0
6
PORTREVISION=	3
7
CATEGORIES=	www
6
CATEGORIES=	www
8
MASTER_SITES=	APACHE/${PORTNAME}
7
MASTER_SITES=	APACHE/${PORTNAME}
9
8
10
MAINTAINER=	jnlin@csie.nctu.edu.tw
9
MAINTAINER=	gaod@hychen.org
11
COMMENT=	Fast, scalable and extensible HTTP proxy server
10
COMMENT=	Fast, scalable and extensible HTTP proxy server
12
11
13
LICENSE=	APACHE20
12
LICENSE=	APACHE20
14
13
15
LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
14
LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
16
		libpcre.so:${PORTSDIR}/devel/pcre \
17
		libxml2.so:${PORTSDIR}/textproc/libxml2 \
18
		libboost_system.so:${PORTSDIR}/devel/boost-libs \
19
		libcurl.so:${PORTSDIR}/ftp/curl \
15
		libcurl.so:${PORTSDIR}/ftp/curl \
16
		libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
20
		libhwloc.so:${PORTSDIR}/devel/hwloc \
17
		libhwloc.so:${PORTSDIR}/devel/hwloc \
21
		libluajit-${LUA_VER}.so:${PORTSDIR}/lang/luajit
18
		libpcre.so:${PORTSDIR}/devel/pcre \
19
		libxml2.so:${PORTSDIR}/textproc/libxml2
22
20
21
USE_AUTOTOOLS=	autoconf automake libtool aclocal
23
GNU_CONFIGURE=	yes
22
GNU_CONFIGURE=	yes
24
USES=		gmake libtool lua:51 perl5 pkgconfig tar:bzip2 tcl
23
USES=		pkgconfig tcl gmake perl5 tar:bzip2
25
USE_AUTOTOOLS=	aclocal autoconf autoheader automake
26
AUTOMAKE_ARGS=	-a -c -f
27
USE_OPENSSL=	yes
24
USE_OPENSSL=	yes
28
USE_SQLITE=	yes
25
USE_SQLITE=	yes
29
USE_RC_SUBR=	${PORTNAME}
26
USE_RC_SUBR=	${PORTNAME}
Lines 48-53 Link Here
48
		--with-user=${USERS} \
45
		--with-user=${USERS} \
49
		--with-group=${GROUPS}
46
		--with-group=${GROUPS}
50
47
48
ACLOCAL_ARGS=	-I build
51
OPTIONS_DEFINE=	WCCP INTERIM
49
OPTIONS_DEFINE=	WCCP INTERIM
52
OPTIONS_RADIO=	MEMMAN
50
OPTIONS_RADIO=	MEMMAN
53
OPTIONS_RADIO_MEMMAN=	ALLOCATORS FREELISTS RECLAIM
51
OPTIONS_RADIO_MEMMAN=	ALLOCATORS FREELISTS RECLAIM
Lines 74-79 Link Here
74
FORBIDDEN=	No allocation strategy selected
72
FORBIDDEN=	No allocation strategy selected
75
.endif
73
.endif
76
74
75
.if ${OSVERSION} >= 900033 && exists(/usr/bin/clang)
76
CC=		clang
77
CXX=		clang++
78
.endif
79
77
post-install:
80
post-install:
78
	@${MKDIR} ${STAGEDIR}${ETCDIR}/snapshots
81
	@${MKDIR} ${STAGEDIR}${ETCDIR}/snapshots
79
	@cd ${STAGEDIR}${ETCDIR} && for f in *.config *.config.xml; do ${MV} $$f $$f.default; done
82
	@cd ${STAGEDIR}${ETCDIR} && for f in *.config *.config.xml; do ${MV} $$f $$f.default; done
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (trafficserver-4.1.2.tar.bz2) = 16bf75bd22ed2a1ee2bc6bac38add34feffa9c12e787d73b2721eb3042698ef9
1
SHA256 (trafficserver-5.0.0.tar.bz2) = 2fce878bdb8072c9434a7acb6510752a969877541af082360f28e2caf64ba547
2
SIZE (trafficserver-4.1.2.tar.bz2) = 6358857
2
SIZE (trafficserver-5.0.0.tar.bz2) = 7440958
(-)files/patch-build__xml.m4 (-11 lines)
Lines 1-11 Link Here
1
--- ./build/xml.m4.orig	2013-12-05 22:07:48.000000000 +0000
2
+++ ./build/xml.m4	2014-01-27 08:45:49.000000000 +0000
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
   ])
(-)files/patch-cmd__traffic_cop__Makefile.am (+11 lines)
Line 0 Link Here
1
--- cmd/traffic_cop/Makefile.am.orig	2014-07-06 22:47:46.211841000 +0800
2
+++ cmd/traffic_cop/Makefile.am	2014-07-06 22:49:18.103855000 +0800
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 \
(-)files/patch-cop__Makefile.am (-11 lines)
Lines 1-11 Link Here
1
--- ./cop/Makefile.am.orig	2013-12-05 22:07:48.000000000 +0000
2
+++ ./cop/Makefile.am	2014-01-27 08:45:49.000000000 +0000
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 \
(-)files/patch-cop__TrafficCop.cc (-11 lines)
Lines 1-11 Link Here
1
--- ./cop/TrafficCop.cc.orig	2013-12-05 22:07:48.000000000 +0000
2
+++ ./cop/TrafficCop.cc	2014-01-27 08:45:49.000000000 +0000
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);
(-)files/patch-example__protocol__Protocol.c (-35 lines)
Lines 1-35 Link Here
1
--- ./example/protocol/Protocol.c.orig	2013-12-05 22:07:48.000000000 +0000
2
+++ ./example/protocol/Protocol.c	2014-01-27 08:45:49.000000000 +0000
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 {
(-)files/patch-iocore__eventsystem__UnixEventProcessor.cc (+10 lines)
Line 0 Link Here
1
--- iocore/eventsystem/UnixEventProcessor.cc.orig	2014-07-07 00:33:37.106586000 +0800
2
+++ iocore/eventsystem/UnixEventProcessor.cc	2014-07-07 00:34:18.143512000 +0800
3
@@ -24,7 +24,6 @@
4
 #include "P_EventSystem.h"      /* MAGIC_EDITING_TAG */
5
 #include <sched.h>
6
 #if TS_USE_HWLOC
7
-#include <alloca.h>
8
 #include <hwloc.h>
9
 #endif
10
 #include "ink_defs.h"
(-)files/patch-lib__Makefile.am (+11 lines)
Line 0 Link Here
1
--- lib/Makefile.am.orig	2014-07-07 03:26:27.267047000 +0800
2
+++ lib/Makefile.am	2014-07-07 03:26:40.961339000 +0800
3
@@ -49,7 +49,7 @@
4
 	test -d "$(top_srcdir)/$(subdir)/luajit/src" || (cd "$(top_srcdir)" && git submodule update --init)
5
 	test -d "$(top_builddir)/$(subdir)/luajit/src" || cp -rf "$(srcdir)/luajit" "$(top_builddir)/$(subdir)/"
6
 	cd luajit && $(MAKE) $(AM_MAKEFLAGS) BUILDMODE="static" PREFIX="$(prefix)" CC="$(CC)" \
7
-	                     CFLAGS="$(LUA_CFLAGS)" LDFLAGS="@LUA_LDFLAGS@"
8
+	                     CFLAGS="$(LUA_CFLAGS)" LDFLAGS="@LUA_LDFLAGS@ ${LDFLAGS}"
9
 
10
 clean-local:
11
 	test "$(top_srcdir)" != "$(top_builddir)" || (cd "$(top_builddir)/$(subdir)/luajit" && make clean)
(-)files/patch-lib__atscppapi__src__GzipDeflateTransformation.cc (-35 lines)
Lines 1-35 Link Here
1
--- ./lib/atscppapi/src/GzipDeflateTransformation.cc.orig	2013-12-05 22:07:48.000000000 +0000
2
+++ ./lib/atscppapi/src/GzipDeflateTransformation.cc	2014-01-27 08:45:49.000000000 +0000
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
 
(-)files/patch-lib__atscppapi__src__GzipInflateTransformation.cc (-11 lines)
Lines 1-11 Link Here
1
--- ./lib/atscppapi/src/GzipInflateTransformation.cc.orig	2013-12-05 22:07:48.000000000 +0000
2
+++ ./lib/atscppapi/src/GzipInflateTransformation.cc	2014-01-27 08:45:49.000000000 +0000
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
 
(-)files/patch-lib__atscppapi__src__Logger.cc (-11 lines)
Lines 1-11 Link Here
1
--- ./lib/atscppapi/src/Logger.cc.orig	2013-12-05 22:07:48.000000000 +0000
2
+++ ./lib/atscppapi/src/Logger.cc	2014-01-27 08:45:49.000000000 +0000
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
     }
(-)files/patch-lib__atscppapi__src__TransformationPlugin.cc (-66 lines)
Lines 1-66 Link Here
1
--- ./lib/atscppapi/src/TransformationPlugin.cc.orig	2013-12-05 22:07:48.000000000 +0000
2
+++ ./lib/atscppapi/src/TransformationPlugin.cc	2014-01-27 08:45:49.000000000 +0000
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_);
(-)files/patch-lib__atscppapi__src__include__atscppapi__shared_ptr.h (-30 lines)
Lines 1-30 Link Here
1
--- ./lib/atscppapi/src/include/atscppapi/shared_ptr.h.orig	2013-12-05 22:07:48.000000000 +0000
2
+++ ./lib/atscppapi/src/include/atscppapi/shared_ptr.h	2014-01-27 08:45:49.000000000 +0000
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_ */
(-)files/patch-lib__atscppapi__src__include__atscppapi__utils.h (-10 lines)
Lines 1-10 Link Here
1
--- ./lib/atscppapi/src/include/atscppapi/utils.h.orig	2013-12-05 22:07:48.000000000 +0000
2
+++ ./lib/atscppapi/src/include/atscppapi/utils.h	2014-01-27 08:45:49.000000000 +0000
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
 
(-)files/patch-lib__luajit__src__Makefile (+20 lines)
Line 0 Link Here
1
--- lib/luajit/src/Makefile.orig	2014-06-16 05:17:49.000000000 +0800
2
+++ lib/luajit/src/Makefile	2014-07-07 01:09:35.726810000 +0800
3
@@ -25,7 +25,7 @@
4
 # with "make clean", followed by "make" if you change any options.
5
 #
6
 # LuaJIT builds as a native 32 or 64 bit binary by default.
7
-CC= gcc
8
+#CC= gcc
9
 #
10
 # Use this if you want to force a 32 bit build on a 64 bit multilib OS.
11
 #CC= gcc -m32
12
@@ -313,7 +313,7 @@
13
   TARGET_DYNXLDOPTS=
14
   TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER)
15
 else
16
-  ifneq (,$(findstring stack-protector,$(shell $(TARGET_CC) -dumpspecs)))
17
+  ifneq (,$(findstring stack-protector,$(shell $(TARGET_CC))))
18
     TARGET_XCFLAGS+= -fno-stack-protector
19
   endif
20
   ifneq (SunOS,$(TARGET_SYS))
(-)files/patch-mgmt__api__remote__Makefile.am (-10 lines)
Lines 1-10 Link Here
1
--- ./mgmt/api/remote/Makefile.am.orig	2013-12-05 22:07:48.000000000 +0000
2
+++ ./mgmt/api/remote/Makefile.am	2014-01-27 08:45:49.000000000 +0000
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) \
(-)files/patch-mgmt__cli__cliMain.cc (-10 lines)
Lines 1-10 Link Here
1
--- ./mgmt/cli/cliMain.cc.orig	2013-12-05 22:07:48.000000000 +0000
2
+++ ./mgmt/cli/cliMain.cc	2014-01-27 08:45:49.000000000 +0000
3
@@ -87,6 +87,7 @@
4
   register_event_callback();
5
 
6
 #if HAVE_LIBREADLINE
7
+  Tcl_FindExecutable(NULL);
8
   Tcl_SetMainLoop(Tcl_ReadlineMain);
9
 #endif
10
 
(-)pkg-plist (-70 / +15 lines)
Lines 27-33 Link Here
27
bin/traffic_manager
27
bin/traffic_manager
28
bin/traffic_sac
28
bin/traffic_sac
29
bin/traffic_server
29
bin/traffic_server
30
bin/traffic_shell
31
bin/trafficserver
30
bin/trafficserver
32
bin/tspush
31
bin/tspush
33
bin/tstop
32
bin/tstop
Lines 62-82 Link Here
62
include/atscppapi/noncopyable.h
61
include/atscppapi/noncopyable.h
63
include/atscppapi/shared_ptr.h
62
include/atscppapi/shared_ptr.h
64
include/atscppapi/utils.h
63
include/atscppapi/utils.h
64
lib/libatscppapi.la
65
lib/libatscppapi.so
65
lib/libatscppapi.so
66
lib/libatscppapi.so.4
66
lib/libatscppapi.so.5
67
lib/libatscppapi.so.4.1.2
67
lib/libtsmgmt.la
68
lib/libtsmgmt.so
68
lib/libtsmgmt.so
69
lib/libtsmgmt.so.4
69
lib/libtsmgmt.so.5
70
lib/libtsmgmt.so.4.1.2
70
lib/libtsmgmtshare.la
71
lib/libtsmgmtshare.so
72
lib/libtsmgmtshare.so.5
73
lib/libtsutil.la
71
lib/libtsutil.so
74
lib/libtsutil.so
72
lib/libtsutil.so.4
75
lib/libtsutil.so.5
73
lib/libtsutil.so.4.1.2
76
libexec/trafficserver/cacheurl.la
74
libexec/trafficserver/cacheurl.so
77
libexec/trafficserver/cacheurl.so
78
libexec/trafficserver/conf_remap.la
75
libexec/trafficserver/conf_remap.so
79
libexec/trafficserver/conf_remap.so
80
libexec/trafficserver/gzip.la
76
libexec/trafficserver/gzip.so
81
libexec/trafficserver/gzip.so
77
libexec/trafficserver/header_filter.so
82
libexec/trafficserver/libloader.la
78
libexec/trafficserver/libloader.so
83
libexec/trafficserver/libloader.so
84
libexec/trafficserver/regex_remap.la
79
libexec/trafficserver/regex_remap.so
85
libexec/trafficserver/regex_remap.so
86
libexec/trafficserver/stats_over_http.la
80
libexec/trafficserver/stats_over_http.so
87
libexec/trafficserver/stats_over_http.so
81
%%SITE_PERL%%/Apache/TS.pm
88
%%SITE_PERL%%/Apache/TS.pm
82
%%SITE_PERL%%/Apache/TS/AdminClient.pm
89
%%SITE_PERL%%/Apache/TS/AdminClient.pm
Lines 85-91 Link Here
85
%%PERL5_MAN3%%/Apache::TS.3.gz
92
%%PERL5_MAN3%%/Apache::TS.3.gz
86
%%PERL5_MAN3%%/Apache::TS::AdminClient.3.gz
93
%%PERL5_MAN3%%/Apache::TS::AdminClient.3.gz
87
%%PERL5_MAN3%%/Apache::TS::Config::Records.3.gz
94
%%PERL5_MAN3%%/Apache::TS::Config::Records.3.gz
88
man/man1/traffic_shell.1.gz
89
@owner www
95
@owner www
90
%%ETCDIR%%/body_factory/default/.body_factory_info
96
%%ETCDIR%%/body_factory/default/.body_factory_info
91
%%ETCDIR%%/body_factory/default/README
97
%%ETCDIR%%/body_factory/default/README
Lines 138-207 Link Here
138
@exec chown -f www %D/%%ETCDIR%%/snapshots
144
@exec chown -f www %D/%%ETCDIR%%/snapshots
139
@owner root
145
@owner root
140
%%ETCDIR%%/trafficserver-release
146
%%ETCDIR%%/trafficserver-release
141
share/doc/trafficserver/trafficshell/config_alarms.1
142
share/doc/trafficserver/trafficshell/config_cache.1
143
share/doc/trafficserver/trafficshell/config_clock.1
144
share/doc/trafficserver/trafficshell/config_dns.1
145
share/doc/trafficserver/trafficshell/config_get.1
146
share/doc/trafficserver/trafficshell/config_hard-restart.1
147
share/doc/trafficserver/trafficshell/config_hostdb.1
148
share/doc/trafficserver/trafficshell/config_http.1
149
share/doc/trafficserver/trafficshell/config_icp.1
150
share/doc/trafficserver/trafficshell/config_logging.1
151
share/doc/trafficserver/trafficshell/config_name.1
152
share/doc/trafficserver/trafficshell/config_network.1
153
share/doc/trafficserver/trafficshell/config_parent.1
154
share/doc/trafficserver/trafficshell/config_port-tunnels.1
155
share/doc/trafficserver/trafficshell/config_remap.1
156
share/doc/trafficserver/trafficshell/config_reset-stats.1
157
share/doc/trafficserver/trafficshell/config_restart.1
158
share/doc/trafficserver/trafficshell/config_root.1
159
share/doc/trafficserver/trafficshell/config_scheduled-update.1
160
share/doc/trafficserver/trafficshell/config_security.1
161
share/doc/trafficserver/trafficshell/config_set.1
162
share/doc/trafficserver/trafficshell/config_socks.1
163
share/doc/trafficserver/trafficshell/config_ssl.1
164
share/doc/trafficserver/trafficshell/config_start.1
165
share/doc/trafficserver/trafficshell/config_stop.1
166
share/doc/trafficserver/trafficshell/config_upgrade.1
167
share/doc/trafficserver/trafficshell/config_virtual-ip.1
168
share/doc/trafficserver/trafficshell/disable.1
169
share/doc/trafficserver/trafficshell/enable.1
170
share/doc/trafficserver/trafficshell/exit.1
171
share/doc/trafficserver/trafficshell/show_alarms.1
172
share/doc/trafficserver/trafficshell/show_cache-stats.1
173
share/doc/trafficserver/trafficshell/show_cache.1
174
share/doc/trafficserver/trafficshell/show_cluster.1
175
share/doc/trafficserver/trafficshell/show_dns-resolver.1
176
share/doc/trafficserver/trafficshell/show_dns-stats.1
177
share/doc/trafficserver/trafficshell/show_hostdb-stats.1
178
share/doc/trafficserver/trafficshell/show_hostdb.1
179
share/doc/trafficserver/trafficshell/show_http-stats.1
180
share/doc/trafficserver/trafficshell/show_http-trans-stats.1
181
share/doc/trafficserver/trafficshell/show_http.1
182
share/doc/trafficserver/trafficshell/show_icp-stats.1
183
share/doc/trafficserver/trafficshell/show_icp.1
184
share/doc/trafficserver/trafficshell/show_logging-stats.1
185
share/doc/trafficserver/trafficshell/show_logging.1
186
share/doc/trafficserver/trafficshell/show_network.1
187
share/doc/trafficserver/trafficshell/show_parent.1
188
share/doc/trafficserver/trafficshell/show_port-tunnels.1
189
share/doc/trafficserver/trafficshell/show_proxy-stats.1
190
share/doc/trafficserver/trafficshell/show_proxy.1
191
share/doc/trafficserver/trafficshell/show_remap.1
192
share/doc/trafficserver/trafficshell/show_scheduled-update.1
193
share/doc/trafficserver/trafficshell/show_security.1
194
share/doc/trafficserver/trafficshell/show_socks.1
195
share/doc/trafficserver/trafficshell/show_ssl.1
196
share/doc/trafficserver/trafficshell/show_status.1
197
share/doc/trafficserver/trafficshell/show_version.1
198
share/doc/trafficserver/trafficshell/show_virtual-ip.1
199
@dirrm %%SITE_PERL%%/Apache/TS/Config
147
@dirrm %%SITE_PERL%%/Apache/TS/Config
200
@dirrm %%SITE_PERL%%/Apache/TS
148
@dirrm %%SITE_PERL%%/Apache/TS
201
@dirrm %%SITE_PERL%%/Apache
149
@dirrm %%SITE_PERL%%/Apache
202
@dirrm share/trafficserver
203
@dirrm share/doc/trafficserver/trafficshell
204
@dirrm share/doc/trafficserver
205
@dirrm libexec/trafficserver
150
@dirrm libexec/trafficserver
206
@dirrm include/ts
151
@dirrm include/ts
207
@dirrm include/atscppapi
152
@dirrm include/atscppapi

Return to bug 192076