couchbase 3.5.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc63ac2a7cdf86782ac8fa9fe594d7e1d872eaddf3d051541a7dfc664be80894
-  data.tar.gz: 6bc2fbbff5f2de52748359ea5ecd311297d6b94e9684177b22f58fc1e10e2bfa
+  metadata.gz: 4118378d213035f7edf973ca46772cfe91652d57e4fe34a1470541e662be4f86
+  data.tar.gz: bd17acbe3ce88b63e19d87df4193bae0906b8a23cc342a8af94e2163f6e8ec52
 SHA512:
-  metadata.gz: 6cf9e4de4da03e97bd9aa2c39dd7f9c0663f61141cba8a0dfff1bc09a7655483537364af9c6b013246503e7f6559baceb038c122539b9cc6a3163d6f7a60da71
-  data.tar.gz: fa835001ffe6faa3ab4536595f140c17cb5a7e1fb40fff2d4ea8b71936e9c61b2784510275f4c96fc08a98b43672ab7a1d279c62d10ac35a06fdc38ac5c5f073
+  metadata.gz: 20db31bfcff1cc8fa338b1d4c0cad0b38768f1eba07b057e2f2e603ab7c2a979ebcb797559aa71964f784203c47307d9dc535ee8885189b64e737a81a5e2971c
+  data.tar.gz: 53c1164610d59b1e1b423320e2d9c95a884d737e7323c26ff5272479c61aa39f47b8fe0403821b428047c6ae31e92d170ea3332d4bf388cadab9213a935c58be

data/README.md

@@ -23,7 +23,7 @@ The library has been tested with MRI 3.0, 3.1, 3.2 and 3.3. Supported platforms
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "couchbase", "3.5.1"
+gem "couchbase", "3.5.2"
 ```
 
 And then execute:

data/ext/0001-fix-build-for-mingw-w64-ucrt-x86_64-toolchain.patch

@@ -0,0 +1,40 @@
+From 6bdc93aac66f2282823dceee802b60e2447c4ba9 Mon Sep 17 00:00:00 2001
+From: Sergey Avseyev <sergey.avseyev@gmail.com>
+Date: Fri, 20 Oct 2023 20:48:33 -0700
+Subject: [PATCH] fix build for mingw-w64-ucrt-x86_64-toolchain
+
+---
+ src/crypto/CMakeLists.txt        | 4 ++++
+ src/crypto/curve25519/internal.h | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
+index 68fb65b30..f53a9eee9 100644
+--- a/src/crypto/CMakeLists.txt
++++ b/src/crypto/CMakeLists.txt
+@@ -335,6 +335,10 @@ if(WIN32)
+   target_link_libraries(crypto ws2_32)
+ endif()
+
++if(MINGW)
++  target_link_libraries(crypto --static-libgcc --static-libstdc++)
++endif()
++
+ if(NOT ANDROID)
+   find_package(Threads REQUIRED)
+   target_link_libraries(crypto Threads::Threads)
+diff --git a/src/crypto/curve25519/internal.h b/src/crypto/curve25519/internal.h
+index 0cd1a12aa..ab33badc0 100644
+--- a/src/crypto/curve25519/internal.h
++++ b/src/crypto/curve25519/internal.h
+@@ -32,7 +32,7 @@ void x25519_NEON(uint8_t out[32], const uint8_t scalar[32],
+ #endif
+
+ #if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_SMALL) && \
+-    defined(__GNUC__) && defined(__x86_64__)
++    defined(__GNUC__) && defined(__x86_64__) && !defined(__MINGW32__)
+ #define BORINGSSL_FE25519_ADX
+
+ // fiat_curve25519_adx_mul is defined in
+--
+2.42.0.windows.2

data/ext/CMakeLists.txt

@@ -40,8 +40,28 @@ message(STATUS "RUBY_LIBRUBYARG: ${RUBY_LIBRUBYARG}")
 message(STATUS "RUBY_INCLUDE_DIR: ${RUBY_INCLUDE_DIR}")
 message(STATUS "RUBY_LIBRARY_DIR: ${RUBY_LIBRARY_DIR}")
 
-add_library(couchbase SHARED couchbase.cxx)
-target_include_directories(couchbase PRIVATE ${PROJECT_BINARY_DIR}/generated ${RUBY_INCLUDE_DIR})
+add_library(
+  couchbase SHARED
+  couchbase.cxx
+  rcb_analytics.cxx
+  rcb_backend.cxx
+  rcb_buckets.cxx
+  rcb_collections.cxx
+  rcb_crud.cxx
+  rcb_diagnostics.cxx
+  rcb_exceptions.cxx
+  rcb_extras.cxx
+  rcb_logger.cxx
+  rcb_multi.cxx
+  rcb_query.cxx
+  rcb_range_scan.cxx
+  rcb_search.cxx
+  rcb_users.cxx
+  rcb_utils.cxx
+  rcb_version.cxx
+  rcb_views.cxx)
+target_include_directories(couchbase PRIVATE ${PROJECT_BINARY_DIR}/generated)
+target_include_directories(couchbase PRIVATE SYSTEM ${RUBY_INCLUDE_DIR})
 target_link_libraries(
   couchbase
   PRIVATE project_options

data/ext/cache/extconf_include.rb

@@ -3,6 +3,6 @@ cmake_flags << "-DCPM_USE_NAMED_CACHE_DIRECTORIES=ON"
 cmake_flags << "-DCPM_USE_LOCAL_PACKAGES=OFF"
 cmake_flags << "-DCPM_SOURCE_CACHE=#{File.expand_path('cache', __dir__)}"
 cmake_flags << "-DCOUCHBASE_CXX_CLIENT_EMBED_MOZILLA_CA_BUNDLE_ROOT=#{File.expand_path('cache', __dir__)}"
-cmake_flags << "-DEXT_GIT_REVISION=f5aae157e77a696bad6c9f7eaa449b4055f53aa6"
-cmake_flags << "-DCOUCHBASE_CXX_CLIENT_GIT_REVISION=1b506b0eb2d88725f943aa62527ff604610ba680"
-cmake_flags << "-DCOUCHBASE_CXX_CLIENT_GIT_DESCRIBE=1.0.0-dp.15-0-g1b506b0"
+cmake_flags << "-DEXT_GIT_REVISION=c31f43424e1935c0f7766ffdfcaea630b8b25eee"
+cmake_flags << "-DCOUCHBASE_CXX_CLIENT_GIT_REVISION=65c8d1ff65bdcb02ac83b3209b4f9e674ea593b4"
+cmake_flags << "-DCOUCHBASE_CXX_CLIENT_GIT_DESCRIBE=1.0.0-0-g65c8d1f"

data/ext/cache/mozilla-ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Mon Mar 11 15:25:27 2024 GMT
+## Certificate data from Mozilla as of: Tue Jul  2 03:12:04 2024 GMT
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -14,7 +14,7 @@
 ## Just configure this file as the SSLCACertificateFile.
 ##
 ## Conversion done with mk-ca-bundle.pl version 1.29.
-## SHA256: 4d96bd539f4719e9ace493757afbe4a23ee8579de1c97fbebc50bba3c12e8c1e
+## SHA256: 456ff095dde6dd73354c5c28c73d9c06f53b61a803963414cb91a1d92945cdd3
 ##
 
 
@@ -2600,36 +2600,6 @@ vLtoURMMA/cVi4RguYv/Uo7njLwcAjA8+RHUjE7AwWHCFUyqqx0LMV87HOIAl0Qx5v5zli/altP+
 CAezNIm8BZ/3Hobui3A=
 -----END CERTIFICATE-----
 
-GLOBALTRUST 2020
-================
------BEGIN CERTIFICATE-----
-MIIFgjCCA2qgAwIBAgILWku9WvtPilv6ZeUwDQYJKoZIhvcNAQELBQAwTTELMAkGA1UEBhMCQVQx
-IzAhBgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVT
-VCAyMDIwMB4XDTIwMDIxMDAwMDAwMFoXDTQwMDYxMDAwMDAwMFowTTELMAkGA1UEBhMCQVQxIzAh
-BgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVTVCAy
-MDIwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAri5WrRsc7/aVj6B3GyvTY4+ETUWi
-D59bRatZe1E0+eyLinjF3WuvvcTfk0Uev5E4C64OFudBc/jbu9G4UeDLgztzOG53ig9ZYybNpyrO
-VPu44sB8R85gfD+yc/LAGbaKkoc1DZAoouQVBGM+uq/ufF7MpotQsjj3QWPKzv9pj2gOlTblzLmM
-CcpL3TGQlsjMH/1WljTbjhzqLL6FLmPdqqmV0/0plRPwyJiT2S0WR5ARg6I6IqIoV6Lr/sCMKKCm
-fecqQjuCgGOlYx8ZzHyyZqjC0203b+J+BlHZRYQfEs4kUmSFC0iAToexIiIwquuuvuAC4EDosEKA
-A1GqtH6qRNdDYfOiaxaJSaSjpCuKAsR49GiKweR6NrFvG5Ybd0mN1MkGco/PU+PcF4UgStyYJ9OR
-JitHHmkHr96i5OTUawuzXnzUJIBHKWk7buis/UDr2O1xcSvy6Fgd60GXIsUf1DnQJ4+H4xj04KlG
-DfV0OoIu0G4skaMxXDtG6nsEEFZegB31pWXogvziB4xiRfUg3kZwhqG8k9MedKZssCz3AwyIDMvU
-clOGvGBG85hqwvG/Q/lwIHfKN0F5VVJjjVsSn8VoxIidrPIwq7ejMZdnrY8XD2zHc+0klGvIg5rQ
-mjdJBKuxFshsSUktq6HQjJLyQUp5ISXbY9e2nKd+Qmn7OmMCAwEAAaNjMGEwDwYDVR0TAQH/BAUw
-AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFNwuH9FhN3nkq9XVsxJxaD1qaJwiMB8GA1Ud
-IwQYMBaAFNwuH9FhN3nkq9XVsxJxaD1qaJwiMA0GCSqGSIb3DQEBCwUAA4ICAQCR8EICaEDuw2jA
-VC/f7GLDw56KoDEoqoOOpFaWEhCGVrqXctJUMHytGdUdaG/7FELYjQ7ztdGl4wJCXtzoRlgHNQIw
-4Lx0SsFDKv/bGtCwr2zD/cuz9X9tAy5ZVp0tLTWMstZDFyySCstd6IwPS3BD0IL/qMy/pJTAvoe9
-iuOTe8aPmxadJ2W8esVCgmxcB9CpwYhgROmYhRZf+I/KARDOJcP5YBugxZfD0yyIMaK9MOzQ0MAS
-8cE54+X1+NZK3TTN+2/BT+MAi1bikvcoskJ3ciNnxz8RFbLEAwW+uxF7Cr+obuf/WEPPm2eggAe2
-HcqtbepBEX4tdJP7wry+UUTF72glJ4DjyKDUEuzZpTcdN3y0kcra1LGWge9oXHYQSa9+pTeAsRxS
-vTOBTI/53WXZFM2KJVj04sWDpQmQ1GwUY7VA3+vA/MRYfg0UFodUJ25W5HCEuGwyEn6CMUO+1918
-oa2u1qsgEu8KwxCMSZY13At1XrFP1U80DhEgB3VDRemjEdqso5nCtnkn4rnvyOL2NSl6dPrFf4IF
-YqYK6miyeUcGbvJXqBUzxvd4Sj1Ce2t+/vdG6tHrju+IaFvowdlxfv1k7/9nR4hYJS8+hge9+6jl
-gqispdNpQ80xiEmEU5LAsTkbOYMBMMTyqfrQA71yN2BWHzZ8vTmR9W0Nv3vXkg==
------END CERTIFICATE-----
-
 ANF Secure Server Root CA
 =========================
 -----BEGIN CERTIFICATE-----
@@ -3579,3 +3549,20 @@ wPfc5+pbrrLMtTWGS9DiP7bY+A4A7l3j941Y/8+LN+ljX273CXE2whJdV/LItM3z7gLfEdxquVeE
 HVlNjM7IDiPCtyaaEBRx/pOyiriA8A4QntOoUAw3gi/q4Iqd4Sw5/7W0cwDk90imc6y/st53BIe0
 o82bNSQ3+pCTE4FCxpgmdTdmQRCsu/WU48IxK63nI1bMNSWSs1A=
 -----END CERTIFICATE-----
+
+FIRMAPROFESIONAL CA ROOT-A WEB
+==============================
+-----BEGIN CERTIFICATE-----
+MIICejCCAgCgAwIBAgIQMZch7a+JQn81QYehZ1ZMbTAKBggqhkjOPQQDAzBuMQswCQYDVQQGEwJF
+UzEcMBoGA1UECgwTRmlybWFwcm9mZXNpb25hbCBTQTEYMBYGA1UEYQwPVkFURVMtQTYyNjM0MDY4
+MScwJQYDVQQDDB5GSVJNQVBST0ZFU0lPTkFMIENBIFJPT1QtQSBXRUIwHhcNMjIwNDA2MDkwMTM2
+WhcNNDcwMzMxMDkwMTM2WjBuMQswCQYDVQQGEwJFUzEcMBoGA1UECgwTRmlybWFwcm9mZXNpb25h
+bCBTQTEYMBYGA1UEYQwPVkFURVMtQTYyNjM0MDY4MScwJQYDVQQDDB5GSVJNQVBST0ZFU0lPTkFM
+IENBIFJPT1QtQSBXRUIwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARHU+osEaR3xyrq89Zfe9MEkVz6
+iMYiuYMQYneEMy3pA4jU4DP37XcsSmDq5G+tbbT4TIqk5B/K6k84Si6CcyvHZpsKjECcfIr28jlg
+st7L7Ljkb+qbXbdTkBgyVcUgt5SjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUk+FD
+Y1w8ndYn81LsF7Kpryz3dvgwHQYDVR0OBBYEFJPhQ2NcPJ3WJ/NS7Beyqa8s93b4MA4GA1UdDwEB
+/wQEAwIBBjAKBggqhkjOPQQDAwNoADBlAjAdfKR7w4l1M+E7qUW/Runpod3JIha3RxEL2Jq68cgL
+cFBTApFwhVmpHqTm6iMxoAACMQD94vizrxa5HnPEluPBMBnYfubDl94cT7iJLzPrSA8Z94dGXSaQ
+pYXFuXqUPoeovQA=
+-----END CERTIFICATE-----

data/ext/cache/mozilla-ca-bundle.sha256

@@ -1 +1 @@
-1794c1d4f7055b7d02c2170337b61b48a2ef6c90d77e95444fd2596f4cac609f  cacert.pem
+1bf458412568e134a4514f5e170a328d11091e071c7110955c9884ed87972ac9  cacert.pem

data/ext/couchbase/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.19)
 message(STATUS "CMake version ${CMAKE_VERSION}")
 
-set(couchbase_cxx_client_BUILD_NUMBER 0)
+set(couchbase_cxx_client_BUILD_NUMBER 1)
 if(DEFINED ENV{BUILD_NUMBER})
   set(couchbase_cxx_client_BUILD_NUMBER $ENV{BUILD_NUMBER})
 endif()
@@ -16,9 +16,9 @@ endif()
 
 project(
   couchbase_cxx_client
-  VERSION "1.0.0.${couchbase_cxx_client_BUILD_NUMBER}"
+  VERSION "1.0.0"
   LANGUAGES CXX C)
-message(STATUS "Couchbase C++ client ${couchbase_cxx_client_VERSION}, master: ${COUCHBASE_CXX_CLIENT_MASTER_PROJECT}")
+message(STATUS "Couchbase C++ client ${couchbase_cxx_client_VERSION} build ${couchbase_cxx_client_BUILD_NUMBER}, master: ${COUCHBASE_CXX_CLIENT_MASTER_PROJECT}")
 message(STATUS "System: ${CMAKE_SYSTEM_NAME}, ${CMAKE_SYSTEM_VERSION}, ${CMAKE_SYSTEM_PROCESSOR}")
 if(WIN32)
   message(STATUS "Windows SDK: ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
@@ -128,6 +128,8 @@ set(couchbase_cxx_client_FILES
     core/impl/disjunction_query.cxx
     core/impl/dns_srv_tracker.cxx
     core/impl/doc_id_query.cxx
+    core/impl/error_context.cxx
+    core/impl/error.cxx
     core/impl/expiry.cxx
     core/impl/fail_fast_retry_strategy.cxx
     core/impl/field_level_encryption_error_category.cxx
@@ -136,19 +138,19 @@ set(couchbase_cxx_client_FILES
     core/impl/geo_polygon_query.cxx
     core/impl/get_replica.cxx
     core/impl/internal_date_range_facet_result.cxx
-    core/impl/internal_manager_error_context.cxx
     core/impl/internal_numeric_range_facet_result.cxx
     core/impl/internal_search_error_context.cxx
     core/impl/internal_search_meta_data.cxx
     core/impl/internal_search_result.cxx
     core/impl/internal_search_row.cxx
     core/impl/internal_search_row_locations.cxx
+    core/impl/internal_error_context.cxx
     core/impl/internal_term_facet_result.cxx
     core/impl/key_value_error_category.cxx
     core/impl/key_value_error_context.cxx
+    core/impl/logger.cxx
     core/impl/lookup_in_replica.cxx
     core/impl/management_error_category.cxx
-    core/impl/manager_error_context.cxx
     core/impl/match_all_query.cxx
     core/impl/match_none_query.cxx
     core/impl/match_phrase_query.cxx
@@ -168,12 +170,12 @@ set(couchbase_cxx_client_FILES
     core/impl/query_index_manager.cxx
     core/impl/query_string_query.cxx
     core/impl/regexp_query.cxx
+    core/impl/replica_utils.cxx
     core/impl/retry_action.cxx
     core/impl/retry_reason.cxx
     core/impl/scope.cxx
     core/impl/search.cxx
     core/impl/search_error_category.cxx
-    core/impl/search_error_context.cxx
     core/impl/search_index_manager.cxx
     core/impl/search_meta_data.cxx
     core/impl/search_result.cxx
@@ -215,7 +217,6 @@ set(couchbase_cxx_client_FILES
     core/impl/view_error_category.cxx
     core/impl/wildcard_query.cxx
     core/impl/scan_result.cxx
-    core/impl/internal_scan_result.hxx
     core/io/dns_client.cxx
     core/io/dns_config.cxx
     core/io/http_parser.cxx
@@ -226,6 +227,7 @@ set(couchbase_cxx_client_FILES
     core/management/analytics_link_azure_blob_external.cxx
     core/management/analytics_link_couchbase_remote.cxx
     core/management/analytics_link_s3_external.cxx
+    core/management/search_index.cxx
     core/mcbp/big_endian.cxx
     core/mcbp/buffer_writer.cxx
     core/mcbp/codec.cxx
@@ -383,6 +385,7 @@ set(couchbase_cxx_client_FILES
     core/transactions/binary.cxx
     core/transactions/cleanup_testing_hooks.cxx
     core/transactions/exceptions.cxx
+    core/transactions/forward_compat.cxx
     core/transactions/internal/doc_record.cxx
     core/transactions/result.cxx
     core/transactions/staged_mutation.cxx
@@ -405,13 +408,15 @@ set(couchbase_cxx_client_FILES
     core/utils/mutation_token.cxx
     core/utils/split_string.cxx
     core/utils/url_codec.cxx
-    core/view_query_options.cxx)
+    core/view_query_options.cxx
+)
 
-if(COUCHBASE_CXX_CLIENT_BUILD_SHARED)
+if(COUCHBASE_CXX_CLIENT_BUILD_SHARED OR BUILD_SHARED_LIBS)
   add_library(couchbase_cxx_client SHARED ${couchbase_cxx_client_FILES})
 else()
   add_library(couchbase_cxx_client STATIC ${couchbase_cxx_client_FILES})
 endif()
+add_library(couchbase_cxx_client::couchbase_cxx_client ALIAS couchbase_cxx_client)
 set_target_properties(couchbase_cxx_client PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 target_include_directories(couchbase_cxx_client PRIVATE ${PROJECT_BINARY_DIR}/generated)
@@ -501,3 +506,5 @@ option(COUCHBASE_CXX_CLIENT_BUILD_TOOLS "Build tools" ${COUCHBASE_CXX_CLIENT_MAS
 if(COUCHBASE_CXX_CLIENT_BUILD_TOOLS)
   add_subdirectory(tools)
 endif()
+
+include(cmake/Packaging.cmake)

data/ext/couchbase/cmake/0001-fix-build-for-mingw-w64-ucrt-x86_64-toolchain.patch

@@ -28,12 +28,11 @@ index 0cd1a12aa..ab33badc0 100644
 --- a/src/crypto/curve25519/internal.h
 +++ b/src/crypto/curve25519/internal.h
 @@ -32,7 +32,7 @@ void x25519_NEON(uint8_t out[32], const uint8_t scalar[32],
- #endif
+#endif
 
- #if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_SMALL) && \
--    defined(__GNUC__) && defined(__x86_64__)
+#if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_SMALL) && -defined(__GNUC__) && defined(__x86_64__)
 +    defined(__GNUC__) && defined(__x86_64__) && !defined(__MINGW32__)
- #define BORINGSSL_FE25519_ADX
+#define BORINGSSL_FE25519_ADX
 
  // fiat_curve25519_adx_mul is defined in
 --

data/ext/couchbase/cmake/CompilerWarnings.cmake

@@ -90,7 +90,8 @@ function(set_project_warnings project_name)
           ${GCC_WARNINGS}
           -Wno-error=null-dereference
           -Wno-error=array-bounds
-          -Wno-error=stringop-overflow)
+          -Wno-error=stringop-overflow
+          -Wno-error=maybe-uninitialized)
     endif()
     set(PROJECT_WARNINGS ${GCC_WARNINGS})
   else()

data/ext/couchbase/cmake/Packaging.cmake

@@ -0,0 +1,41 @@
+include(GNUInstallDirs)
+
+set_target_properties(couchbase_cxx_client PROPERTIES VERSION ${couchbase_cxx_client_VERSION_MAJOR}
+                                                      SOVERSION ${couchbase_cxx_client_VERSION})
+install(TARGETS couchbase_cxx_client RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+if(COUCHBASE_CXX_CLIENT_BUILD_TOOLS)
+  install(TARGETS cbc RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
+configure_file(${PROJECT_SOURCE_DIR}/cmake/couchbase-cxx-client.pc.in
+               ${PROJECT_BINARY_DIR}/packaging/couchbase-cxx-client.pc @ONLY)
+install(FILES ${PROJECT_BINARY_DIR}/packaging/couchbase-cxx-client.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
+set(COUCHBASE_CXX_CLIENT_TARBALL_NAME "couchbase-cxx-client-${COUCHBASE_CXX_CLIENT_SEMVER}")
+set(COUCHBASE_CXX_CLIENT_MANIFEST "${PROJECT_BINARY_DIR}/packaging/MANIFEST")
+
+if(APPLE)
+  find_program(TAR gtar)
+else()
+  find_program(TAR tar)
+endif()
+
+add_custom_target(
+  packaging_file_manifest
+  COMMAND git ls-files --recurse-submodules | LC_ALL=C sort > ${COUCHBASE_CXX_CLIENT_MANIFEST}
+  BYPRODUCTS ${COUCHBASE_CXX_CLIENT_MANIFEST}
+  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+
+add_custom_target(
+  packaging_tarball
+  WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/packaging"
+  COMMAND rm -rf "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}"
+  COMMAND mkdir "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}"
+  COMMAND ${TAR} -cf - -C ${PROJECT_SOURCE_DIR} -T ${COUCHBASE_CXX_CLIENT_MANIFEST} | ${TAR} xf - -C
+          "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}"
+  # https://reproducible-builds.org/docs/archives/
+  COMMAND ${TAR} --sort=name --mtime="${COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP}Z" --owner=0 --group=0 --numeric-owner -czf
+          "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}.tar.gz" "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}"
+  COMMAND rm -rf "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}"
+  BYPRODUCTS "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}.tar.gz"
+  DEPENDS ${COUCHBASE_CXX_CLIENT_MANIFEST})

data/ext/couchbase/cmake/Sanitizers.cmake

@@ -60,6 +60,7 @@ function(enable_sanitizers project_name)
        "")
       target_compile_options(${project_name} INTERFACE -fsanitize=${LIST_OF_SANITIZERS})
       target_link_libraries(${project_name} INTERFACE -fsanitize=${LIST_OF_SANITIZERS})
+      target_compile_definitions(${project_name} INTERFACE COUCHBASE_CXX_CLIENT_BUILD_SANITIZED=1)
       message(STATUS "Enabled stanitizers: ${LIST_OF_SANITIZERS}")
     endif()
   endif()

data/ext/couchbase/cmake/VersionInfo.cmake

@@ -15,16 +15,16 @@ string(SUBSTRING "${COUCHBASE_CXX_CLIENT_GIT_REVISION}" 0 7 COUCHBASE_CXX_CLIENT
 if(NOT COUCHBASE_CXX_CLIENT_GIT_DESCRIBE)
   if(GIT)
     execute_process(
-            COMMAND git describe --always --long HEAD
-            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-            OUTPUT_VARIABLE COUCHBASE_CXX_CLIENT_GIT_DESCRIBE)
+      COMMAND git describe --always --long HEAD
+      WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      OUTPUT_VARIABLE COUCHBASE_CXX_CLIENT_GIT_DESCRIBE)
   else()
     set(COUCHBASE_CXX_CLIENT_GIT_DESCRIBE "unknown")
   endif()
 endif()
 
-string(TIMESTAMP COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP "%Y-%m-%d %H:%M:%S" UTC)
+string(TIMESTAMP COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP "%Y-%m-%dT%H:%M:%S" UTC)
 string(TIMESTAMP COUCHBASE_CXX_CLIENT_BUILD_DATE "%Y-%m-%d" UTC)
 
 # set(couchbase_cxx_client_BUILD_NUMBER 142)

data/ext/couchbase/cmake/build_version.hxx.in

@@ -17,6 +17,7 @@
 
 #pragma once
 
+constexpr auto COUCHBASE_CXX_CLIENT_BUILD_DATE = "@COUCHBASE_CXX_CLIENT_BUILD_DATE@";
 constexpr auto COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP = "@COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP@";
 constexpr auto COUCHBASE_CXX_CLIENT_CXX_COMPILER = "@CMAKE_CXX_COMPILER_ID@ @CMAKE_CXX_COMPILER_VERSION@";
 constexpr auto COUCHBASE_CXX_CLIENT_C_COMPILER = "@CMAKE_C_COMPILER_ID@ @CMAKE_C_COMPILER_VERSION@";

data/ext/couchbase/cmake/couchbase-cxx-client.pc.in

@@ -0,0 +1,10 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+includedir=@CMAKE_INSTALL_PREFIX@/include
+libdir=@CMAKE_INSTALL_LIBDIR@
+
+Name: couchbase-cxx-client @COUCHBASE_CXX_CLIENT_SEMVER@
+Description: Couchbase C++ SDK
+Version: @COUCHBASE_CXX_CLIENT_SEMVER@
+Libs: -L${libdir} -lcouchbase_cxx_client
+Cflags: -I${includedir}

data/ext/couchbase/cmake/test_boringssl.cxx

@@ -3,5 +3,5 @@
 int
 main()
 {
-    return static_cast<int>(OpenSSL_version_num());
+  return static_cast<int>(OpenSSL_version_num());
 }

data/ext/couchbase/cmake/test_openssl.cxx

@@ -3,5 +3,5 @@
 int
 main()
 {
-    return static_cast<int>(OpenSSL_version_num());
+  return static_cast<int>(OpenSSL_version_num());
 }