diff options
| -rw-r--r-- | 0001-enforce-system-crypto-policies.patch | 12 | ||||
| -rw-r--r-- | 0004-detect-snappy-version-for-cbc-version.patch | 85 | ||||
| -rw-r--r-- | libcouchbase.spec | 36 | ||||
| -rw-r--r-- | libcouchbase.xml | 2 |
4 files changed, 22 insertions, 113 deletions
diff --git a/0001-enforce-system-crypto-policies.patch b/0001-enforce-system-crypto-policies.patch index 32a5833..59e1b0c 100644 --- a/0001-enforce-system-crypto-policies.patch +++ b/0001-enforce-system-crypto-policies.patch @@ -1,6 +1,6 @@ -From bc5b9aecd78fe638f50dbe104fc83a67d87c0615 Mon Sep 17 00:00:00 2001 +From e753490615e75d93bd485ca09633e388dd483958 Mon Sep 17 00:00:00 2001 From: Sergey Avseyev <sergey.avseyev@gmail.com> -Date: Tue, 26 Sep 2017 19:26:02 +0300 +Date: Fri, 23 Feb 2018 19:02:53 +0300 Subject: [PATCH] Enforce system crypto policies --- @@ -8,10 +8,10 @@ Subject: [PATCH] Enforce system crypto policies 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ssl/ssl_common.c b/src/ssl/ssl_common.c -index b752b5d2..8a615cfd 100644 +index 6ba8579d..ce7c1e0b 100644 --- a/src/ssl/ssl_common.c +++ b/src/ssl/ssl_common.c -@@ -277,8 +277,7 @@ lcbio_ssl_new(const char *cafile, int noverify, lcb_error_t *errp, +@@ -278,8 +278,7 @@ lcbio_pSSLCTX lcbio_ssl_new(const char *tsfile, const char *cafile, const char * goto GT_ERR; } @@ -20,7 +20,7 @@ index b752b5d2..8a615cfd 100644 + SSL_CTX_set_cipher_list(ret->ctx, "PROFILE=SYSTEM"); if (cafile) { - if (!SSL_CTX_load_verify_locations(ret->ctx, cafile, NULL)) { + lcb_log(LOGARGS_S(settings, LCB_LOG_DEBUG), "Load verify locations from \"%s\"", tsfile ? tsfile : keyfile); -- -2.13.5 +2.14.3 diff --git a/0004-detect-snappy-version-for-cbc-version.patch b/0004-detect-snappy-version-for-cbc-version.patch deleted file mode 100644 index 3438409..0000000 --- a/0004-detect-snappy-version-for-cbc-version.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 2f5e7ac51e13dd25b1ea4f40bcead3c90c03daa5 Mon Sep 17 00:00:00 2001 -From: Sergey Avseyev <sergey.avseyev@gmail.com> -Date: Wed, 20 Dec 2017 12:49:34 +0300 -Subject: [PATCH] Carefully detect snappy version for cbc-version - -Some snappy builds might not include version information into -snappy-stubs-public.h, display version from pkg-config in this -case - -Change-Id: I6c07d7ba98c98af8d7ac0264a6b775edc65355c4 ---- - cmake/Modules/FindCouchbaseSnappy.cmake | 15 +++++++++++---- - cmake/config-cmake.h.in | 1 + - tools/cbc.cc | 16 ++++++++++++---- - 3 files changed, 24 insertions(+), 8 deletions(-) - -diff --git a/cmake/Modules/FindCouchbaseSnappy.cmake b/cmake/Modules/FindCouchbaseSnappy.cmake -index d8cb3601..98c4a2cb 100644 ---- a/cmake/Modules/FindCouchbaseSnappy.cmake -+++ b/cmake/Modules/FindCouchbaseSnappy.cmake -@@ -1,11 +1,18 @@ --FIND_PATH(SNAPPY_INCLUDES snappy-c.h -+INCLUDE(FindPkgConfig) -+PKG_CHECK_MODULES(SNAPPY snappy) -+IF(SNAPPY_FOUND) -+ SET(SNAPPY_INCLUDES ${SNAPPY_INCLUDE_DIRS}) -+ SET(LCB_SNAPPY_PKG_VERSION ${SNAPPY_VERSION}) -+ELSE() -+ FIND_PATH(SNAPPY_INCLUDES snappy-c.h - HINTS ENV SNAPPY_DIR ${SNAPPY_DIR} - PATH_SUFFIXES include) --FIND_LIBRARY(SNAPPY_LIBRARIES NAMES snappy -+ FIND_LIBRARY(SNAPPY_LIBRARIES NAMES snappy - HINTS ENV SNAPPY_DIR ${SNAPPY_DIR} - PATH_SUFFIXES lib) --IF(SNAPPY_LIBRARIES AND SNAPPY_INCLUDES) -+ IF(SNAPPY_LIBRARIES AND SNAPPY_INCLUDES) - SET(SNAPPY_FOUND TRUE) --ELSE() -+ ELSE() - SET(SNAPPY_FOUND FALSE) -+ ENDIF() - ENDIF() -diff --git a/cmake/config-cmake.h.in b/cmake/config-cmake.h.in -index 70db880f..1c3728ad 100644 ---- a/cmake/config-cmake.h.in -+++ b/cmake/config-cmake.h.in -@@ -72,3 +72,4 @@ - - #define LCB_CLIENT_ID "libcouchbase/" LCB_VERSION_STRING " (" LCB_SYSTEM "; " LCB_SYSTEM_PROCESSOR "; " LCB_C_COMPILER ")" - #cmakedefine LCB_STATIC_SNAPPY -+#cmakedefine LCB_SNAPPY_PKG_VERSION "${LCB_SNAPPY_PKG_VERSION}" -diff --git a/tools/cbc.cc b/tools/cbc.cc -index bb7e11bc..a2f61402 100644 ---- a/tools/cbc.cc -+++ b/tools/cbc.cc -@@ -853,13 +853,21 @@ VersionHandler::run() - #ifdef LCB_NO_SNAPPY - printf(" Snappy: SUPPORTED\n"); - #else -- printf(" Snappy: %d.%d.%d (" - #ifdef LCB_STATIC_SNAPPY -- "static" -+#define LCB_SNAPPY_LINK "static" - #else -- "dynamic" -+#define LCB_SNAPPY_LINK "dynamic" -+#endif -+#define EXPAND(VAR) VAR ## 1 -+#define IS_EMPTY(VAR) EXPAND(VAR) -+ -+#if defined(SNAPPY_MAJOR) && (IS_EMPTY(SNAPPY_MAJOR) != 1) -+ printf(" Snappy: %d.%d.%d (%s)\n", SNAPPY_MAJOR, SNAPPY_MINOR, SNAPPY_PATCHLEVEL, LCB_SNAPPY_LINK); -+#elif defined(LCB_SNAPPY_PKG_VERSION) -+ printf(" Snappy: %s (%s)\n", LCB_SNAPPY_PKG_VERSION, LCB_SNAPPY_LINK); -+#else -+ printf(" Snappy: unknown (%s)\n", LCB_SNAPPY_LINK); - #endif -- ")\n", SNAPPY_MAJOR, SNAPPY_MINOR, SNAPPY_PATCHLEVEL); - #endif - } else { - printf(" Snappy: NOT SUPPORTED\n"); --- -2.14.3 - diff --git a/libcouchbase.spec b/libcouchbase.spec index ad78589..c952cfd 100644 --- a/libcouchbase.spec +++ b/libcouchbase.spec @@ -14,8 +14,7 @@ %global with_tests 0%{?_with_tests:1} %endif -# Dtrace breaks parallel build - not enabled in Fedora package -%global with_dtrace 0 +%global with_dtrace 1 %if 0%{?fedora} >= 22 || 0%{?rhel} >= 7 %global with_uv 1 @@ -23,12 +22,8 @@ %global with_uv 0 %endif -# Notices: -# snappy supported but not enabled by default (upstream) -# hdrhistrogram suppoort seems broken, so not enabled - Name: libcouchbase -Version: 2.8.4 +Version: 2.8.5 Release: 1%{?dist} Summary: Couchbase client library Group: System Environment/Libraries @@ -39,12 +34,9 @@ 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 -# snappy-devel 1.1.7 in Rawhide (28) does not provide version info -# in snappy-stubs-public.h, so we pull it from pkg-config -# https://bugzilla.redhat.com/show_bug.cgi?id=1527850 -# https://github.com/couchbase/libcouchbase/commit/371502c8e516b466cef5e98567e71572b7093d96 -Patch3: 0004-detect-snappy-version-for-cbc-version.patch +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: openssl-devel BuildRequires: cmake >= 2.8.9 @@ -55,11 +47,7 @@ BuildRequires: pkgconfig(libuv) >= 1 %endif %if %{with_dtrace} BuildRequires: systemtap-sdt-devel >= 1.8 -%endif -%if 0%{?fedora} >= 26 -BuildRequires: pkgconfig(snappy) >= 1.1 -%else -BuildRequires: snappy-devel >= 1.1 +BuildRequires: systemtap-devel %endif %if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 @@ -141,7 +129,6 @@ a Couchbase Server. %patch0 -p1 -b .crypto %patch1 -p1 -b .plug %patch2 -p1 -b .pkgc -%patch3 -p1 -b .snap %build @@ -158,8 +145,7 @@ a Couchbase Server. %else -DLCB_BUILD_DTRACE=OFF \ %endif - -DLCB_NO_MOCK=1 \ - -DLCB_NO_SNAPPY=0 + -DLCB_NO_MOCK=1 make %{?_smp_mflags} V=1 @@ -177,8 +163,10 @@ make %{_smp_mflags} alltests test ARGS=%{_smp_mflags} %endif -%post -p /sbin/ldconfig +%if 0%{?fedora} < 28 && 0%{?rhel} < 8 +%post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%endif %files @@ -186,6 +174,9 @@ make %{_smp_mflags} alltests test ARGS=%{_smp_mflags} %doc README.markdown RELEASE_NOTES.markdown %license LICENSE %{_libdir}/%{name}.so.2* +%if %{with_dtrace} +%{_datadir}/systemtap/tapset/libcouchbase.so* +%endif %files libevent %{_libdir}/%{name}/%{name}_libevent.so @@ -210,6 +201,9 @@ make %{_smp_mflags} alltests test ARGS=%{_smp_mflags} %changelog +* Fri Feb 23 2018 Sergey Avseyev <sergey.avseyev@gmail.com> - 2.8.5-1 +- Update to 2.8.5 + * Wed Dec 20 2017 Remi Collet <remi@remirepo.net> - 2.8.4-1 - Update to 2.8.4 - filter private plugins (not shared libraries) diff --git a/libcouchbase.xml b/libcouchbase.xml index dd845db..3ba8f40 100644 --- a/libcouchbase.xml +++ b/libcouchbase.xml @@ -9,7 +9,7 @@ <version> <!-- Version of the library --> -2.8.4 +2.8.5 </version> <headers> |