couchbase 4.4.1 → 4.4.3

package/deps/couchbase-cxx-client/cmake/Packaging.cmake

@@ -1,41 +1,171 @@
 include(GNUInstallDirs)
+include(CMakePackageConfigHelpers)
 
-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})
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/couchbase DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(FILES LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR})
+
+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)
+
+configure_package_config_file(
+  ${PROJECT_SOURCE_DIR}/cmake/couchbase_cxx_client-config.cmake.in couchbase_cxx_client-config.cmake
+  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/couchbase_cxx_client)
+write_basic_package_version_file(
+  couchbase_cxx_client-version.cmake
+  VERSION ${couchbase_cxx_client_VERSION}
+  COMPATIBILITY SameMinorVersion)
+install(FILES ${PROJECT_BINARY_DIR}/couchbase_cxx_client-version.cmake
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/couchbase_cxx_client)
 
 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)
+
+install(
+  TARGETS ${couchbase_cxx_client_LIBRARIES}
+  EXPORT couchbase_cxx_client-targets
+  DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+install(
+  EXPORT couchbase_cxx_client-targets
+  NAMESPACE couchbase_cxx_client::
+  FILE couchbase_cxx_client-config.cmake
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/couchbase_cxx_client)
 
 set(COUCHBASE_CXX_CLIENT_TARBALL_NAME "couchbase-cxx-client-${COUCHBASE_CXX_CLIENT_SEMVER}")
+set(COUCHBASE_CXX_CLIENT_TARBALL "${PROJECT_BINARY_DIR}/packaging/${COUCHBASE_CXX_CLIENT_TARBALL_NAME}.tar.gz")
 set(COUCHBASE_CXX_CLIENT_MANIFEST "${PROJECT_BINARY_DIR}/packaging/MANIFEST")
 
 if(APPLE)
   find_program(TAR gtar)
+  find_program(SED gsed)
 else()
   find_program(TAR tar)
+  find_program(SED sed)
 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_command(
+  OUTPUT ${COUCHBASE_CXX_CLIENT_MANIFEST}
+  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+  COMMAND git ls-files --recurse-submodules | LC_ALL=C sort > ${COUCHBASE_CXX_CLIENT_MANIFEST})
+
+set(COUCHBASE_CXX_TARBALL_THIRD_PARTY_GLOB_FILE ${PROJECT_SOURCE_DIR}/cmake/tarball_glob.txt)
 
-add_custom_target(
-  packaging_tarball
+if(COUCHBASE_CXX_RECORD_BUILD_INFO_FOR_TARBALL)
+  file(
+    WRITE "${CMAKE_SOURCE_DIR}/cmake/TarballRelease.cmake"
+    "
+set(CPM_DOWNLOAD_ALL OFF CACHE BOOL \"\" FORCE)
+set(CPM_USE_NAMED_CACHE_DIRECTORIES ON CACHE BOOL \"\" FORCE)
+set(CPM_USE_LOCAL_PACKAGES OFF CACHE BOOL \"\" FORCE)
+set(CPM_SOURCE_CACHE \"\${PROJECT_SOURCE_DIR}/third_party_cache\" CACHE STRING \"\" FORCE)
+set(COUCHBASE_CXX_CLIENT_GIT_REVISION \"${COUCHBASE_CXX_CLIENT_GIT_REVISION}\")
+set(COUCHBASE_CXX_CLIENT_GIT_DESCRIBE \"${COUCHBASE_CXX_CLIENT_GIT_DESCRIBE}\")
+set(COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP \"${COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP}\")
+set(COUCHBASE_CXX_CLIENT_EMBED_MOZILLA_CA_BUNDLE_ROOT \"\${PROJECT_SOURCE_DIR}/third_party_cache\" CACHE STRING \"\" FORCE)
+message(STATUS \"Building from Tarball: ${COUCHBASE_CXX_CLIENT_TARBALL_NAME}.tar.gz\")
+")
+endif()
+
+add_custom_command(
+  OUTPUT ${COUCHBASE_CXX_CLIENT_TARBALL}
   WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/packaging"
-  COMMAND rm -rf "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}"
-  COMMAND mkdir "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}"
+  COMMAND ${CMAKE_COMMAND} -E rm -rf "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}"
+  COMMAND ${CMAKE_COMMAND} -E make_directory "${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}"
+  COMMAND
+    ${CMAKE_COMMAND} -S "${PROJECT_BINARY_DIR}/packaging/${COUCHBASE_CXX_CLIENT_TARBALL_NAME}" -B
+    "${PROJECT_BINARY_DIR}/packaging/${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/tmp/build"
+    -DCPM_SOURCE_CACHE="${PROJECT_BINARY_DIR}/packaging/${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/tmp/cache"
+    -DCOUCHBASE_CXX_CLIENT_EMBED_MOZILLA_CA_BUNDLE_ROOT="${PROJECT_BINARY_DIR}/packaging/${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/tmp/cache"
+    -DCOUCHBASE_CXX_CLIENT_BUILD_TESTS=OFF -DCOUCHBASE_CXX_CLIENT_BUILD_TOOLS=ON -DCOUCHBASE_CXX_CLIENT_BUILD_DOCS=OFF
+    -DCOUCHBASE_CXX_CLIENT_STATIC_BORINGSSL=ON -DCPM_DOWNLOAD_ALL=ON -DCPM_USE_NAMED_CACHE_DIRECTORIES=ON
+    -DCPM_USE_LOCAL_PACKAGES=OFF -DCOUCHBASE_CXX_CLIENT_BUILD_STATIC=OFF -DCOUCHBASE_CXX_CLIENT_INSTALL=ON
+    -DCOUCHBASE_CXX_RECORD_BUILD_INFO_FOR_TARBALL=ON
+  COMMAND
+    xargs --arg-file=${COUCHBASE_CXX_TARBALL_THIRD_PARTY_GLOB_FILE} -I {} find
+    "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/tmp/cache" -wholename "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/tmp/cache/{}"
+    -type f | grep -v "crypto_test_data\\|googletest" | uniq >
+    "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/tmp/third_party_manifest.txt"
+  COMMAND ${CMAKE_COMMAND} -E make_directory "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/tmp/filtered_cache"
+  COMMAND xargs --arg-file="${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/tmp/third_party_manifest.txt" -I {} cp --parents {}
+          "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/tmp/filtered_cache"
+  COMMAND
+    ${CMAKE_COMMAND} -E rename
+    "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/tmp/filtered_cache/${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/tmp/cache"
+    "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/third_party_cache"
+  COMMAND ${SED} -i "s/Git REQUIRED/Git/g\;s/NOT GIT/NOT CHECK_DIRTY OR NOT GIT/g"
+          "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/third_party_cache/cpm/CPM_*.cmake"
+  COMMAND ${CMAKE_COMMAND} -E rm -rf "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/tmp"
   # 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"
+  COMMAND ${CMAKE_COMMAND} -E rm -rf "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}"
   DEPENDS ${COUCHBASE_CXX_CLIENT_MANIFEST})
+
+add_custom_target(packaging_tarball DEPENDS ${COUCHBASE_CXX_CLIENT_TARBALL})
+
+option(COUCHBASE_CXX_CLIENT_RPM_TARGETS "Enable targets for building RPMs" FALSE)
+if(COUCHBASE_CXX_CLIENT_RPM_TARGETS)
+  find_program(MOCK mock REQUIRED) # dnf install -y mock
+  find_program(SPECTOOL spectool REQUIRED) # dnf install -y rpmdevtools
+
+  string(TIMESTAMP COUCHBASE_CXX_CLIENT_RPM_DATE "%a %b %d %Y" UTC)
+
+  set(COUCHBASE_CXX_CLIENT_SPEC "${PROJECT_BINARY_DIR}/packaging/couchbase-cxx-client.spec")
+  configure_file(${PROJECT_SOURCE_DIR}/cmake/couchbase-cxx-client.spec.in "${COUCHBASE_CXX_CLIENT_SPEC}" @ONLY)
+
+  set(COUCHBASE_CXX_CLIENT_DEFAULT_ROOT "rocky-9-${CMAKE_SYSTEM_PROCESSOR}")
+  set(COUCHBASE_CXX_CLIENT_RPM_NAME
+      "couchbase-cxx-client-${COUCHBASE_CXX_CLIENT_PACKAGE_VERSION}-${COUCHBASE_CXX_CLIENT_PACKAGE_RELEASE}")
+  set(COUCHBASE_CXX_CLIENT_SRPM "${PROJECT_BINARY_DIR}/packaging/srpm/${COUCHBASE_CXX_CLIENT_RPM_NAME}.el9.src.rpm")
+
+  add_custom_command(
+    OUTPUT ${COUCHBASE_CXX_CLIENT_SRPM}
+    WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/packaging"
+    COMMAND ${SPECTOOL} --get-files couchbase-cxx-client.spec
+    COMMAND ${MOCK} --buildsrpm --root=${COUCHBASE_CXX_CLIENT_DEFAULT_ROOT}
+            --resultdir=${PROJECT_BINARY_DIR}/packaging/srpm --spec couchbase-cxx-client.spec --sources .
+    DEPENDS ${COUCHBASE_CXX_CLIENT_TARBALL} ${COUCHBASE_CXX_CLIENT_SPEC})
+
+  add_custom_target(packaging_srpm DEPENDS ${COUCHBASE_CXX_CLIENT_SRPM})
+
+  list(APPEND COUCHBASE_CXX_CLIENT_SUPPORTED_ROOTS
+    "opensuse-leap-15.5-${CMAKE_SYSTEM_PROCESSOR}"
+    "rocky-9-${CMAKE_SYSTEM_PROCESSOR}"
+    "rocky-8-${CMAKE_SYSTEM_PROCESSOR}"
+    "amazonlinux-2023-${CMAKE_SYSTEM_PROCESSOR}"
+    "fedora-40-${CMAKE_SYSTEM_PROCESSOR}"
+  )
+
+  message(STATUS "Supported build roots for RPM packages: ${COUCHBASE_CXX_CLIENT_SUPPORTED_ROOTS}")
+
+  # Build the chain of the dependencies from the timestamps, so that everything
+  # will be executed one-by-one in order, because the mock cannot run multiple
+  # roots simultaneously
+  set(last_output "")
+  foreach(root ${COUCHBASE_CXX_CLIENT_SUPPORTED_ROOTS})
+    set(timestamp "${PROJECT_BINARY_DIR}/packaging/rpm/${root}/done.txt")
+    set(dependencies ${COUCHBASE_CXX_CLIENT_SRPM})
+
+    if (last_output)
+      list(APPEND dependencies ${last_output})
+    endif()
+
+    add_custom_command(
+      COMMENT "Building RPM for ${root}"
+      OUTPUT ${timestamp}
+      WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/packaging"
+      COMMAND ${MOCK} --rebuild --root=${root}
+        --resultdir=${PROJECT_BINARY_DIR}/packaging/rpm/${root} "${COUCHBASE_CXX_CLIENT_SRPM}"
+      COMMAND touch ${timestamp}
+      DEPENDS ${dependencies})
+
+    set(last_output ${timestamp})
+  endforeach()
+
+  # add target that depends on the last root
+  add_custom_target(packaging_rpm DEPENDS ${last_output})
+endif()

package/deps/couchbase-cxx-client/cmake/Testing.cmake

@@ -15,7 +15,7 @@ if(COUCHBASE_CXX_CLIENT_ENABLE_VALGRIND)
   if(VALGRIND)
     set(VALGRIND_COMMAND "${VALGRIND}")
     set(VALGRIND_COMMAND_OPTIONS
-        "-v --tool=memcheck --leak-check=full --track-fds=yes --num-callers=50 --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xfe"
+        "-v --tool=memcheck --leak-check=full --track-fds=yes --num-callers=50 --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xfe --suppressions=${PROJECT_SOURCE_DIR}/.valgrind_suppressions.txt"
     )
     set(MEMORYCHECK_COMMAND "${VALGRIND}")
     set(MEMORYCHECK_COMMAND_OPTIONS "${VALGRIND_COMMAND_OPTIONS}")
@@ -39,18 +39,24 @@ set_property(GLOBAL PROPERTY COUCHBASE_INTEGRATION_TESTS "")
 
 macro(integration_test name)
   add_executable(test_integration_${name} "${PROJECT_SOURCE_DIR}/test/test_integration_${name}.cxx")
-  target_include_directories(test_integration_${name} PRIVATE ${PROJECT_BINARY_DIR}/generated
+  target_include_directories(test_integration_${name} PRIVATE ${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR}/generated
                                                               ${PROJECT_BINARY_DIR}/generated_$<CONFIG>)
+  target_include_directories(
+    test_integration_${name} SYSTEM PRIVATE
+                            ${PROJECT_SOURCE_DIR}/third_party/cxx_function
+                            ${PROJECT_SOURCE_DIR}/third_party/expected/include)
   target_link_libraries(
     test_integration_${name}
     project_options
     project_warnings
+    ${couchbase_cxx_client_DEFAULT_LIBRARY}
     Catch2::Catch2WithMain
     Threads::Threads
     Microsoft.GSL::GSL
     asio
     taocpp::json
-    couchbase_cxx_client
+    fmt::fmt
+    spdlog::spdlog
     test_utils)
   if(COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL)
     target_link_libraries(test_integration_${name} OpenSSL::SSL)
@@ -79,8 +85,12 @@ set_property(GLOBAL PROPERTY COUCHBASE_TRANSACTION_TESTS "")
 
 macro(transaction_test name)
   add_executable(test_transaction_${name} "${PROJECT_SOURCE_DIR}/test/test_transaction_${name}.cxx")
-  target_include_directories(test_transaction_${name} PRIVATE ${PROJECT_BINARY_DIR}/generated
+  target_include_directories(test_transaction_${name} PRIVATE ${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR}/generated
                                                               ${PROJECT_BINARY_DIR}/generated_$<CONFIG>)
+  target_include_directories(
+    test_transaction_${name} SYSTEM PRIVATE
+                            ${PROJECT_SOURCE_DIR}/third_party/cxx_function
+                            ${PROJECT_SOURCE_DIR}/third_party/expected/include)
   target_link_libraries(
     test_transaction_${name}
     project_options
@@ -90,7 +100,9 @@ macro(transaction_test name)
     Microsoft.GSL::GSL
     asio
     taocpp::json
-    couchbase_cxx_client
+    spdlog::spdlog
+    fmt::fmt
+    ${couchbase_cxx_client_DEFAULT_LIBRARY}
     test_utils)
   if(COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL)
     target_link_libraries(test_transaction_${name} OpenSSL::SSL)
@@ -118,8 +130,12 @@ define_property(
 set_property(GLOBAL PROPERTY COUCHBASE_UNIT_TESTS "")
 macro(unit_test name)
   add_executable(test_unit_${name} "${PROJECT_SOURCE_DIR}/test/test_unit_${name}.cxx")
-  target_include_directories(test_unit_${name} PRIVATE ${PROJECT_BINARY_DIR}/generated
+  target_include_directories(test_unit_${name} PRIVATE ${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR}/generated
                                                        ${PROJECT_BINARY_DIR}/generated_$<CONFIG>)
+  target_include_directories(
+    test_unit_${name} SYSTEM PRIVATE
+                            ${PROJECT_SOURCE_DIR}/third_party/cxx_function
+                            ${PROJECT_SOURCE_DIR}/third_party/expected/include)
   target_link_libraries(
     test_unit_${name}
     project_options
@@ -129,7 +145,9 @@ macro(unit_test name)
     Microsoft.GSL::GSL
     asio
     taocpp::json
-    couchbase_cxx_client
+    spdlog::spdlog
+    fmt::fmt
+    ${couchbase_cxx_client_DEFAULT_LIBRARY}
     test_utils)
   if(COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL)
     target_link_libraries(test_unit_${name} OpenSSL::SSL)
@@ -157,8 +175,14 @@ define_property(
 set_property(GLOBAL PROPERTY COUCHBASE_BENCHMARKS "")
 macro(integration_benchmark name)
   add_executable(benchmark_integration_${name} "${PROJECT_SOURCE_DIR}/test/benchmark_integration_${name}.cxx")
-  target_include_directories(benchmark_integration_${name} PRIVATE ${PROJECT_BINARY_DIR}/generated
-                                                                   ${PROJECT_BINARY_DIR}/generated_$<CONFIG>)
+  target_include_directories(
+    benchmark_integration_${name} PRIVATE ${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR}/generated
+                                          ${PROJECT_BINARY_DIR}/generated_$<CONFIG>)
+  target_include_directories(
+    benchmark_integration_${name} SYSTEM PRIVATE
+                            ${PROJECT_SOURCE_DIR}/third_party/cxx_function
+                            ${PROJECT_SOURCE_DIR}/third_party/expected/include)
+
   target_link_libraries(
     benchmark_integration_${name}
     project_options
@@ -168,7 +192,9 @@ macro(integration_benchmark name)
     Microsoft.GSL::GSL
     asio
     taocpp::json
-    couchbase_cxx_client
+    spdlog::spdlog
+    fmt::fmt
+    ${couchbase_cxx_client_DEFAULT_LIBRARY}
     test_utils)
   if(COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL)
     target_link_libraries(benchmark_integration_${name} OpenSSL::SSL)

package/deps/couchbase-cxx-client/cmake/ThirdPartyDependencies.cmake

@@ -26,11 +26,12 @@ if(NOT TARGET fmt::fmt)
     11.0.1
     GITHUB_REPOSITORY
     "fmtlib/fmt"
+    EXCLUDE_FROM_ALL ON
     OPTIONS
+    "FMT_INSTALL OFF"
     # Unicode support for MSVC enabled in CompilerWarnings.cmake
     "FMT_UNICODE OFF"
     "FMT_DOC OFF"
-    "FMT_INSTALL OFF"
     "BUILD_SHARED_LIBS OFF"
     "CMAKE_C_VISIBILITY_PRESET hidden"
     "CMAKE_CXX_VISIBILITY_PRESET hidden"
@@ -46,7 +47,9 @@ if(NOT TARGET spdlog::spdlog)
     1.14.1
     GITHUB_REPOSITORY
     "gabime/spdlog"
+    EXCLUDE_FROM_ALL ON
     OPTIONS
+    "SPDLOG_INSTALL OFF"
     "BUILD_SHARED_LIBS OFF"
     "CMAKE_C_VISIBILITY_PRESET hidden"
     "CMAKE_CXX_VISIBILITY_PRESET hidden"
@@ -64,7 +67,9 @@ if(NOT TARGET Microsoft.GSL::GSL)
     4.0.0
     GITHUB_REPOSITORY
     "microsoft/gsl"
+    EXCLUDE_FROM_ALL ON
     OPTIONS
+    "GSL_INSTALL OFF"
     "CMAKE_C_VISIBILITY_PRESET hidden"
     "CMAKE_CXX_VISIBILITY_PRESET hidden"
     "CMAKE_POSITION_INDEPENDENT_CODE ON")
@@ -81,6 +86,7 @@ if(NOT TARGET hdr_histogram_static)
     0.11.8
     GITHUB_REPOSITORY
     "HdrHistogram/HdrHistogram_c"
+    EXCLUDE_FROM_ALL ON
     OPTIONS
     "CMAKE_C_VISIBILITY_PRESET hidden"
     "CMAKE_CXX_VISIBILITY_PRESET hidden"
@@ -101,6 +107,7 @@ if(NOT TARGET llhttp::llhttp)
     9.2.1
     GITHUB_REPOSITORY
     "nodejs/llhttp"
+    EXCLUDE_FROM_ALL ON
     OPTIONS
     "CMAKE_C_VISIBILITY_PRESET hidden"
     "CMAKE_CXX_VISIBILITY_PRESET hidden"
@@ -120,12 +127,13 @@ if(NOT TARGET snappy)
     1.2.1
     GITHUB_REPOSITORY
     "google/snappy"
+    EXCLUDE_FROM_ALL ON
     OPTIONS
+    "SNAPPY_INSTALL OFF"
     "CMAKE_C_VISIBILITY_PRESET hidden"
     "CMAKE_CXX_VISIBILITY_PRESET hidden"
     "CMAKE_POSITION_INDEPENDENT_CODE ON"
     "BUILD_SHARED_LIBS OFF"
-    "SNAPPY_INSTALL OFF"
     "SNAPPY_BUILD_TESTS OFF"
     "SNAPPY_BUILD_BENCHMARKS OFF")
 endif()
@@ -150,24 +158,32 @@ if(NOT TARGET taocpp::json)
     "CMAKE_CXX_VISIBILITY_PRESET hidden"
     "CMAKE_POSITION_INDEPENDENT_CODE ON"
     "BUILD_SHARED_LIBS OFF"
+    "PEGTL_INSTALL ${COUCHBASE_CXX_CLIENT_INSTALL}"
+    "PEGTL_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/pegtl"
+    "PEGTL_INSTALL_DOC_DIR ${CMAKE_INSTALL_DATAROOTDIR}/doc/tao/pegtl"
     "PEGTL_BUILD_TESTS OFF"
     "PEGTL_BUILD_EXAMPLES OFF"
     "PEGTL_USE_BOOST_FILESYSTEM OFF"
+    "TAOCPP_JSON_INSTALL ${COUCHBASE_CXX_CLIENT_INSTALL}"
+    "TAOCPP_JSON_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/taocpp-json"
+    "TAOCPP_JSON_INSTALL_DOC_DIR ${CMAKE_INSTALL_DATAROOTDIR}/doc/tao/json"
     "TAOCPP_JSON_BUILD_TESTS OFF"
     "TAOCPP_JSON_BUILD_EXAMPLES OFF")
 endif()
 
+
 if(NOT TARGET asio::asio)
   # https://github.com/chriskohlhoff/asio/tags
   cpmaddpackage(
     NAME
     asio
     GIT_TAG
-    asio-1-30-2
+    asio-1-31-0
     VERSION
-    1.30.2
+    1.31.0
     GITHUB_REPOSITORY
-    "chriskohlhoff/asio")
+    "chriskohlhoff/asio"
+    EXCLUDE_FROM_ALL ON)
 endif()
 
 # ASIO doesn't use CMake, we have to configure it manually. Extra notes for using on Windows:
@@ -177,11 +193,11 @@ endif()
 #
 # 2) WIN32_LEAN_AND_MEAN is defined to make Winsock2 work.
 if(asio_ADDED)
-  add_library(asio INTERFACE)
+  add_library(asio STATIC ${asio_SOURCE_DIR}/asio/src/asio.cpp ${asio_SOURCE_DIR}/asio/src/asio_ssl.cpp)
 
-  target_include_directories(asio SYSTEM INTERFACE ${asio_SOURCE_DIR}/asio/include)
-  target_compile_definitions(asio INTERFACE ASIO_STANDALONE ASIO_NO_DEPRECATED)
-  target_link_libraries(asio INTERFACE Threads::Threads)
+  target_include_directories(asio SYSTEM PUBLIC ${asio_SOURCE_DIR}/asio/include)
+  target_compile_definitions(asio PRIVATE ASIO_STANDALONE=1 ASIO_NO_DEPRECATED=1 ASIO_SEPARATE_COMPILATION=1)
+  target_link_libraries(asio PRIVATE Threads::Threads OpenSSL::SSL OpenSSL::Crypto)
   set_target_properties(
     asio
     PROPERTIES C_VISIBILITY_PRESET hidden
@@ -221,9 +237,6 @@ if(asio_ADDED)
   add_library(asio::asio ALIAS asio)
 endif()
 
-include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/third_party/cxx_function)
-include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/third_party/expected/include)
-
 add_library(jsonsl OBJECT ${PROJECT_SOURCE_DIR}/third_party/jsonsl/jsonsl.c)
 set_target_properties(jsonsl PROPERTIES C_VISIBILITY_PRESET hidden POSITION_INDEPENDENT_CODE TRUE)
 target_include_directories(jsonsl SYSTEM PUBLIC ${PROJECT_SOURCE_DIR}/third_party/jsonsl)
@@ -235,5 +248,4 @@ declare_system_library(Microsoft.GSL::GSL)
 declare_system_library(spdlog::spdlog)
 declare_system_library(fmt::fmt)
 declare_system_library(asio)
-declare_system_library(taocpp::pegtl)
 declare_system_library(taocpp::json)

package/deps/couchbase-cxx-client/cmake/VersionInfo.cmake

@@ -24,8 +24,30 @@ if(NOT COUCHBASE_CXX_CLIENT_GIT_DESCRIBE)
   endif()
 endif()
 
-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)
+if(NOT COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP)
+  if(GIT)
+    execute_process(
+      COMMAND git describe --tags --abbrev=0 HEAD
+      WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+      RESULT_VARIABLE tag_result
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      OUTPUT_VARIABLE last_tag)
+
+    if (tag_result EQUAL 0)
+      execute_process(
+        COMMAND git log --max-count=1 --no-patch --format=%cd --date=format:%Y-%m-%dT%H:%M:%S ${last_tag}
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        OUTPUT_VARIABLE COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP)
+    endif()
+  endif()
+
+  if (NOT COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP)
+    string(TIMESTAMP COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP "%Y-%m-%dT%H:%M:%S" UTC)
+  endif()
+endif()
+
+string(REGEX REPLACE "T.*" "" COUCHBASE_CXX_CLIENT_BUILD_DATE "${COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP}")
 
 # set(couchbase_cxx_client_BUILD_NUMBER 142)
 # set(COUCHBASE_CXX_CLIENT_GIT_DESCRIBE "1.0.0-beta.4-27-g6807da0") #-> "couchbase_cxx_client-1.0.0-beta.4+142.27.6807da0"
@@ -68,14 +90,6 @@ file(
     "
 #pragma once
 
-#define COUCHBASE_CXX_CLIENT_COMPILE_DEFINITIONS \"$<TARGET_PROPERTY:couchbase_cxx_client,COMPILE_DEFINITIONS>\"
-#define COUCHBASE_CXX_CLIENT_COMPILE_FEATURES \"$<TARGET_PROPERTY:couchbase_cxx_client,COMPILE_FEATURES>\"
-#define COUCHBASE_CXX_CLIENT_COMPILE_FLAGS \"$<TARGET_PROPERTY:couchbase_cxx_client,COMPILE_FLAGS>\"
-#define COUCHBASE_CXX_CLIENT_COMPILE_OPTIONS \"$<TARGET_PROPERTY:couchbase_cxx_client,COMPILE_OPTIONS>\"
-#define COUCHBASE_CXX_CLIENT_LINK_DEPENDS \"$<TARGET_PROPERTY:couchbase_cxx_client,LINK_DEPENDS>\"
-#define COUCHBASE_CXX_CLIENT_LINK_FLAGS \"$<TARGET_PROPERTY:couchbase_cxx_client,LINK_FLAGS>\"
-#define COUCHBASE_CXX_CLIENT_LINK_LIBRARIES \"$<TARGET_PROPERTY:couchbase_cxx_client,LINK_LIBRARIES>\"
-#define COUCHBASE_CXX_CLIENT_LINK_OPTIONS \"$<TARGET_PROPERTY:couchbase_cxx_client,LINK_OPTIONS>\"
 #define COUCHBASE_CXX_CLIENT_POST_LINKED_OPENSSL \"${COUCHBASE_CXX_CLIENT_POST_LINKED_OPENSSL}\"
 
 #define OPENSSL_SSL_IMPORTED_LOCATION \"$<$<TARGET_EXISTS:OpenSSL::SSL>:$<TARGET_PROPERTY:OpenSSL::SSL,IMPORTED_LOCATION>>\"

package/deps/couchbase-cxx-client/cmake/couchbase-cxx-client.spec.in

@@ -0,0 +1,104 @@
+%if 0%{?suse_version}
+%global license_dir %{_datadir}/doc
+%else
+%global license_dir %{_docdir}
+%endif
+
+Name: couchbase-cxx-client
+Summary: Couchbase C++ SDK
+Version: @COUCHBASE_CXX_CLIENT_PACKAGE_VERSION@
+Release: @COUCHBASE_CXX_CLIENT_PACKAGE_RELEASE@%{?dist}
+Vendor: Couchbase, Inc.
+Packager: Couchbase SDK Team <support@couchbase.com>
+License: ASL 2.0
+URL: https://docs.couchbase.com/cxx-sdk/current/hello-world/overview.html
+%if 0%{?suse_version} == 1500
+BuildRequires: gcc13, gcc13-c++
+%else
+BuildRequires: gcc, gcc-c++
+%endif
+BuildRequires: cmake >= 3.19
+Source0: @COUCHBASE_CXX_CLIENT_TARBALL_NAME@.tar.gz
+
+%if 0%{?amzn}
+# The additional linker flags break AmazonLinux
+# https://bugzilla.redhat.com/show_bug.cgi?id=2043092
+%undefine _package_note_flags
+%endif
+
+%description
+This is the client and protocol library for Couchbase project.
+
+%package tools
+Summary: Couchbase C++ SDK - Tools
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%description -n %{name}-tools
+CLI tools from the Couchbase C++ SDK.
+
+%package devel
+Summary: Couchbase C++ SDK - Header files
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%description devel
+Development files for the Couchbase C++ SDK.
+
+%prep
+%autosetup -p1 -n@COUCHBASE_CXX_CLIENT_TARBALL_NAME@
+%cmake \
+%if 0%{?rhel} == 8 || 0%{?rocky} == 8 || 0%{?ol} == 8
+    -S "." -B "redhat-linux-build" \
+%endif
+%if 0%{?suse_version} == 1500
+    -DCMAKE_C_COMPILER=gcc-13 \
+    -DCMAKE_CXX_COMPILER=g++-13 \
+%endif
+    -DBUILD_SHARED_LIBS=OFF \
+    -DCOUCHBASE_CXX_CLIENT_INSTALL=ON \
+    -DCOUCHBASE_CXX_CLIENT_STATIC_BORINGSSL=ON \
+    -DCOUCHBASE_CXX_CLIENT_BUILD_EXAMPLES=OFF \
+    -DCOUCHBASE_CXX_CLIENT_BUILD_TESTS=OFF \
+    -DCOUCHBASE_CXX_CLIENT_BUILD_TOOLS=ON \
+    -DCOUCHBASE_CXX_CLIENT_BUILD_STATIC=OFF \
+    -DCOUCHBASE_CXX_CLIENT_BUILD_SHARED=ON
+
+%build
+%if 0%{?rhel} == 8 || 0%{?rocky} == 8 || 0%{?ol} == 8
+/usr/bin/cmake --build "redhat-linux-build" -j${RPM_BUILD_NCPUS} --verbose
+%else
+%if 0%{?suse_version} == 1500
+cd build
+%endif
+%cmake_build
+%endif
+
+%install
+%if 0%{?rhel} == 8 || 0%{?rocky} == 8 || 0%{?ol} == 8
+DESTDIR="%{buildroot}" /usr/bin/cmake --install "redhat-linux-build"
+%else
+%cmake_install
+%endif
+%if 0%{?suse_version} == 1500
+%{__mkdir_p} %{buildroot}%{license_dir}/tao/json %{buildroot}%{_libdir}/cmake
+%{__mv} %{buildroot}%{license_dir}/taocpp-json/tao/json/LICENSE %{buildroot}%{license_dir}/tao/json/LICENSE
+%{__mv} %{buildroot}%{_datadir}/taocpp-json/cmake %{buildroot}%{_libdir}/cmake/taocpp-json
+%{__mv} %{buildroot}%{_datadir}/pegtl/cmake %{buildroot}%{_libdir}/cmake/pegtl
+%endif
+
+%files
+%license %{license_dir}/couchbase_cxx_client/LICENSE.txt
+%license %{license_dir}/tao/pegtl/LICENSE
+%license %{license_dir}/tao/json/LICENSE
+%{_libdir}/libcouchbase_cxx_client.so.*
+
+%files tools
+%{_bindir}/cbc
+
+%files devel
+%{_includedir}/couchbase
+%{_includedir}/tao
+%{_libdir}/cmake/*/*.cmake
+%{_libdir}/libcouchbase_cxx_client.so
+%{_libdir}/pkgconfig/couchbase_cxx_client.pc
+
+%changelog
+* @COUCHBASE_CXX_CLIENT_RPM_DATE@ Couchbase SDK Team <support@couchbase.com> - @COUCHBASE_CXX_CLIENT_PACKAGE_VERSION@-@COUCHBASE_CXX_CLIENT_PACKAGE_RELEASE@
+- Automated build.

package/deps/couchbase-cxx-client/cmake/couchbase_cxx_client-config.cmake.in

@@ -0,0 +1,3 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake")