FreeBSD Bugzilla – Attachment 144923 Details for
Bug 192076
[PATCH] www/trafficserver: update to 5.0.0, take maintainership
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
trafficserver-5.0.0.patch
trafficserver-5.0.0.patch (text/plain), 26.69 KB, created by
Hung-Yi Chen
on 2014-07-24 00:22:13 UTC
(
hide
)
Description:
trafficserver-5.0.0.patch
Filename:
MIME Type:
Creator:
Hung-Yi Chen
Created:
2014-07-24 00:22:13 UTC
Size:
26.69 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 362757) >+++ Makefile (working copy) >@@ -2,28 +2,25 @@ > # $FreeBSD$ > > PORTNAME= trafficserver >-PORTVERSION= 4.1.2 >-PORTREVISION= 3 >+PORTVERSION= 5.0.0 > CATEGORIES= www > MASTER_SITES= APACHE/${PORTNAME} > >-MAINTAINER= jnlin@csie.nctu.edu.tw >+MAINTAINER= gaod@hychen.org > COMMENT= 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 \ >+LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \ > libcurl.so:${PORTSDIR}/ftp/curl \ >+ libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ > libhwloc.so:${PORTSDIR}/devel/hwloc \ >- libluajit-${LUA_VER}.so:${PORTSDIR}/lang/luajit >+ libpcre.so:${PORTSDIR}/devel/pcre \ >+ libxml2.so:${PORTSDIR}/textproc/libxml2 > >+USE_AUTOTOOLS= autoconf automake libtool aclocal > GNU_CONFIGURE= yes >-USES= gmake libtool lua:51 perl5 pkgconfig tar:bzip2 tcl >-USE_AUTOTOOLS= aclocal autoconf autoheader automake >-AUTOMAKE_ARGS= -a -c -f >+USES= pkgconfig tcl gmake perl5 tar:bzip2 > USE_OPENSSL= yes > USE_SQLITE= yes > USE_RC_SUBR= ${PORTNAME} >@@ -48,6 +45,7 @@ > --with-user=${USERS} \ > --with-group=${GROUPS} > >+ACLOCAL_ARGS= -I build > OPTIONS_DEFINE= WCCP INTERIM > OPTIONS_RADIO= MEMMAN > OPTIONS_RADIO_MEMMAN= ALLOCATORS FREELISTS RECLAIM >@@ -74,6 +72,11 @@ > FORBIDDEN= No allocation strategy selected > .endif > >+.if ${OSVERSION} >= 900033 && exists(/usr/bin/clang) >+CC= clang >+CXX= clang++ >+.endif >+ > post-install: > @${MKDIR} ${STAGEDIR}${ETCDIR}/snapshots > @cd ${STAGEDIR}${ETCDIR} && for f in *.config *.config.xml; do ${MV} $$f $$f.default; done >Index: distinfo >=================================================================== >--- distinfo (revision 362757) >+++ distinfo (working copy) >@@ -1,2 +1,2 @@ >-SHA256 (trafficserver-4.1.2.tar.bz2) = 16bf75bd22ed2a1ee2bc6bac38add34feffa9c12e787d73b2721eb3042698ef9 >-SIZE (trafficserver-4.1.2.tar.bz2) = 6358857 >+SHA256 (trafficserver-5.0.0.tar.bz2) = 2fce878bdb8072c9434a7acb6510752a969877541af082360f28e2caf64ba547 >+SIZE (trafficserver-5.0.0.tar.bz2) = 7440958 >Index: files/patch-build__xml.m4 >=================================================================== >--- files/patch-build__xml.m4 (revision 362757) >+++ files/patch-build__xml.m4 (working copy) >@@ -1,11 +0,0 @@ >---- ./build/xml.m4.orig 2013-12-05 22:07:48.000000000 +0000 >-+++ ./build/xml.m4 2014-01-27 08:45:49.000000000 +0000 >-@@ -59,7 +59,7 @@ >- elif test "$withval" != "no"; then >- enable_libxml2=yes >- libxml2_include="$withval/include/libxml2" >-- libxml2_ldflags="$withval/lib" >-+ libxml2_ldflags="-L$withval/lib" >- fi >- fi >- ]) >Index: files/patch-cmd__traffic_cop__Makefile.am >=================================================================== >--- files/patch-cmd__traffic_cop__Makefile.am (revision 0) >+++ files/patch-cmd__traffic_cop__Makefile.am (working copy) >@@ -0,0 +1,11 @@ >+--- 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 \ > >Property changes on: files/patch-cmd__traffic_cop__Makefile.am >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/patch-cop__Makefile.am >=================================================================== >--- files/patch-cop__Makefile.am (revision 362757) >+++ files/patch-cop__Makefile.am (working copy) >@@ -1,11 +0,0 @@ >---- ./cop/Makefile.am.orig 2013-12-05 22:07:48.000000000 +0000 >-+++ ./cop/Makefile.am 2014-01-27 08:45:49.000000000 +0000 >-@@ -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 \ >Index: files/patch-cop__TrafficCop.cc >=================================================================== >--- files/patch-cop__TrafficCop.cc (revision 362757) >+++ files/patch-cop__TrafficCop.cc (working copy) >@@ -1,11 +0,0 @@ >---- ./cop/TrafficCop.cc.orig 2013-12-05 22:07:48.000000000 +0000 >-+++ ./cop/TrafficCop.cc 2014-01-27 08:45:49.000000000 +0000 >-@@ -813,7 +813,7 @@ >- >- snprintf(port_str, sizeof(port_str), "%d", port); >- memset(&hints, 0, sizeof(hints)); >-- hints.ai_family = AF_UNSPEC; >-+ hints.ai_family = AF_INET; >- hints.ai_socktype = SOCK_STREAM; >- >- err = getaddrinfo(ip, port_str, &hints, &result); >Index: files/patch-example__protocol__Protocol.c >=================================================================== >--- files/patch-example__protocol__Protocol.c (revision 362757) >+++ files/patch-example__protocol__Protocol.c (working copy) >@@ -1,35 +0,0 @@ >---- ./example/protocol/Protocol.c.orig 2013-12-05 22:07:48.000000000 +0000 >-+++ ./example/protocol/Protocol.c 2014-01-27 08:45:49.000000000 +0000 >-@@ -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 { >Index: files/patch-iocore__eventsystem__UnixEventProcessor.cc >=================================================================== >--- files/patch-iocore__eventsystem__UnixEventProcessor.cc (revision 0) >+++ files/patch-iocore__eventsystem__UnixEventProcessor.cc (working copy) >@@ -0,0 +1,10 @@ >+--- iocore/eventsystem/UnixEventProcessor.cc.orig 2014-07-07 00:33:37.106586000 +0800 >++++ iocore/eventsystem/UnixEventProcessor.cc 2014-07-07 00:34:18.143512000 +0800 >+@@ -24,7 +24,6 @@ >+ #include "P_EventSystem.h" /* MAGIC_EDITING_TAG */ >+ #include <sched.h> >+ #if TS_USE_HWLOC >+-#include <alloca.h> >+ #include <hwloc.h> >+ #endif >+ #include "ink_defs.h" > >Property changes on: files/patch-iocore__eventsystem__UnixEventProcessor.cc >___________________________________________________________________ >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Index: files/patch-lib__Makefile.am >=================================================================== >--- files/patch-lib__Makefile.am (revision 0) >+++ files/patch-lib__Makefile.am (working copy) >@@ -0,0 +1,11 @@ >+--- 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) > >Property changes on: files/patch-lib__Makefile.am >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/patch-lib__atscppapi__src__GzipDeflateTransformation.cc >=================================================================== >--- files/patch-lib__atscppapi__src__GzipDeflateTransformation.cc (revision 362757) >+++ files/patch-lib__atscppapi__src__GzipDeflateTransformation.cc (working copy) >@@ -1,35 +0,0 @@ >---- ./lib/atscppapi/src/GzipDeflateTransformation.cc.orig 2013-12-05 22:07:48.000000000 +0000 >-+++ ./lib/atscppapi/src/GzipDeflateTransformation.cc 2014-01-27 08:45:49.000000000 +0000 >-@@ -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); >- } >- } >- >Index: files/patch-lib__atscppapi__src__GzipInflateTransformation.cc >=================================================================== >--- files/patch-lib__atscppapi__src__GzipInflateTransformation.cc (revision 362757) >+++ files/patch-lib__atscppapi__src__GzipInflateTransformation.cc (working copy) >@@ -1,11 +0,0 @@ >---- ./lib/atscppapi/src/GzipInflateTransformation.cc.orig 2013-12-05 22:07:48.000000000 +0000 >-+++ ./lib/atscppapi/src/GzipInflateTransformation.cc 2014-01-27 08:45:49.000000000 +0000 >-@@ -122,7 +122,7 @@ >- void GzipInflateTransformation::handleInputComplete() { >- int64_t bytes_written = setOutputComplete(); >- if (state_->bytes_produced_ != bytes_written) { >-- LOG_ERROR("Gzip bytes produced sanity check failed, inflated bytes = %ld != written bytes = %ld", state_->bytes_produced_, bytes_written); >-+ LOG_ERROR("Gzip bytes produced sanity check failed, inflated bytes = %lld != written bytes = %lld", state_->bytes_produced_, bytes_written); >- } >- } >- >Index: files/patch-lib__atscppapi__src__Logger.cc >=================================================================== >--- files/patch-lib__atscppapi__src__Logger.cc (revision 362757) >+++ files/patch-lib__atscppapi__src__Logger.cc (working copy) >@@ -1,11 +0,0 @@ >---- ./lib/atscppapi/src/Logger.cc.orig 2013-12-05 22:07:48.000000000 +0000 >-+++ ./lib/atscppapi/src/Logger.cc 2014-01-27 08:45:49.000000000 +0000 >-@@ -189,7 +189,7 @@ >- LOG_DEBUG("logging a " level " to '%s' with length %d", state_->filename_.c_str(), n); \ >- TSTextLogObjectWrite(state_->text_log_obj_, const_cast<char*>("[" level "] %s"), buffer); \ >- } else { \ >-- LOG_ERROR("Unable to log " level " message to '%s' due to size exceeding %lud bytes.", state_->filename_.c_str(), sizeof(buffer)); \ >-+ LOG_ERROR("Unable to log " level " message to '%s' due to size exceeding %zu bytes.", state_->filename_.c_str(), sizeof(buffer)); \ >- } \ >- return; \ >- } >Index: files/patch-lib__atscppapi__src__TransformationPlugin.cc >=================================================================== >--- files/patch-lib__atscppapi__src__TransformationPlugin.cc (revision 362757) >+++ files/patch-lib__atscppapi__src__TransformationPlugin.cc (working copy) >@@ -1,66 +0,0 @@ >---- ./lib/atscppapi/src/TransformationPlugin.cc.orig 2013-12-05 22:07:48.000000000 +0000 >-+++ ./lib/atscppapi/src/TransformationPlugin.cc 2014-01-27 08:45:49.000000000 +0000 >-@@ -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_); >Index: files/patch-lib__atscppapi__src__include__atscppapi__shared_ptr.h >=================================================================== >--- files/patch-lib__atscppapi__src__include__atscppapi__shared_ptr.h (revision 362757) >+++ files/patch-lib__atscppapi__src__include__atscppapi__shared_ptr.h (working copy) >@@ -1,30 +0,0 @@ >---- ./lib/atscppapi/src/include/atscppapi/shared_ptr.h.orig 2013-12-05 22:07:48.000000000 +0000 >-+++ ./lib/atscppapi/src/include/atscppapi/shared_ptr.h 2014-01-27 08:45:49.000000000 +0000 >-@@ -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_ */ >Index: files/patch-lib__atscppapi__src__include__atscppapi__utils.h >=================================================================== >--- files/patch-lib__atscppapi__src__include__atscppapi__utils.h (revision 362757) >+++ files/patch-lib__atscppapi__src__include__atscppapi__utils.h (working copy) >@@ -1,10 +0,0 @@ >---- ./lib/atscppapi/src/include/atscppapi/utils.h.orig 2013-12-05 22:07:48.000000000 +0000 >-+++ ./lib/atscppapi/src/include/atscppapi/utils.h 2014-01-27 08:45:49.000000000 +0000 >-@@ -27,6 +27,7 @@ >- #define ATSCPPAPI_UTILS_H_ >- >- #include <string> >-+#include <netinet/in.h> >- #include <arpa/inet.h> >- #include <stdint.h> >- >Index: files/patch-lib__luajit__src__Makefile >=================================================================== >--- files/patch-lib__luajit__src__Makefile (revision 0) >+++ files/patch-lib__luajit__src__Makefile (working copy) >@@ -0,0 +1,20 @@ >+--- lib/luajit/src/Makefile.orig 2014-06-16 05:17:49.000000000 +0800 >++++ lib/luajit/src/Makefile 2014-07-07 01:09:35.726810000 +0800 >+@@ -25,7 +25,7 @@ >+ # with "make clean", followed by "make" if you change any options. >+ # >+ # LuaJIT builds as a native 32 or 64 bit binary by default. >+-CC= gcc >++#CC= gcc >+ # >+ # Use this if you want to force a 32 bit build on a 64 bit multilib OS. >+ #CC= gcc -m32 >+@@ -313,7 +313,7 @@ >+ TARGET_DYNXLDOPTS= >+ TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER) >+ else >+- ifneq (,$(findstring stack-protector,$(shell $(TARGET_CC) -dumpspecs))) >++ ifneq (,$(findstring stack-protector,$(shell $(TARGET_CC)))) >+ TARGET_XCFLAGS+= -fno-stack-protector >+ endif >+ ifneq (SunOS,$(TARGET_SYS)) > >Property changes on: files/patch-lib__luajit__src__Makefile >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/patch-mgmt__api__remote__Makefile.am >=================================================================== >--- files/patch-mgmt__api__remote__Makefile.am (revision 362757) >+++ files/patch-mgmt__api__remote__Makefile.am (working copy) >@@ -1,10 +0,0 @@ >---- ./mgmt/api/remote/Makefile.am.orig 2013-12-05 22:07:48.000000000 +0000 >-+++ ./mgmt/api/remote/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 >- >- AM_CPPFLAGS = \ >- $(iocore_include_dirs) \ >Index: files/patch-mgmt__cli__cliMain.cc >=================================================================== >--- files/patch-mgmt__cli__cliMain.cc (revision 362757) >+++ files/patch-mgmt__cli__cliMain.cc (working copy) >@@ -1,10 +0,0 @@ >---- ./mgmt/cli/cliMain.cc.orig 2013-12-05 22:07:48.000000000 +0000 >-+++ ./mgmt/cli/cliMain.cc 2014-01-27 08:45:49.000000000 +0000 >-@@ -87,6 +87,7 @@ >- register_event_callback(); >- >- #if HAVE_LIBREADLINE >-+ Tcl_FindExecutable(NULL); >- Tcl_SetMainLoop(Tcl_ReadlineMain); >- #endif >- >Index: pkg-plist >=================================================================== >--- pkg-plist (revision 362757) >+++ pkg-plist (working copy) >@@ -27,7 +27,6 @@ > bin/traffic_manager > bin/traffic_sac > bin/traffic_server >-bin/traffic_shell > bin/trafficserver > bin/tspush > bin/tstop >@@ -62,21 +61,29 @@ > include/atscppapi/noncopyable.h > include/atscppapi/shared_ptr.h > include/atscppapi/utils.h >+lib/libatscppapi.la > lib/libatscppapi.so >-lib/libatscppapi.so.4 >-lib/libatscppapi.so.4.1.2 >+lib/libatscppapi.so.5 >+lib/libtsmgmt.la > lib/libtsmgmt.so >-lib/libtsmgmt.so.4 >-lib/libtsmgmt.so.4.1.2 >+lib/libtsmgmt.so.5 >+lib/libtsmgmtshare.la >+lib/libtsmgmtshare.so >+lib/libtsmgmtshare.so.5 >+lib/libtsutil.la > lib/libtsutil.so >-lib/libtsutil.so.4 >-lib/libtsutil.so.4.1.2 >+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.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 >@@ -85,7 +92,6 @@ > %%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 www > %%ETCDIR%%/body_factory/default/.body_factory_info > %%ETCDIR%%/body_factory/default/README >@@ -138,70 +144,9 @@ > @exec chown -f www %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/config_dns.1 >-share/doc/trafficserver/trafficshell/config_get.1 >-share/doc/trafficserver/trafficshell/config_hard-restart.1 >-share/doc/trafficserver/trafficshell/config_hostdb.1 >-share/doc/trafficserver/trafficshell/config_http.1 >-share/doc/trafficserver/trafficshell/config_icp.1 >-share/doc/trafficserver/trafficshell/config_logging.1 >-share/doc/trafficserver/trafficshell/config_name.1 >-share/doc/trafficserver/trafficshell/config_network.1 >-share/doc/trafficserver/trafficshell/config_parent.1 >-share/doc/trafficserver/trafficshell/config_port-tunnels.1 >-share/doc/trafficserver/trafficshell/config_remap.1 >-share/doc/trafficserver/trafficshell/config_reset-stats.1 >-share/doc/trafficserver/trafficshell/config_restart.1 >-share/doc/trafficserver/trafficshell/config_root.1 >-share/doc/trafficserver/trafficshell/config_scheduled-update.1 >-share/doc/trafficserver/trafficshell/config_security.1 >-share/doc/trafficserver/trafficshell/config_set.1 >-share/doc/trafficserver/trafficshell/config_socks.1 >-share/doc/trafficserver/trafficshell/config_ssl.1 >-share/doc/trafficserver/trafficshell/config_start.1 >-share/doc/trafficserver/trafficshell/config_stop.1 >-share/doc/trafficserver/trafficshell/config_upgrade.1 >-share/doc/trafficserver/trafficshell/config_virtual-ip.1 >-share/doc/trafficserver/trafficshell/disable.1 >-share/doc/trafficserver/trafficshell/enable.1 >-share/doc/trafficserver/trafficshell/exit.1 >-share/doc/trafficserver/trafficshell/show_alarms.1 >-share/doc/trafficserver/trafficshell/show_cache-stats.1 >-share/doc/trafficserver/trafficshell/show_cache.1 >-share/doc/trafficserver/trafficshell/show_cluster.1 >-share/doc/trafficserver/trafficshell/show_dns-resolver.1 >-share/doc/trafficserver/trafficshell/show_dns-stats.1 >-share/doc/trafficserver/trafficshell/show_hostdb-stats.1 >-share/doc/trafficserver/trafficshell/show_hostdb.1 >-share/doc/trafficserver/trafficshell/show_http-stats.1 >-share/doc/trafficserver/trafficshell/show_http-trans-stats.1 >-share/doc/trafficserver/trafficshell/show_http.1 >-share/doc/trafficserver/trafficshell/show_icp-stats.1 >-share/doc/trafficserver/trafficshell/show_icp.1 >-share/doc/trafficserver/trafficshell/show_logging-stats.1 >-share/doc/trafficserver/trafficshell/show_logging.1 >-share/doc/trafficserver/trafficshell/show_network.1 >-share/doc/trafficserver/trafficshell/show_parent.1 >-share/doc/trafficserver/trafficshell/show_port-tunnels.1 >-share/doc/trafficserver/trafficshell/show_proxy-stats.1 >-share/doc/trafficserver/trafficshell/show_proxy.1 >-share/doc/trafficserver/trafficshell/show_remap.1 >-share/doc/trafficserver/trafficshell/show_scheduled-update.1 >-share/doc/trafficserver/trafficshell/show_security.1 >-share/doc/trafficserver/trafficshell/show_socks.1 >-share/doc/trafficserver/trafficshell/show_ssl.1 >-share/doc/trafficserver/trafficshell/show_status.1 >-share/doc/trafficserver/trafficshell/show_version.1 >-share/doc/trafficserver/trafficshell/show_virtual-ip.1 > @dirrm %%SITE_PERL%%/Apache/TS/Config > @dirrm %%SITE_PERL%%/Apache/TS > @dirrm %%SITE_PERL%%/Apache >-@dirrm share/trafficserver >-@dirrm share/doc/trafficserver/trafficshell >-@dirrm share/doc/trafficserver > @dirrm libexec/trafficserver > @dirrm include/ts > @dirrm include/atscppapi
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=144923">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 192076
: 144923