diff options
| -rw-r--r-- | www/trafficserver/Makefile | 2 | ||||
| -rw-r--r-- | www/trafficserver/distinfo | 6 | ||||
| -rw-r--r-- | www/trafficserver/files/patch-cmd_traffic__manager_MgmtHandlers.cc | 11 | ||||
| -rw-r--r-- | www/trafficserver/files/patch-iocore_cluster_ClusterCache.cc | 20 | ||||
| -rw-r--r-- | www/trafficserver/files/patch-mgmt_utils_MgmtSocket.cc | 11 | ||||
| -rw-r--r-- | www/trafficserver/files/patch-proxy_Main.cc | 11 | ||||
| -rw-r--r-- | www/trafficserver/files/patch-proxy_http_remap_RemapPluginInfo.cc | 11 |
7 files changed, 4 insertions, 68 deletions
diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile index be1d76d1f979..d22e9e06886a 100644 --- a/www/trafficserver/Makefile +++ b/www/trafficserver/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= trafficserver -PORTVERSION= 6.2.0 +PORTVERSION= 6.2.3 CATEGORIES= www MASTER_SITES= APACHE/${PORTNAME} diff --git a/www/trafficserver/distinfo b/www/trafficserver/distinfo index 35d9512c2f71..3879561b45aa 100644 --- a/www/trafficserver/distinfo +++ b/www/trafficserver/distinfo @@ -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 diff --git a/www/trafficserver/files/patch-cmd_traffic__manager_MgmtHandlers.cc b/www/trafficserver/files/patch-cmd_traffic__manager_MgmtHandlers.cc deleted file mode 100644 index f5908973be5d..000000000000 --- a/www/trafficserver/files/patch-cmd_traffic__manager_MgmtHandlers.cc +++ /dev/null @@ -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"); - } - } diff --git a/www/trafficserver/files/patch-iocore_cluster_ClusterCache.cc b/www/trafficserver/files/patch-iocore_cluster_ClusterCache.cc deleted file mode 100644 index 3f6ab366e3af..000000000000 --- a/www/trafficserver/files/patch-iocore_cluster_ClusterCache.cc +++ /dev/null @@ -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 // - ////////////////////// diff --git a/www/trafficserver/files/patch-mgmt_utils_MgmtSocket.cc b/www/trafficserver/files/patch-mgmt_utils_MgmtSocket.cc deleted file mode 100644 index 14cf01332ac0..000000000000 --- a/www/trafficserver/files/patch-mgmt_utils_MgmtSocket.cc +++ /dev/null @@ -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; diff --git a/www/trafficserver/files/patch-proxy_Main.cc b/www/trafficserver/files/patch-proxy_Main.cc deleted file mode 100644 index d0f1c2663925..000000000000 --- a/www/trafficserver/files/patch-proxy_Main.cc +++ /dev/null @@ -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 { diff --git a/www/trafficserver/files/patch-proxy_http_remap_RemapPluginInfo.cc b/www/trafficserver/files/patch-proxy_http_remap_RemapPluginInfo.cc deleted file mode 100644 index 493cded27239..000000000000 --- a/www/trafficserver/files/patch-proxy_http_remap_RemapPluginInfo.cc +++ /dev/null @@ -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); - } - |