From c6b3066007cc8447d3a09c904297b5c8e265876c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Nov 2019 12:13:29 +0100 Subject: v2.10.5 (from Fedora) --- compat_reports/2.10.4_to_2.10.5/compat_report.html | 706 +++++++++++++++++++++ ...hbase-0001-enforce-system-crypto-policies.patch | 32 +- libcouchbase-0004-fix-test-so-resolution.patch | 26 - ...005-fixes-ssl-sockets-with-openssl-1.1.1c.patch | 37 -- libcouchbase.spec | 11 +- libcouchbase.xml | 2 +- 6 files changed, 729 insertions(+), 85 deletions(-) create mode 100644 compat_reports/2.10.4_to_2.10.5/compat_report.html delete mode 100644 libcouchbase-0004-fix-test-so-resolution.patch delete mode 100644 libcouchbase-0005-fixes-ssl-sockets-with-openssl-1.1.1c.patch diff --git a/compat_reports/2.10.4_to_2.10.5/compat_report.html b/compat_reports/2.10.4_to_2.10.5/compat_report.html new file mode 100644 index 0000000..b972dfd --- /dev/null +++ b/compat_reports/2.10.4_to_2.10.5/compat_report.html @@ -0,0 +1,706 @@ + + + + + + + + + +libcouchbase: 2.10.4 to 2.10.5 compatibility report + + + +

API compatibility report for the libcouchbase library between 2.10.4 and 2.10.5 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibcouchbase
Version #12.10.4
Version #22.10.5
Archx86_64
GCC Version8
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files33
Total Libraries1
Total Symbols / Types286 / 465
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
Other Changes
in Data Types		-2
+ + +

Other Changes in Data Types  2 

+error.h
+ +[+] enum lcb_error_t  2  +
+ + +
+to the top
+

Header Files  33 

+
+_cxxwrap.h
+analytics.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.66
+
+
to the top
+


+

Test Info

+ + + + + + +
Library Namelibcouchbase
Version #12.10.4
Version #22.10.5
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files33
Total Libraries1
Total Symbols / Types554 / 472
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		Low3
Other Changes
in Data Types		-2
+ + +

Problems with Constants, Low Severity  3 

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

Other Changes in Data Types  2 

+error.h
+ +[+] enum lcb_error_t  2  +
+ + +
+to the top
+

Header Files  33 

+
+_cxxwrap.h
+analytics.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.66
+
+
to the top
+


+
Generated by ABI Compliance Checker 2.3   +
+
+ + diff --git a/libcouchbase-0001-enforce-system-crypto-policies.patch b/libcouchbase-0001-enforce-system-crypto-policies.patch index 4c42bc1..1cb4bd1 100644 --- a/libcouchbase-0001-enforce-system-crypto-policies.patch +++ b/libcouchbase-0001-enforce-system-crypto-policies.patch @@ -1,26 +1,30 @@ -From f670b34632e994661e252f5f163023f71b2741fb Mon Sep 17 00:00:00 2001 +From f056a86227675d6f653036de56e79b4b7f37db32 Mon Sep 17 00:00:00 2001 From: Sergey Avseyev -Date: Fri, 23 Feb 2018 19:02:53 +0300 +Date: Fri, 1 Nov 2019 17:33:22 +0300 Subject: [PATCH] Enforce system crypto policies +Change-Id: I89ac30526455ce7e51a584daa354001b3f3dd7a9 --- - src/ssl/ssl_common.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + src/ssl/ssl_common.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/ssl/ssl_common.c b/src/ssl/ssl_common.c -index 914b6f31..4b11ad04 100644 +index c223114f..95170d33 100644 --- a/src/ssl/ssl_common.c +++ b/src/ssl/ssl_common.c -@@ -278,8 +278,7 @@ lcbio_pSSLCTX lcbio_ssl_new(const char *tsfile, const char *cafile, const char * - goto GT_ERR; +@@ -287,11 +287,7 @@ lcbio_pSSLCTX lcbio_ssl_new(const char *tsfile, const char *cafile, const char * + lcb_error_t err_s; + lcbio_pSSLCTX ret; - } -- SSL_CTX_set_cipher_list(ret->ctx, "DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:AES256-SHA:EDH-RSA-DES-CBC3-SHA:EDH-DSS-DES-CBC3-SHA:DES-CBC3-SHA:DES-CBC3-MD5:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA:AES128-SHA:DHE-RSA-SEED-SHA:DHE-DSS-SEED-SHA:SEED-SHA:RC2-CBC-MD5:RC4-SHA:RC4-MD5:RC4-MD5:EDH-RSA-DES-CBC-SHA:EDH-DSS-DES-CBC-SHA:DES-CBC-SHA:DES-CBC-MD5:EXP-EDH-RSA-DES-CBC-SHA:EXP-EDH-DSS-DES-CBC-SHA:EXP-DES-CBC-SHA:EXP-RC2-CBC-MD5:EXP-RC2-CBC-MD5:EXP-RC4-MD5:EXP-RC4-MD5"); --// SSL_CTX_set_cipher_list(ret->ctx, "!NULL"); -+ SSL_CTX_set_cipher_list(ret->ctx, "PROFILE=SYSTEM"); +- static const char *default_ssl_cipher_list = +- "DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:AES256-SHA:EDH-RSA-DES-CBC3-SHA:EDH-DSS-DES-CBC3-SHA:DES-CBC3-SHA:DES-" +- "CBC3-MD5:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA:AES128-SHA:DHE-RSA-SEED-SHA:DHE-DSS-SEED-SHA:SEED-SHA:RC2-CBC-" +- "MD5:RC4-SHA:RC4-MD5:RC4-MD5:EDH-RSA-DES-CBC-SHA:EDH-DSS-DES-CBC-SHA:DES-CBC-SHA:DES-CBC-MD5:EXP-EDH-RSA-DES-" +- "CBC-SHA:EXP-EDH-DSS-DES-CBC-SHA:EXP-DES-CBC-SHA:EXP-RC2-CBC-MD5:EXP-RC2-CBC-MD5:EXP-RC4-MD5:EXP-RC4-MD5"; ++ static const char *default_ssl_cipher_list = "PROFILE=SYSTEM"; - if (cafile || tsfile) { - lcb_log(LOGARGS_S(settings, LCB_LOG_DEBUG), "Load verify locations from \"%s\"", tsfile ? tsfile : cafile); + const char* cipher_list = getenv("LCB_SSL_CIPHER_LIST"); + #if HAVE_CIPERSUITES -- -2.19.2 +2.21.0 diff --git a/libcouchbase-0004-fix-test-so-resolution.patch b/libcouchbase-0004-fix-test-so-resolution.patch deleted file mode 100644 index 9984dd9..0000000 --- a/libcouchbase-0004-fix-test-so-resolution.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0c00d0a84762b0e5f5fe4b53d5b8fa6e839334de Mon Sep 17 00:00:00 2001 -From: Sergey Avseyev -Date: Thu, 20 Jun 2019 10:22:03 +0300 -Subject: [PATCH 2/2] Fix test SO resolution - -Change-Id: I00d817381061a4ec06fcc86925eec2d1daf8c7d8 ---- - cmake/Modules/GenerateConfigDotH.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/Modules/GenerateConfigDotH.cmake b/cmake/Modules/GenerateConfigDotH.cmake -index a919be33..aee77cb1 100644 ---- a/cmake/Modules/GenerateConfigDotH.cmake -+++ b/cmake/Modules/GenerateConfigDotH.cmake -@@ -38,7 +38,7 @@ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "Linux") - OUTPUT_VARIABLE LIBM_SO_TRACE - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE) -- STRING(REGEX MATCH [-_a-z0-9/]+libm.so[.0-9]* LIBM_SO_PATH ${LIBM_SO_TRACE}) -+ STRING(REGEX MATCH [-_a-z0-9/]+libm.so[.0-9]+ LIBM_SO_PATH ${LIBM_SO_TRACE}) - IF (EXISTS "${LIBM_SO_PATH}") - GET_FILENAME_COMPONENT(CMAKE_TEST_SHARED_OBJECT ${LIBM_SO_PATH} NAME) - ENDIF() --- -2.22.0 - diff --git a/libcouchbase-0005-fixes-ssl-sockets-with-openssl-1.1.1c.patch b/libcouchbase-0005-fixes-ssl-sockets-with-openssl-1.1.1c.patch deleted file mode 100644 index a5f2970..0000000 --- a/libcouchbase-0005-fixes-ssl-sockets-with-openssl-1.1.1c.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 21267293d5b2c445beab4c792a94eb39434db592 Mon Sep 17 00:00:00 2001 -From: Sergey Avseyev -Date: Tue, 30 Apr 2019 16:36:19 +0300 -Subject: [PATCH 1/2] Fixes SSL sockets with openssl 1.1.1c+ - -BIO_get_mem_ptr does not give direct access to internal buffer, so we -have to invalidate our copy before using buffer values. - -Change-Id: I0dba625dd0be702ec7eea640047facf3caf79fef ---- - src/ssl/ssl_e.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/ssl/ssl_e.c b/src/ssl/ssl_e.c -index f4506cf6..734a3e64 100644 ---- a/src/ssl/ssl_e.c -+++ b/src/ssl/ssl_e.c -@@ -210,10 +210,16 @@ flush_ssl_data(lcbio_ESSL *es) - * calls. While we could have done this inline with the send() call this - * would make future optimization more difficult. */ - GT_WRITE_DONE: -+#if !LCB_CAN_OPTIMIZE_SSL_BIO -+ BIO_get_mem_ptr(es->wbio, &wmb); -+#endif - while (wmb->length > (size_t)tmp_len) { - char dummy[4096]; - unsigned to_read = MINIMUM(wmb->length-tmp_len, sizeof dummy); - BIO_read(es->wbio, dummy, to_read); -+#if !LCB_CAN_OPTIMIZE_SSL_BIO -+ BIO_get_mem_ptr(es->wbio, &wmb); -+#endif - } - BIO_clear_retry_flags(es->wbio); - return 0; --- -2.22.0 - diff --git a/libcouchbase.spec b/libcouchbase.spec index e89dde3..30acbea 100644 --- a/libcouchbase.spec +++ b/libcouchbase.spec @@ -23,7 +23,7 @@ %endif Name: libcouchbase -Version: 2.10.4 +Version: 2.10.5 Release: 1%{?dist} Summary: Couchbase client library Group: System Environment/Libraries @@ -34,10 +34,6 @@ Source0: http://packages.couchbase.com/clients/c/%{name}-%{version}.tar.gz Patch0: %{name}-0001-enforce-system-crypto-policies.patch Patch1: %{name}-0002-do-not-install-plugins-into-libdir.patch Patch2: %{name}-0003-fix-pkgconfig-paths.patch -# http://review.couchbase.org/110930 -Patch3: %{name}-0004-fix-test-so-resolution.patch -# http://review.couchbase.org/110929 -Patch4: %{name}-0005-fixes-ssl-sockets-with-openssl-1.1.1c.patch BuildRequires: gcc @@ -134,8 +130,6 @@ a Couchbase Server. %patch0 -p1 -b .crypto %patch1 -p1 -b .plug %patch2 -p1 -b .pkgc -%patch3 -p1 -b .testso -%patch4 -p1 -b .openssl %build @@ -210,6 +204,9 @@ make %{_smp_mflags} alltests test ARGS=%{_smp_mflags} %changelog +* Fri Nov 01 2019 Sergey Avseyev - 2.10.5-1 +- Update to 2.10.5 + * Thu Jun 20 2019 Sergey Avseyev - 2.10.4-1 - Update to 2.10.4 diff --git a/libcouchbase.xml b/libcouchbase.xml index 035f5a3..55a938a 100644 --- a/libcouchbase.xml +++ b/libcouchbase.xml @@ -9,7 +9,7 @@ -2.10.4 +2.10.5 -- cgit