From 05ad3f286f98eb7821f024a2f6424236b5f16dd5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 25 May 2018 07:29:18 +0200 Subject: update to 2.9.0, from Fedora --- ...4-initialize-flag-for-JSON-server-feature.patch | 37 - compat_reports/2.8.7_to_2.9.0/compat_report.html | 821 +++++++++++++++++++++ libcouchbase.spec | 10 +- libcouchbase.xml | 2 +- 4 files changed, 827 insertions(+), 43 deletions(-) delete mode 100644 0004-CCBC-924-initialize-flag-for-JSON-server-feature.patch create mode 100644 compat_reports/2.8.7_to_2.9.0/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 deleted file mode 100644 index 09354b9..0000000 --- a/0004-CCBC-924-initialize-flag-for-JSON-server-feature.patch +++ /dev/null @@ -1,37 +0,0 @@ -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.7_to_2.9.0/compat_report.html b/compat_reports/2.8.7_to_2.9.0/compat_report.html new file mode 100644 index 0000000..fb86e90 --- /dev/null +++ b/compat_reports/2.8.7_to_2.9.0/compat_report.html @@ -0,0 +1,821 @@ + + + + + + + + + +libcouchbase: 2.8.7 to 2.9.0 compatibility report + + + +

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

+ +
+
+

Test Info


+ + + + + + + +
Library Namelibcouchbase
Version #12.8.7
Version #22.9.0
Archx86_64
GCC Version7
SubjectBinary Compatibility
+

Test Results


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

Problem Summary


+ + + + + + + + + +
SeverityCount
Added Symbols-3
Removed SymbolsHigh0
Problems with
Data Types
High0
Medium0
Low4
Problems with
Symbols
High0
Medium0
Low0
Problems with
Constants
Low0
+ +

Added Symbols  3 


+crypto.h, libcouchbase.so.2.0.56
+lcbcrypto_decrypt_fields ( lcb_t instance, lcbcrypto_CMDDECRYPT* cmd )
+lcbcrypto_encrypt_fields ( lcb_t instance, lcbcrypto_CMDENCRYPT* cmd )
+
+tracing.h, libcouchbase.so.2.0.56
+lcbtrace_span_get_tag_bool ( lcbtrace_SPAN* span, char const* name, int* value )
+
+to the top
+ +

Problems with Data Types, Low Severity  4 


+crypto.h
+ +[+] struct lcbcrypto_CMDDECRYPT  3  +
+ + + +[+] union lcbcrypto_PROVIDER::anon-union-crypto.h-52  1  +
+ + +
+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.55
+
+
to the top
+


+

Test Info


+ + + + + + +
Library Namelibcouchbase
Version #12.8.7
Version #22.9.0
Archx86_64
SubjectSource Compatibility
+

Test Results


+ + + + + + +
Total Header Files32
Total Libraries1
Total Symbols / Types469 / 444
Compatibility99.9%
+

Problem Summary


+ + + + + + + + + + + +
SeverityCount
Added Symbols-2
Removed SymbolsHigh0
Problems with
Data Types
High0
Medium0
Low2
Problems with
Symbols
High0
Medium1
Low1
Problems with
Constants
Low3
Other Changes
in Data Types
-1
Other Changes
in Constants
-1
+ +

Added Symbols  2 


+crypto.h
+lcbcrypto_decrypt_fields ( lcb_t instance, lcbcrypto_CMDDECRYPT* cmd )
+lcbcrypto_encrypt_fields ( lcb_t instance, lcbcrypto_CMDENCRYPT* cmd )
+
+to the top
+ +

Problems with Symbols, Medium Severity  1 


+tracing.h
+ +[+] lcbtrace_span_get_tag_bool ( lcbtrace_SPAN* span, char const* name, int value )  1  +
+ +
+to the top
+ +

Problems with Data Types, Low Severity  2 


+crypto.h
+ +[+] struct lcbcrypto_CMDDECRYPT  2  +
+ + +
+to the top
+ +

Problems with Symbols, Low Severity  1 


+tracing.h
+ +[+] lcbtrace_span_get_tag_bool ( lcbtrace_SPAN* span, char const* name, int value )  1  +
+ +
+to the top
+ +

Problems with Constants, Low Severity  3 


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

Other Changes in Data Types  1 


+crypto.h
+ +[+] union lcbcrypto_PROVIDER::anon-union-crypto.h-52  1  +
+ + +
+to the top
+ +

Other Changes in Constants  1 


+crypto.h
+ +[+] LCBCRYPTO_DEFAULT_FIELD_PREFIX +
+ + +
+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.55
+
+
to the top
+



+ +
+ + diff --git a/libcouchbase.spec b/libcouchbase.spec index b67c209..bcaea8b 100644 --- a/libcouchbase.spec +++ b/libcouchbase.spec @@ -23,8 +23,8 @@ %endif Name: libcouchbase -Version: 2.8.7 -Release: 2%{?dist} +Version: 2.9.0 +Release: 1%{?dist} Summary: Couchbase client library Group: System Environment/Libraries License: ASL 2.0 @@ -34,8 +34,6 @@ 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++ @@ -131,7 +129,6 @@ a Couchbase Server. %patch0 -p1 -b .crypto %patch1 -p1 -b .plug %patch2 -p1 -b .pkgc -%patch3 -p1 -b .json %build @@ -204,6 +201,9 @@ make %{_smp_mflags} alltests test ARGS=%{_smp_mflags} %changelog +* Thu May 24 2018 Sergey Avseyev - 2.9.0-1 +- Update to 2.9.0 + * Wed May 02 2018 Sergey Avseyev - 2.8.7-2 - Port patch for JSON datatype diff --git a/libcouchbase.xml b/libcouchbase.xml index 2aadd9d..90f4532 100644 --- a/libcouchbase.xml +++ b/libcouchbase.xml @@ -9,7 +9,7 @@ -2.8.7 +2.9.0 -- cgit