CVS commit: pkgsrc/devel/libthrift

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu Dec 15 23:50:01 UTC 2016

Modified Files:
        pkgsrc/devel/libthrift: Makefile distinfo
Added Files:
        pkgsrc/devel/libthrift/patches:
            patch-lib_cpp_src_transport_TFileTransport.cpp

Log Message:
There is no order relation for pointers vs 0. Guess the expected
behavior and bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/devel/libthrift/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/libthrift/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/libthrift/patches/patch-lib_cpp_src_transport_TFileTransport.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libthrift/Makefile
diff -u pkgsrc/devel/libthrift/Makefile:1.53 pkgsrc/devel/libthrift/Makefile:1.54
--- pkgsrc/devel/libthrift/Makefile:1.53        Sun Dec  4 05:17:24 2016
+++ pkgsrc/devel/libthrift/Makefile     Thu Dec 15 23:50:01 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2016/12/04 05:17:24 ryoon Exp $
+# $NetBSD: Makefile,v 1.54 2016/12/15 23:50:01 joerg Exp $
 
 DISTNAME=      thrift-${THRIFT_VERSION}
 PKGNAME=       libthrift-${THRIFT_VERSION}
-PKGREVISION=   35
+PKGREVISION=   36
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_APACHE:=thrift/${THRIFT_VERSION}/}
 EXTRACT_SUFX=  .tar.gz

Index: pkgsrc/devel/libthrift/distinfo
diff -u pkgsrc/devel/libthrift/distinfo:1.14 pkgsrc/devel/libthrift/distinfo:1.15
--- pkgsrc/devel/libthrift/distinfo:1.14        Mon May 30 16:09:07 2016
+++ pkgsrc/devel/libthrift/distinfo     Thu Dec 15 23:50:01 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2016/05/30 16:09:07 taca Exp $
+$NetBSD: distinfo,v 1.15 2016/12/15 23:50:01 joerg Exp $
 
 SHA1 (thrift-0.7.0.tar.gz) = b8f6877bc75878984355da4efe171ad99ff05b6a
 RMD160 (thrift-0.7.0.tar.gz) = d9db8ff077347134101cd017e086511c4317b052
@@ -19,6 +19,7 @@ SHA1 (patch-lib_cpp_src_async_TEvhttpSer
 SHA1 (patch-lib_cpp_src_concurrency_FunctionRunner.h) = 8e15b54872ad0bb59276d25d7200517382a9fcb4
 SHA1 (patch-lib_cpp_src_concurrency_ThreadManager.h) = e97795f632ed98c19172fa25ff6a83a0c9580ff2
 SHA1 (patch-lib_cpp_src_server_TNonblockingServer.cpp) = 1f94bcad637279b151b8c0830854c5fc72919e68
+SHA1 (patch-lib_cpp_src_transport_TFileTransport.cpp) = e3d68d0287388dfd81c94555c3437fa8aafcea06
 SHA1 (patch-lib_cpp_src_transport_TSSLSocket.cpp) = 5b0ee2a0d276affc4ead52492e0100f4c0665550
 SHA1 (patch-lib_cpp_src_transport_TServerSocket.cpp) = dc54a0991f5918de04da73f184c551d7a2bd57ed
 SHA1 (patch-lib_cpp_test_Benchmark.cpp) = 65a3a873b33f7290551c535b4ef8c9a109aae3e1

Added files:

Index: pkgsrc/devel/libthrift/patches/patch-lib_cpp_src_transport_TFileTransport.cpp
diff -u /dev/null pkgsrc/devel/libthrift/patches/patch-lib_cpp_src_transport_TFileTransport.cpp:1.1
--- /dev/null   Thu Dec 15 23:50:02 2016
+++ pkgsrc/devel/libthrift/patches/patch-lib_cpp_src_transport_TFileTransport.cpp       Thu Dec 15 23:50:01 2016
@@ -0,0 +1,24 @@
+$NetBSD: patch-lib_cpp_src_transport_TFileTransport.cpp,v 1.1 2016/12/15 23:50:01 joerg Exp $
+
+Don't compare pointers to 0, there is no order relation.
+
+--- lib/cpp/src/transport/TFileTransport.cpp.orig      2016-12-13 21:29:23.196467473 +0000
++++ lib/cpp/src/transport/TFileTransport.cpp
+@@ -136,7 +136,7 @@ void TFileTransport::resetOutputFile(int
+ 
+ TFileTransport::~TFileTransport() {
+   // flush the buffer if a writer thread is active
+-  if (writerThreadId_ > 0) {
++  if (writerThreadId_) {
+     // set state to closing
+     closing_ = true;
+ 
+@@ -521,7 +521,7 @@ void TFileTransport::writerThread() {
+ 
+ void TFileTransport::flush() {
+   // file must be open for writing for any flushing to take place
+-  if (writerThreadId_ <= 0) {
++  if (writerThreadId_ == 0) {
+     return;
+   }
+   // wait for flush to take place