From 70d526eef1c350b3af1fe17b3d247f952f20b7c9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 3 May 2018 06:37:49 +0200 Subject: Update to 2.8.7 from Fedora: * Wed May 02 2018 Sergey Avseyev - 2.8.7-2 - Port patch for JSON datatype * Wed May 02 2018 Sergey Avseyev - 2.8.7-1 - Update to 2.8.7 --- ...4-initialize-flag-for-JSON-server-feature.patch | 37 + compat_reports/2.8.6_to_2.8.7/compat_report.html | 873 +++++++++++++++++++++ libcouchbase.spec | 13 +- libcouchbase.xml | 2 +- 4 files changed, 922 insertions(+), 3 deletions(-) create mode 100644 0004-CCBC-924-initialize-flag-for-JSON-server-feature.patch create mode 100644 compat_reports/2.8.6_to_2.8.7/compat_report.html diff --git a/0004-CCBC-924-initialize-flag-for-JSON-server-feature.patch b/0004-CCBC-924-initialize-flag-for-JSON-server-feature.patch new file mode 100644 index 0000000..09354b9 --- /dev/null +++ b/0004-CCBC-924-initialize-flag-for-JSON-server-feature.patch @@ -0,0 +1,37 @@ +From 047c6b33d51831927a2f1f03bc5417d6d038f3e5 Mon Sep 17 00:00:00 2001 +From: Sergey Avseyev +Date: Thu, 3 May 2018 01:47:56 +0300 +Subject: [PATCH] CCBC-924: initialize flag for JSON server feature + +Otherwise it might be left uninitialized and the library will +send JSON datatype to servers, which do not support it. + +Change-Id: Ib316816d1db4a7071a4864c7293f4ad374b01eac +--- + src/mcserver/mcserver.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/mcserver/mcserver.cc b/src/mcserver/mcserver.cc +index 50739006..d73ee7e7 100644 +--- a/src/mcserver/mcserver.cc ++++ b/src/mcserver/mcserver.cc +@@ -691,6 +691,7 @@ Server::Server(lcb_t instance_, int ix) + instance(instance_), + settings(lcb_settings_ref2(instance_->settings)), + compsupport(0), ++ jsonsupport(0), + mutation_tokens(0), + connctx(NULL), + curhost(new lcb_host_t()) +@@ -720,7 +721,7 @@ Server::Server(lcb_t instance_, int ix) + + Server::Server() + : state(S_TEMPORARY), +- io_timer(NULL), instance(NULL), settings(NULL), compsupport(0), ++ io_timer(NULL), instance(NULL), settings(NULL), compsupport(0), jsonsupport(0), + mutation_tokens(0), connctx(NULL), connreq(NULL), curhost(NULL) + { + } +-- +2.17.0 + diff --git a/compat_reports/2.8.6_to_2.8.7/compat_report.html b/compat_reports/2.8.6_to_2.8.7/compat_report.html new file mode 100644 index 0000000..05030a5 --- /dev/null +++ b/compat_reports/2.8.6_to_2.8.7/compat_report.html @@ -0,0 +1,873 @@ + + + + + + + + +libcouchbase: 2.8.6 to 2.8.7 compatibility report + + + +

API compatibility report for the libcouchbase library between 2.8.6 and 2.8.7 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibcouchbase
Version #12.8.6
Version #22.8.7
Archx86_64
GCC Version7
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files32
Total Libraries1
Total Symbols / Types259 / 436
Compatibility100%
+

Problem Summary

+ + + + + + + + + + +
SeverityCount
Added Symbols-0
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low2
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low1
Other Changes
in Constants		-4
+ + +

Problems with Data Types, Low Severity  2 

+couchbase.h
+ +[+] struct lcb_MULTICMD_CTX_st  2  +
+ + +
+to the top
+ +

Problems with Constants, Low Severity  1 

+cntl.h
+ +[+] LCB_CNTL__MAX +
+ + +
+to the top
+ +

Other Changes in Constants  4 

+cntl-private.h
+ +[+] LCB_CNTL_COMPRESSION_MIN_RATIO +
+ + + +[+] LCB_CNTL_COMPRESSION_MIN_SIZE +
+ + + +[+] LCB_CNTL_VB_NOREMAP +
+ + +
+tracing.h
+ +[+] LCBTRACE_OP_OBSERVE_CAS_ROUND +
+ + +
+to the top
+

Header Files  32 

+
+_cxxwrap.h
+api-legacy.h
+api3.h
+assert.h
+auth.h
+cbft.h
+cntl-private.h
+cntl.h
+configuration.h
+couchbase.h
+crypto.h
+deprecated.h
+http.h
+iops.h
+ixmgmt.h
+kvbuf.h
+libev_io_opts.h
+libevent_io_opts.h
+libuv_compat.h
+libuv_io_opts.h
+metrics.h
+n1ql.h
+pktfwd.h
+plugin-internal.h
+select_io_opts.h
+subdoc.h
+sysdefs.h
+tracing.h
+vbucket.h
+views.h
+visibility.h
+wsaerr.h
+
+
to the top
+

Libraries  1 

+
+libcouchbase.so.2.0.54
+
+
to the top
+


+

Test Info

+ + + + + + +
Library Namelibcouchbase
Version #12.8.6
Version #22.8.7
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files32
Total Libraries1
Total Symbols / Types316 / 443
Compatibility100%
+

Problem Summary

+ + + + + + + + + + +
SeverityCount
Added Symbols-0
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low1
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low4
Other Changes
in Constants		-4
+ + +

Problems with Data Types, Low Severity  1 

+couchbase.h
+ +[+] struct lcb_MULTICMD_CTX_st  1  +
+ + +
+to the top
+ +

Problems with Constants, Low Severity  4 

+cntl.h
+ +[+] LCB_CNTL__MAX +
+ + +
+configuration.h
+ +[+] LCB_VERSION +
+ + + +[+] LCB_VERSION_CHANGESET +
+ + + +[+] LCB_VERSION_STRING +
+ + +
+to the top
+ +

Other Changes in Constants  4 

+cntl-private.h
+ +[+] LCB_CNTL_COMPRESSION_MIN_RATIO +
+ + + +[+] LCB_CNTL_COMPRESSION_MIN_SIZE +
+ + + +[+] LCB_CNTL_VB_NOREMAP +
+ + +
+tracing.h
+ +[+] LCBTRACE_OP_OBSERVE_CAS_ROUND +
+ + +
+to the top
+

Header Files  32 

+
+_cxxwrap.h
+api-legacy.h
+api3.h
+assert.h
+auth.h
+cbft.h
+cntl-private.h
+cntl.h
+configuration.h
+couchbase.h
+crypto.h
+deprecated.h
+http.h
+iops.h
+ixmgmt.h
+kvbuf.h
+libev_io_opts.h
+libevent_io_opts.h
+libuv_compat.h
+libuv_io_opts.h
+metrics.h
+n1ql.h
+pktfwd.h
+plugin-internal.h
+select_io_opts.h
+subdoc.h
+sysdefs.h
+tracing.h
+vbucket.h
+views.h
+visibility.h
+wsaerr.h
+
+
to the top
+

Libraries  1 

+
+libcouchbase.so.2.0.54
+
+
to the top
+


+
Generated by ABI Compliance Checker 2.2   +
+
+ + diff --git a/libcouchbase.spec b/libcouchbase.spec index cf6fb66..b67c209 100644 --- a/libcouchbase.spec +++ b/libcouchbase.spec @@ -23,8 +23,8 @@ %endif Name: libcouchbase -Version: 2.8.6 -Release: 1%{?dist} +Version: 2.8.7 +Release: 2%{?dist} Summary: Couchbase client library Group: System Environment/Libraries License: ASL 2.0 @@ -34,6 +34,8 @@ Source0: http://packages.couchbase.com/clients/c/%{name}-%{version}.tar.gz Patch0: 0001-enforce-system-crypto-policies.patch Patch1: 0002-do-not-install-plugins-into-libdir.patch Patch2: 0003-fix-pkgconfig-paths.patch +# http://review.couchbase.org/c/93641 +Patch3: 0004-CCBC-924-initialize-flag-for-JSON-server-feature.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -129,6 +131,7 @@ a Couchbase Server. %patch0 -p1 -b .crypto %patch1 -p1 -b .plug %patch2 -p1 -b .pkgc +%patch3 -p1 -b .json %build @@ -201,6 +204,12 @@ make %{_smp_mflags} alltests test ARGS=%{_smp_mflags} %changelog +* Wed May 02 2018 Sergey Avseyev - 2.8.7-2 +- Port patch for JSON datatype + +* Wed May 02 2018 Sergey Avseyev - 2.8.7-1 +- Update to 2.8.7 + * Fri Apr 06 2018 Sergey Avseyev - 2.8.6-1 - Update to 2.8.6 diff --git a/libcouchbase.xml b/libcouchbase.xml index 4a33c61..2aadd9d 100644 --- a/libcouchbase.xml +++ b/libcouchbase.xml @@ -9,7 +9,7 @@ -2.8.6 +2.8.7 -- cgit