From 478cf868114ca2a3f799946f1b5c6f2eafb04b32 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 16 Dec 2020 12:13:48 +0100 Subject: update to 3.0.7 drop patch merged upstream --- compat_reports/3.0.6_to_3.0.7/compat_report.html | 1170 ++++++++++++++++++++ ...GINS_DIR-option-to-set-directory-for-IO-p.patch | 82 -- libcouchbase.spec | 17 +- libcouchbase.xml | 2 +- 4 files changed, 1183 insertions(+), 88 deletions(-) create mode 100644 compat_reports/3.0.6_to_3.0.7/compat_report.html delete mode 100644 libcouchbase-0002-add-LCB_PLUGINS_DIR-option-to-set-directory-for-IO-p.patch diff --git a/compat_reports/3.0.6_to_3.0.7/compat_report.html b/compat_reports/3.0.6_to_3.0.7/compat_report.html new file mode 100644 index 0000000..172f94b --- /dev/null +++ b/compat_reports/3.0.6_to_3.0.7/compat_report.html @@ -0,0 +1,1170 @@ + + + + + + + + + +libcouchbase: 3.0.6 to 3.0.7 compatibility report + + + +

API compatibility report for the libcouchbase library between 3.0.6 and 3.0.7 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibcouchbase
Version #13.0.6
Version #23.0.7
Archx86_64
GCC Version10
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files25
Total Libraries1
Total Symbols / Types610 / 360
Compatibility96.1%
+

Problem Summary

+ + + + + + + + + + + +
SeverityCount
Added Symbols-0
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium7
Low5
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low1
Other Changes
in Data Types		-2
Other Changes
in Constants		-1
+ + +

Problems with Data Types, Medium Severity  7 

+vbucket.h
+ +[+] struct lcbvb_SERVER  5  +
+ + + +[+] struct lcbvb_SERVICES  2  +
+ + +
+to the top
+ +

Problems with Data Types, Low Severity  5 

+couchbase.h
+ +[+] enum lcb_HTTP_TYPE  1  +
+ + +
+vbucket.h
+ +[+] enum lcbvb_SVCTYPE  1  +
+ + + +[+] struct lcbvb_SERVER  1  +
+ + + +[+] struct lcbvb_SERVICES  2  +
+ + +
+to the top
+ +

Problems with Constants, Low Severity  1 

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

Other Changes in Data Types  2 

+couchbase.h
+ +[+] enum lcb_HTTP_TYPE  1  +
+ + +
+vbucket.h
+ +[+] enum lcbvb_SVCTYPE  1  +
+ + +
+to the top
+ +

Other Changes in Constants  1 

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

Header Files  25 

+
+assert.h
+auth.h
+cntl-private.h
+cntl.h
+configuration.h
+couchbase.h
+crypto.h
+iops.h
+ixmgmt.h
+kvbuf.h
+libev_io_opts.h
+libevent_io_opts.h
+libuv_compat.h
+libuv_io_opts.h
+logger.h
+metrics.h
+pktfwd.h
+plugin-internal.h
+select_io_opts.h
+sysdefs.h
+tracing.h
+utils.h
+vbucket.h
+visibility.h
+wsaerr.h
+
+
to the top
+

Libraries  1 

+
+libcouchbase.so.6.0.7
+
+
to the top
+


+

Test Info

+ + + + + + +
Library Namelibcouchbase
Version #13.0.6
Version #23.0.7
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files25
Total Libraries1
Total Symbols / Types615 / 366
Compatibility100%
+

Problem Summary

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

Problems with Data Types, Low Severity  4 

+vbucket.h
+ +[+] struct lcbvb_SERVER  1  +
+ + + +[+] struct lcbvb_SERVICES  3  +
+ + +
+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 Data Types  4 

+couchbase.h
+ +[+] enum lcb_HTTP_TYPE  2  +
+ + +
+vbucket.h
+ +[+] enum lcbvb_SVCTYPE  2  +
+ + +
+to the top
+ +

Other Changes in Constants  1 

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

Header Files  25 

+
+assert.h
+auth.h
+cntl-private.h
+cntl.h
+configuration.h
+couchbase.h
+crypto.h
+iops.h
+ixmgmt.h
+kvbuf.h
+libev_io_opts.h
+libevent_io_opts.h
+libuv_compat.h
+libuv_io_opts.h
+logger.h
+metrics.h
+pktfwd.h
+plugin-internal.h
+select_io_opts.h
+sysdefs.h
+tracing.h
+utils.h
+vbucket.h
+visibility.h
+wsaerr.h
+
+
to the top
+

Libraries  1 

+
+libcouchbase.so.6.0.7
+
+
to the top
+


+
Generated by ABI Compliance Checker 2.3   +
+
+ + diff --git a/libcouchbase-0002-add-LCB_PLUGINS_DIR-option-to-set-directory-for-IO-p.patch b/libcouchbase-0002-add-LCB_PLUGINS_DIR-option-to-set-directory-for-IO-p.patch deleted file mode 100644 index 9034b0c..0000000 --- a/libcouchbase-0002-add-LCB_PLUGINS_DIR-option-to-set-directory-for-IO-p.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 99729147fa930b8ffed4153dcae2bca62bebcdb0 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Thu, 12 Nov 2020 11:26:35 +0100 -Subject: [PATCH] add LCB_PLUGINS_DIR option to set directory for IO plugins - ---- - CMakeLists.txt | 1 + - cmake/config-cmake.h.in | 4 ++-- - plugins/io/libev/CMakeLists.txt | 2 +- - plugins/io/libevent/CMakeLists.txt | 2 +- - plugins/io/libuv/CMakeLists.txt | 2 +- - 5 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5789bac7..90061ee9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,6 +41,7 @@ endif() - OPTION(LCB_NO_TESTS "Disable building of tests" OFF) - OPTION(LCB_NO_TOOLS "Disable building of additional tools" OFF) - OPTION(LCB_NO_PLUGINS "Disable the building of IO plugins for external libs" OFF) -+SET(LCB_PLUGINS_DIR "libcouchbase" CACHE STRING "Directory for IO plugins") - OPTION(LCB_BUILD_LIBEVENT "Build the libevent plugin" ON) - OPTION(LCB_BUILD_LIBEV "Build the libev plugin (if available)" ON) - OPTION(LCB_BUILD_LIBUV "Build the libuv plugin (if available)" ON) -diff --git a/cmake/config-cmake.h.in b/cmake/config-cmake.h.in -index 30f66da8..1fc26d2a 100644 ---- a/cmake/config-cmake.h.in -+++ b/cmake/config-cmake.h.in -@@ -61,7 +61,7 @@ - #include "config_static.h" - #endif - --#define LCB_LIBDIR "${CMAKE_INSTALL_LIBDIR}/libcouchbase" -+#define LCB_LIBDIR "${CMAKE_INSTALL_LIBDIR}/${LCB_PLUGINS_DIR}" - - #define LCB_SYSTEM "${CMAKE_SYSTEM}" - #define LCB_SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}" -@@ -76,4 +76,4 @@ - #cmakedefine HAVE_PKCS5_PBKDF2_HMAC - #cmakedefine LCB_DUMP_PACKETS - --#cmakedefine LCB_TLS_LOG_KEYS -\ No newline at end of file -+#cmakedefine LCB_TLS_LOG_KEYS -diff --git a/plugins/io/libev/CMakeLists.txt b/plugins/io/libev/CMakeLists.txt -index c2441d36..cf144f0e 100644 ---- a/plugins/io/libev/CMakeLists.txt -+++ b/plugins/io/libev/CMakeLists.txt -@@ -28,4 +28,4 @@ ENDIF() - - INSTALL(TARGETS - couchbase_libev -- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/libcouchbase") -+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/${LCB_PLUGINS_DIR}") -diff --git a/plugins/io/libevent/CMakeLists.txt b/plugins/io/libevent/CMakeLists.txt -index 485d6342..339e5a95 100644 ---- a/plugins/io/libevent/CMakeLists.txt -+++ b/plugins/io/libevent/CMakeLists.txt -@@ -24,7 +24,7 @@ IF(LCB_EMBED_PLUGIN_LIBEVENT) - SET(LCB_LINK_SPEC "${LCB_LINKS_SPEC} ${LIBEVENT_LIBRARIES}") - ELSE() - ADD_LIBRARY(couchbase_libevent SHARED plugin-libevent.c) -- INSTALL(TARGETS couchbase_libevent LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/libcouchbase") -+ INSTALL(TARGETS couchbase_libevent LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/${LCB_PLUGINS_DIR}") - TARGET_LINK_LIBRARIES(couchbase_libevent ${LIBEVENT_LIBRARIES}) - ENDIF() - -diff --git a/plugins/io/libuv/CMakeLists.txt b/plugins/io/libuv/CMakeLists.txt -index 46c63dd8..9954c0f5 100644 ---- a/plugins/io/libuv/CMakeLists.txt -+++ b/plugins/io/libuv/CMakeLists.txt -@@ -40,5 +40,5 @@ INCLUDE_DIRECTORIES(AFTER ${LIBUV_INCLUDE_DIR}) - ADD_DEFINITIONS(-DLIBCOUCHBASE_INTERNAL=1) - INSTALL(TARGETS - couchbase_libuv -- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/libcouchbase" -+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/${LCB_PLUGINS_DIR}" - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) --- -2.25.4 - diff --git a/libcouchbase.spec b/libcouchbase.spec index b58c1c3..dd23beb 100644 --- a/libcouchbase.spec +++ b/libcouchbase.spec @@ -31,8 +31,8 @@ Name: %{libname}%{soname} %else Name: %{libname} %endif -Version: 3.0.6 -Release: 2%{?dist} +Version: 3.0.7 +Release: 1%{?dist} Summary: Couchbase client library Group: System Environment/Libraries License: ASL 2.0 @@ -40,18 +40,18 @@ URL: http://www.couchbase.com/communities/c/getting-started Source0: http://packages.couchbase.com/clients/c/%{libname}-%{version}.tar.gz Patch0: %{libname}-0001-enforce-system-crypto-policies.patch -Patch1: %{libname}-0002-add-LCB_PLUGINS_DIR-option-to-set-directory-for-IO-p.patch %if 0%{?rhel} == 7 %global dtsenable source /opt/rh/devtoolset-8/enable BuildRequires: devtoolset-8-toolchain +BuildRequires: cmake3 >= 3.5.1 %else BuildRequires: gcc BuildRequires: gcc-c++ +BuildRequires: cmake >= 3.5.1 %endif BuildRequires: libtool BuildRequires: openssl-devel -BuildRequires: cmake >= 2.8.9 BuildRequires: pkgconfig(libevent) >= 2.0.20 BuildRequires: libev-devel >= 3 %if %{with uv} @@ -166,14 +166,17 @@ a Couchbase Server. %prep %setup -q -n %{libname}-%{version} %patch0 -p1 -b .crypto -%patch1 -p1 -b .plugdir %build %{?dtsenable} gcc --version +%if 0%{?rhel} == 7 +%cmake3 \ +%else %cmake \ +%endif -DLCB_BUILD_LIBEVENT=ON \ -DLCB_BUILD_LIBEV=ON \ %if %{with uv} @@ -250,6 +253,10 @@ make %{_smp_mflags} alltests test ARGS=%{_smp_mflags} %changelog +* Wed Dec 16 2020 Remi Collet - 3.0.7-1 +- update to 3.0.7 +- drop patch merged upstream + * Mon Nov 16 2020 Remi Collet - 3.0.6-2 - cleanup and only rename for fedora < 34 diff --git a/libcouchbase.xml b/libcouchbase.xml index c597296..79ae868 100644 --- a/libcouchbase.xml +++ b/libcouchbase.xml @@ -9,7 +9,7 @@ -2.10.8 +3.0.7 -- cgit