www/trafficserver: update 6.2.0 -> 6.2.3, fix build on 12
PR: 231127 Reviewed by: Sam Chen <sc.gear@one.caeon.com> Approved by: gaod@hychen.org (maintainer timeout) Relnotes: https://raw.githubusercontent.com/apache/trafficserver/6.2.3/CHANGELOG-6.2.3 https://raw.githubusercontent.com/apache/trafficserver/6.2.2/CHANGELOG-6.2.2 https://raw.githubusercontent.com/apache/trafficserver/6.2.1/CHANGELOG-6.2.1
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= trafficserver
|
||||
PORTVERSION= 6.2.0
|
||||
PORTVERSION= 6.2.3
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= APACHE/${PORTNAME}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
}
|
||||
@@ -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 //
|
||||
//////////////////////
|
||||
@@ -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;
|
||||
@@ -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 {
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user