From d69bb41b47e2e9811d27afa102a36a3c9e2392fe Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 12 Jul 2017 12:23:37 +0200 Subject: fix new symbols visibility --- compat_reports/2.7.6_to_2.7.6.1/compat_report.html | 535 +++++++++++++++++++++ libcouchbase-pr25.patch | 14 - libcouchbase-pr27.patch | 50 ++ libcouchbase.spec | 12 +- 4 files changed, 594 insertions(+), 17 deletions(-) create mode 100644 compat_reports/2.7.6_to_2.7.6.1/compat_report.html delete mode 100644 libcouchbase-pr25.patch create mode 100644 libcouchbase-pr27.patch diff --git a/compat_reports/2.7.6_to_2.7.6.1/compat_report.html b/compat_reports/2.7.6_to_2.7.6.1/compat_report.html new file mode 100644 index 0000000..7ece6e3 --- /dev/null +++ b/compat_reports/2.7.6_to_2.7.6.1/compat_report.html @@ -0,0 +1,535 @@ + + + + + + + + +libcouchbase: 2.7.6 to 2.7.6.1 compatibility report + + + +

API compatibility report for the libcouchbase library between 2.7.6 and 2.7.6.1 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibcouchbase
Version #12.7.6
Version #22.7.6.1
Archx86_64
GCC Version6.3.1
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files29
Total Libraries1
Total Symbols / Types217 / 398
Compatibility100%
+

Problem Summary

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

Added Symbols  2 

+couchbase.h, libcouchbase.so.2.0.46
+lcb_resp_get_error_context ( int cbtype, struct lcb_RESPBASE const* rb )
+lcb_resp_get_error_ref ( int cbtype, struct lcb_RESPBASE const* rb )
+
+to the top
+

Header Files  29 

+
+_cxxwrap.h
+api-legacy.h
+api3.h
+assert.h
+auth.h
+cbft.h
+cntl-private.h
+cntl.h
+configuration.h
+couchbase.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
+n1ql.h
+pktfwd.h
+plugin-internal.h
+select_io_opts.h
+subdoc.h
+sysdefs.h
+vbucket.h
+views.h
+visibility.h
+wsaerr.h
+
+
to the top
+

Libraries  1 

+
+libcouchbase.so.2.0.46
+
+
to the top
+


+

Test Info

+ + + + + + +
Library Namelibcouchbase
Version #12.7.6
Version #22.7.6.1
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files29
Total Libraries1
Total Symbols / Types275 / 405
Compatibility100%
+

Problem Summary

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

Header Files  29 

+
+_cxxwrap.h
+api-legacy.h
+api3.h
+assert.h
+auth.h
+cbft.h
+cntl-private.h
+cntl.h
+configuration.h
+couchbase.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
+n1ql.h
+pktfwd.h
+plugin-internal.h
+select_io_opts.h
+subdoc.h
+sysdefs.h
+vbucket.h
+views.h
+visibility.h
+wsaerr.h
+
+
to the top
+

Libraries  1 

+
+libcouchbase.so.2.0.46
+
+
to the top
+


+
Generated by ABI Compliance Checker 2.1   +
+
+ + diff --git a/libcouchbase-pr25.patch b/libcouchbase-pr25.patch deleted file mode 100644 index 68cd2e2..0000000 --- a/libcouchbase-pr25.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/ssl/ssl_common.c b/src/ssl/ssl_common.c -index 3a5327b..4b18d74 100644 ---- a/src/ssl/ssl_common.c -+++ b/src/ssl/ssl_common.c -@@ -156,7 +156,9 @@ iotssl_log_errors(lcbio_XSSL *xs) - if (ERR_GET_LIB(curerr) == ERR_LIB_SSL) { - switch (ERR_GET_REASON(curerr)) { - case SSL_R_CERTIFICATE_VERIFY_FAILED: -+#ifdef SSL_R_MISSING_VERIFY_MESSAGE - case SSL_R_MISSING_VERIFY_MESSAGE: -+#endif - xs->errcode = LCB_SSL_CANTVERIFY; - break; - diff --git a/libcouchbase-pr27.patch b/libcouchbase-pr27.patch new file mode 100644 index 0000000..1f13164 --- /dev/null +++ b/libcouchbase-pr27.patch @@ -0,0 +1,50 @@ +From aa972430720163a8d81babdfae08b5bab5d139c3 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Wed, 12 Jul 2017 12:15:36 +0200 +Subject: [PATCH] CCBC-803: make new functions public + +--- + include/libcouchbase/couchbase.h | 2 ++ + src/handler.cc | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/include/libcouchbase/couchbase.h b/include/libcouchbase/couchbase.h +index a42f9a04..35f87607 100644 +--- a/include/libcouchbase/couchbase.h ++++ b/include/libcouchbase/couchbase.h +@@ -3703,6 +3703,7 @@ void lcb_histogram_print(lcb_HISTOGRAM* hg, FILE* stream); + * + * @return the pointer to string or NULL if context wasn't specified. + */ ++LIBCOUCHBASE_API + const char * + lcb_resp_get_error_context(int cbtype, const lcb_RESPBASE *rb); + +@@ -3716,6 +3717,7 @@ lcb_resp_get_error_context(int cbtype, const lcb_RESPBASE *rb); + * + * @return the pointer to string or NULL if ref wasn't specified. + */ ++LIBCOUCHBASE_API + const char * + lcb_resp_get_error_ref(int cbtype, const lcb_RESPBASE *rb); + +diff --git a/src/handler.cc b/src/handler.cc +index b909dea0..68ee2d16 100644 +--- a/src/handler.cc ++++ b/src/handler.cc +@@ -1018,6 +1018,7 @@ lcb_resp_get_mutation_token(int cbtype, const lcb_RESPBASE *rb) + X(UNLOCK) \ + + ++LIBCOUCHBASE_API + const char * + lcb_resp_get_error_context(int cbtype, const lcb_RESPBASE *rb) + { +@@ -1031,6 +1032,7 @@ lcb_resp_get_error_context(int cbtype, const lcb_RESPBASE *rb) + return NULL; + } + ++LIBCOUCHBASE_API + const char * + lcb_resp_get_error_ref(int cbtype, const lcb_RESPBASE *rb) + { diff --git a/libcouchbase.spec b/libcouchbase.spec index fa23abb..cd1a000 100644 --- a/libcouchbase.spec +++ b/libcouchbase.spec @@ -14,13 +14,15 @@ Name: libcouchbase Version: 2.7.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Couchbase client library Group: System Environment/Libraries License: ASL 2.0 URL: http://www.couchbase.com/communities/c/getting-started Source0: http://packages.couchbase.com/clients/c/%{name}-%{version}.tar.gz +Patch0: libcouchbase-pr27.patch + BuildRequires: libtool BuildRequires: openssl-devel BuildRequires: cyrus-sasl-devel @@ -65,6 +67,7 @@ a Couchbase Server. %prep %setup -q +%patch0 -p1 -b .pr27 %build @@ -114,10 +117,13 @@ make check %changelog +* Wed Jul 12 2017 Remi Collet - 2.7.6-2 +- fix new symbols visibility, using patch from + https://github.com/couchbase/libcouchbase/pull/27 + for https://issues.couchbase.com/browse/CCBC-803 + * Wed Jul 12 2017 Remi Collet - 2.7.6-1 - update to 2.7.6 -- open https://issues.couchbase.com/browse/CCBC-803 - for non visible symbols (new functions) * Mon May 22 2017 Remi Collet - 2.7.5-1 - update to 2.7.5 -- cgit