Index: head/www/trafficserver/Makefile =================================================================== --- head/www/trafficserver/Makefile (revision 489945) +++ head/www/trafficserver/Makefile (revision 489946) @@ -1,65 +1,65 @@ # Created by: Jui-Nan Lin # $FreeBSD$ PORTNAME= trafficserver -PORTVERSION= 6.2.0 +PORTVERSION= 6.2.3 CATEGORIES= www MASTER_SITES= APACHE/${PORTNAME} MAINTAINER= gaod@hychen.org COMMENT= Fast, scalable and extensible HTTP proxy server LICENSE= APACHE20 LIB_DEPENDS= libcurl.so:ftp/curl \ libhwloc.so:devel/hwloc \ libpcre.so:devel/pcre \ libxml2.so:textproc/libxml2 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USES= cpe gmake libtool ncurses pathfix perl5 pkgconfig \ sqlite ssl tar:bzip2 tcl CPE_VENDOR= apache CPE_PRODUCT= traffic_server USE_PERL5= build run USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} ONLY_FOR_ARCHS= amd64 USERS= ${WWWOWN} GROUPS= ${WWWGRP} PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" PORTVERSION="${PORTVERSION}" LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-libxml2=${LOCALBASE} \ --with-pcre=${LOCALBASE} \ --with-openssl=${OPENSSLBASE} \ --with-xml=libxml2 \ --with-tcl=${TCL_LIBDIR} \ --enable-cppapi \ --localstatedir=/var \ --with-user=${USERS} \ --with-group=${GROUPS} OPTIONS_DEFINE= DOCS WCCP WCCP_DESC= Enable WCCPv2 protocol WCCP_CONFIGURE_ENABLE= wccp post-patch: @${REINPLACE_CMD} \ -e '/cachedir:/s,$${localstatedir}+,$${localstatedir}/cache+,' \ -e '/runtimedir:/s,$${localstatedir}+,$${localstatedir}/run+,' \ ${WRKSRC}/config.layout @${REINPLACE_CMD} '/^LUA_LDFLAGS =/s/$$/ @LDFLAGS@/' \ ${WRKSRC}/lib/Makefile.in post-install: @${RMDIR} ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${ETCDIR}/snapshots (cd ${STAGEDIR}${ETCDIR} && for f in *.config *.config.xml; do ${MV} $$f $$f.sample; done) .include Index: head/www/trafficserver/distinfo =================================================================== --- head/www/trafficserver/distinfo (revision 489945) +++ head/www/trafficserver/distinfo (revision 489946) @@ -1,3 +1,3 @@ -TIMESTAMP = 1472401430 -SHA256 (trafficserver-6.2.0.tar.bz2) = bd5e8c178d02957b89a81d1e428ee50bcca0831a6917f32408915c56f486fd85 -SIZE (trafficserver-6.2.0.tar.bz2) = 8437286 +TIMESTAMP = 1536003051 +SHA256 (trafficserver-6.2.3.tar.bz2) = 333875815e62cecda480b0626f72c7d5a730544d92a80aef6dcccdad6216190d +SIZE (trafficserver-6.2.3.tar.bz2) = 8433443 Index: head/www/trafficserver/files/patch-iocore_cluster_ClusterCache.cc =================================================================== --- head/www/trafficserver/files/patch-iocore_cluster_ClusterCache.cc (revision 489945) +++ head/www/trafficserver/files/patch-iocore_cluster_ClusterCache.cc (nonexistent) @@ -1,20 +0,0 @@ ---- iocore/cluster/ClusterCache.cc.orig 2016-07-11 23:03:32 UTC -+++ iocore/cluster/ClusterCache.cc -@@ -437,7 +437,7 @@ CacheContinuation::do_op(Continuation *c - } - case CACHE_OPEN_WRITE: - case CACHE_OPEN_READ: { -- ink_release_assert(c > 0); -+ ink_release_assert(c); - ////////////////////// - // Use short format // - ////////////////////// -@@ -500,7 +500,7 @@ CacheContinuation::do_op(Continuation *c - - case CACHE_OPEN_READ_LONG: - case CACHE_OPEN_WRITE_LONG: { -- ink_release_assert(c > 0); -+ ink_release_assert(c); - ////////////////////// - // Use long format // - ////////////////////// Property changes on: head/www/trafficserver/files/patch-iocore_cluster_ClusterCache.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/trafficserver/files/patch-cmd_traffic__manager_MgmtHandlers.cc =================================================================== --- head/www/trafficserver/files/patch-cmd_traffic__manager_MgmtHandlers.cc (revision 489945) +++ head/www/trafficserver/files/patch-cmd_traffic__manager_MgmtHandlers.cc (nonexistent) @@ -1,11 +0,0 @@ ---- cmd/traffic_manager/MgmtHandlers.cc.orig 2016-07-11 23:03:32 UTC -+++ cmd/traffic_manager/MgmtHandlers.cc -@@ -268,7 +268,7 @@ mgmt_synthetic_main(void *) - } else { - ink_thread thrId = ink_thread_create(synthetic_thread, (void *)&clientFD, 1); - -- if (thrId <= 0) { -+ if (thrId == 0) { - mgmt_log(stderr, "[SyntheticHealthServer] Failed to create worker thread"); - } - } Property changes on: head/www/trafficserver/files/patch-cmd_traffic__manager_MgmtHandlers.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/trafficserver/files/patch-proxy_http_remap_RemapPluginInfo.cc =================================================================== --- head/www/trafficserver/files/patch-proxy_http_remap_RemapPluginInfo.cc (revision 489945) +++ head/www/trafficserver/files/patch-proxy_http_remap_RemapPluginInfo.cc (nonexistent) @@ -1,11 +0,0 @@ ---- proxy/http/remap/RemapPluginInfo.cc.orig 2016-07-11 23:03:32 UTC -+++ proxy/http/remap/RemapPluginInfo.cc -@@ -39,7 +39,7 @@ remap_plugin_info::remap_plugin_info(cha - { - // coverity did not see ats_free - // coverity[ctor_dtor_leak] -- if (_path && likely((path = ats_strdup(_path)) > 0)) -+ if (_path && likely((path = ats_strdup(_path)) != NULL)) - path_size = strlen(path); - } - Property changes on: head/www/trafficserver/files/patch-proxy_http_remap_RemapPluginInfo.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/trafficserver/files/patch-mgmt_utils_MgmtSocket.cc =================================================================== --- head/www/trafficserver/files/patch-mgmt_utils_MgmtSocket.cc (revision 489945) +++ head/www/trafficserver/files/patch-mgmt_utils_MgmtSocket.cc (nonexistent) @@ -1,11 +0,0 @@ ---- mgmt/utils/MgmtSocket.cc.orig 2016-07-11 23:03:32 UTC -+++ mgmt/utils/MgmtSocket.cc -@@ -89,7 +89,7 @@ mgmt_fopen(const char *filename, const c - // no leak here as f will be returned if it is > 0 - // coverity[overwrite_var] - f = ::fopen(filename, mode); -- if (f > 0) -+ if (f) - return f; - if (!mgmt_transient_error()) - break; Property changes on: head/www/trafficserver/files/patch-mgmt_utils_MgmtSocket.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/trafficserver/files/patch-proxy_Main.cc =================================================================== --- head/www/trafficserver/files/patch-proxy_Main.cc (revision 489945) +++ head/www/trafficserver/files/patch-proxy_Main.cc (nonexistent) @@ -1,11 +0,0 @@ ---- proxy/Main.cc.orig 2016-07-11 23:03:32 UTC -+++ proxy/Main.cc -@@ -539,7 +539,7 @@ cmd_list(char * /* cmd ATS_UNUSED */) - - Note("Cache Storage:"); - Store tStore; -- if (tStore.read_config() < 0) { -+ if (tStore.read_config() != NULL) { - Note("config read failure"); - return CMD_FAILED; - } else { Property changes on: head/www/trafficserver/files/patch-proxy_Main.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property