couchbase 3.5.4 → 3.5.5

data/ext/cache/spdlog/{19df5d3d8e5526c255d27414e09568671ef87483 → 7251ead404dccd824789f8f3a13df2a6fb56440c}/spdlog/include/spdlog/sinks/wincolor_sink-inl.h

@@ -134,9 +134,18 @@ void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::print_range_(const memory_buf_t
                                                              size_t start,
                                                              size_t end) {
     if (end > start) {
+#if defined(SPDLOG_UTF8_TO_WCHAR_CONSOLE)
+        wmemory_buf_t wformatted;
+        details::os::utf8_to_wstrbuf(string_view_t(formatted.data() + start, end - start),
+            wformatted);
+        auto size = static_cast<DWORD>(wformatted.size());
+        auto ignored = ::WriteConsoleW(static_cast<HANDLE>(out_handle_), wformatted.data(), size,
+            nullptr, nullptr);
+#else
         auto size = static_cast<DWORD>(end - start);
         auto ignored = ::WriteConsoleA(static_cast<HANDLE>(out_handle_), formatted.data() + start,
                                        size, nullptr, nullptr);
+#endif
         (void)(ignored);
     }
 }

data/ext/cache/spdlog/{19df5d3d8e5526c255d27414e09568671ef87483 → 7251ead404dccd824789f8f3a13df2a6fb56440c}/spdlog/include/spdlog/version.h

@@ -4,8 +4,8 @@
 #pragma once
 
 #define SPDLOG_VER_MAJOR 1
-#define SPDLOG_VER_MINOR 14
-#define SPDLOG_VER_PATCH 1
+#define SPDLOG_VER_MINOR 15
+#define SPDLOG_VER_PATCH 0
 
 #define SPDLOG_TO_VERSION(major, minor, patch) (major * 10000 + minor * 100 + patch)
 #define SPDLOG_VERSION SPDLOG_TO_VERSION(SPDLOG_VER_MAJOR, SPDLOG_VER_MINOR, SPDLOG_VER_PATCH)

data/ext/cache/{fmt/141a17a028e6c29914e109691389f6cf87f9cfe3/fmt/src/format.cc → spdlog/7251ead404dccd824789f8f3a13df2a6fb56440c/spdlog/src/bundled_fmtlib_format.cpp}

@@ -1,11 +1,14 @@
-// Formatting library for C++
-//
+// Slightly modified version of fmt lib's format.cc source file.
 // Copyright (c) 2012 - 2016, Victor Zverovich
 // All rights reserved.
-//
-// For the license information refer to format.h.
 
-#include "fmt/format-inl.h"
+#ifndef SPDLOG_COMPILED_LIB
+    #error Please define SPDLOG_COMPILED_LIB to compile this file.
+#endif
+
+#if !defined(SPDLOG_FMT_EXTERNAL) && !defined(SPDLOG_USE_STD_FORMAT)
+
+    #include <spdlog/fmt/bundled/format-inl.h>
 
 FMT_BEGIN_NAMESPACE
 namespace detail {
@@ -41,3 +44,5 @@ template FMT_API void buffer<wchar_t>::append(const wchar_t*, const wchar_t*);
 
 }  // namespace detail
 FMT_END_NAMESPACE
+
+#endif  // !SPDLOG_FMT_EXTERNAL

data/ext/couchbase/CMakeLists.txt

@@ -21,7 +21,7 @@ endif()
 
 project(
   couchbase_cxx_client
-  VERSION "1.0.3"
+  VERSION "1.0.5"
   LANGUAGES CXX C)
 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}")
@@ -76,6 +76,8 @@ include(cmake/OpenSSL.cmake)
 
 include(cmake/VersionInfo.cmake)
 
+include(cmake/RPath.cmake)
+
 add_subdirectory(core/platform)
 set(couchbase_cxx_client_FILES
     ${CMAKE_CURRENT_BINARY_DIR}/generated/mozilla_ca_bundle.cxx
@@ -513,7 +515,6 @@ foreach(TARGET ${couchbase_cxx_client_LIBRARIES})
     ${TARGET}
     PRIVATE project_options
             project_warnings
-            fmt::fmt
             spdlog::spdlog
             Microsoft.GSL::GSL
             asio

data/ext/couchbase/cmake/APKBUILD.in

@@ -0,0 +1,54 @@
+# Contributor: Couchbase SDK Team <support@couchbase.com>
+# Maintainer: Couchbase SDK Team <support@couchbase.com>
+
+pkgname=couchbase-cxx-client
+pkgver=@COUCHBASE_CXX_CLIENT_PACKAGE_VERSION@
+pkgrel=1
+_number_of_commits=@COUCHBASE_CXX_CLIENT_NUMBER_OF_COMMITS@
+if [ "${_number_of_commits}" -gt 0 ]; then
+	pkgver="${pkgver}_p${_number_of_commits}"
+fi
+source="${pkgname}-${pkgver}.tar.gz"
+pkgdesc="Couchbase C++ SDK"
+url="https://docs.couchbase.com/cxx-sdk/current/hello-world/overview.html"
+arch="all"
+license="Apache-2.0"
+depends=""
+makedepends="
+	linux-headers
+	cmake
+	ninja
+"
+subpackages="${pkgname}-dev ${pkgname}-tools"
+options="!check"
+
+unpack() {
+	(cd "${srcdir}"; tar -xzf "${source}" --strip-components=1)
+}
+
+build() {
+	cmake -B apk-build -S "${srcdir}" -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DBUILD_SHARED_LIBS=OFF \
+		-DCOUCHBASE_CXX_CLIENT_PKGCONFIG_VERSION="${pkgver}" \
+		-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
+	cmake --build apk-build
+}
+
+tools() {
+	pkgdesc="${pkgdesc} (tools)"
+	depends="${pkgname}=${pkgver}-r${pkgrel}"
+
+	amove usr/bin
+}
+
+package() {
+	DESTDIR="${pkgdir}" cmake --install apk-build
+}

data/ext/couchbase/cmake/Backtrace.cmake

@@ -29,7 +29,9 @@ if(HAVE_DLADDR)
 endif()
 
 if(HAVE_BACKTRACE OR HAVE_DLADDR)
-  target_compile_options(project_options INTERFACE -ggdb3)
+  if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+    target_compile_options(project_options INTERFACE -ggdb3)
+  endif()
   target_link_libraries(project_options INTERFACE -rdynamic)
   add_definitions(-D_GNU_SOURCE=1)
 endif()

data/ext/couchbase/cmake/CPM.cmake

@@ -1,4 +1,4 @@
-set(CPM_DOWNLOAD_VERSION 0.38.6)
+set(CPM_DOWNLOAD_VERSION 0.40.5)
 
 if(CPM_SOURCE_CACHE)
   set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")

data/ext/couchbase/cmake/CompilerWarnings.cmake

@@ -70,11 +70,6 @@ function(set_project_warnings project_name)
   )
 
   set(CLANG_WARNINGS ${COMMON_WARNINGS})
-  if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL "17.0.0")
-    set(CLANG_WARNINGS ${CLANG_WARNINGS} -Wshadow # warn the user if a variable declaration shadows one from a parent
-                                                  # context
-    )
-  endif()
 
   if(MSVC)
     set(PROJECT_WARNINGS ${MSVC_WARNINGS})

data/ext/couchbase/cmake/Packaging.cmake

@@ -4,6 +4,7 @@ include(CMakePackageConfigHelpers)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/couchbase DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 install(FILES LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR})
 
+set(COUCHBASE_CXX_CLIENT_PKGCONFIG_VERSION "${COUCHBASE_CXX_CLIENT_SEMVER}" CACHE STRING "The version to use in couchbase_cxx_client.pc")
 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)
@@ -40,9 +41,13 @@ set(COUCHBASE_CXX_CLIENT_MANIFEST "${PROJECT_BINARY_DIR}/packaging/MANIFEST")
 if(APPLE)
   find_program(TAR gtar)
   find_program(SED gsed)
+  find_program(XARGS gxargs)
+  find_program(CP gcp)
 else()
   find_program(TAR tar)
   find_program(SED sed)
+  find_program(XARGS xargs)
+  find_program(CP cp)
 endif()
 
 add_custom_command(
@@ -85,12 +90,12 @@ add_custom_command(
     -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
+    ${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 {}
+  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
@@ -107,6 +112,116 @@ add_custom_command(
 
 add_custom_target(packaging_tarball DEPENDS ${COUCHBASE_CXX_CLIENT_TARBALL})
 
+option(COUCHBASE_CXX_CLIENT_DEB_TARGETS "Enable targets for building DEBs" FALSE)
+if(COUCHBASE_CXX_CLIENT_DEB_TARGETS)
+  find_program(DPKG_BUILDPACKAGE dpkg-buildpackage REQUIRED) # apt install -y dpkg-dev
+  find_program(SUDO sudo REQUIRED) # apt install -y sudo
+  find_program(COWBUILDER cowbuilder REQUIRED) # apt install -y cowbuilder
+
+  string(TIMESTAMP COUCHBASE_CXX_CLIENT_DEB_DATE "%a, %d %b %Y %H:%M:%S %z" UTC)
+
+  file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/packaging/workspace/debian/source/")
+
+  set(COUCHBASE_CXX_CLIENT_DEBIAN_CHANGELOG "${PROJECT_BINARY_DIR}/packaging/workspace/debian/changelog")
+  configure_file(${PROJECT_SOURCE_DIR}/cmake/debian/changelog.in "${COUCHBASE_CXX_CLIENT_DEBIAN_CHANGELOG}" @ONLY)
+
+  file(COPY ${PROJECT_SOURCE_DIR}/cmake/debian/compat ${PROJECT_SOURCE_DIR}/cmake/debian/control
+            ${PROJECT_SOURCE_DIR}/cmake/debian/rules DESTINATION "${PROJECT_BINARY_DIR}/packaging/workspace/debian/")
+  file(COPY ${PROJECT_SOURCE_DIR}/cmake/debian/source/format
+       DESTINATION "${PROJECT_BINARY_DIR}/packaging/workspace/debian/source/")
+
+  set(COUCHBASE_CXX_CLIENT_DEBIAN_ORIG_TARBALL
+      "${PROJECT_BINARY_DIR}/packaging/couchbase-cxx-client_${COUCHBASE_CXX_CLIENT_PACKAGE_VERSION}.orig.tar.gz")
+  add_custom_command(
+    OUTPUT ${COUCHBASE_CXX_CLIENT_DEBIAN_ORIG_TARBALL}
+    WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/packaging"
+    COMMAND ${CMAKE_COMMAND} -E copy "${COUCHBASE_CXX_CLIENT_TARBALL}" "${COUCHBASE_CXX_CLIENT_DEBIAN_ORIG_TARBALL}"
+    DEPENDS ${COUCHBASE_CXX_CLIENT_TARBALL})
+
+  set(COUCHBASE_CXX_CLIENT_DEBIAN_TARBALL_EXTRACTED "${PROJECT_BINARY_DIR}/packaging/tarball_extracted.txt")
+  add_custom_command(
+    OUTPUT ${COUCHBASE_CXX_CLIENT_DEBIAN_TARBALL_EXTRACTED}
+    WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/packaging/workspace"
+    COMMAND ${TAR} --strip-components=1 -xf "${COUCHBASE_CXX_CLIENT_TARBALL}"
+    COMMAND touch ${COUCHBASE_CXX_CLIENT_DEBIAN_TARBALL_EXTRACTED}
+    DEPENDS ${COUCHBASE_CXX_CLIENT_TARBALL})
+
+  set(COUCHBASE_CXX_CLIENT_DEBIAN_DSC
+      "${PROJECT_BINARY_DIR}/packaging/couchbase-cxx-client_${COUCHBASE_CXX_CLIENT_PACKAGE_VERSION}-${COUCHBASE_CXX_CLIENT_PACKAGE_RELEASE}.dsc"
+  )
+  add_custom_command(
+    OUTPUT ${COUCHBASE_CXX_CLIENT_DEBIAN_DSC}
+    WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/packaging/workspace"
+    COMMAND ${DPKG_BUILDPACKAGE} -us -uc
+    DEPENDS ${COUCHBASE_CXX_CLIENT_DEBIAN_ORIG_TARBALL} ${COUCHBASE_CXX_CLIENT_DEBIAN_TARBALL_EXTRACTED})
+
+  function(select_mirror_options distro options)
+    if(${distro} STREQUAL "bookworm")
+      set(${options}
+          --components
+          main
+          --mirror
+          https://ftp.debian.org/debian
+          PARENT_SCOPE)
+    else()
+      if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
+        set(${options}
+            --components
+            "main universe"
+            --mirror
+            http://ports.ubuntu.com/ubuntu-ports
+            PARENT_SCOPE)
+      else()
+        set(${options}
+            --components
+            "main universe"
+            --mirror
+            http://archive.ubuntu.com/ubuntu
+            PARENT_SCOPE)
+      endif()
+    endif()
+  endfunction()
+
+  set(cowbuilder_results "${PROJECT_BINARY_DIR}/packaging/results")
+  file(MAKE_DIRECTORY "${cowbuilder_results}")
+
+  list(
+    APPEND
+    COUCHBASE_CXX_CLIENT_SUPPORTED_DISTROS
+    "jammy"
+    "noble"
+    "bookworm")
+
+  set(cowbuilder_root "${PROJECT_BINARY_DIR}/packaging/root.cow")
+  set(last_output "")
+  foreach(distro ${COUCHBASE_CXX_CLIENT_SUPPORTED_DISTROS})
+    select_mirror_options(${distro} mirror_options)
+    set(timestamp "${PROJECT_BINARY_DIR}/packaging/${distro}_done.txt")
+    set(dependencies ${COUCHBASE_CXX_CLIENT_DEBIAN_DSC})
+
+    if(last_output)
+      list(APPEND dependencies ${last_output})
+    endif()
+
+    add_custom_command(
+      COMMENT "Building DEB for ${distro}"
+      OUTPUT ${timestamp}
+      WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/packaging"
+      COMMAND ${SUDO} ${CMAKE_COMMAND} -E rm -rf "${cowbuilder_root}"
+      COMMAND ${SUDO} ${COWBUILDER} --create --basepath "${cowbuilder_root}" --distribution ${distro} ${mirror_options}
+      COMMAND
+        ${SUDO} ${COWBUILDER} --build --basepath "${cowbuilder_root}" --buildresult
+        "${cowbuilder_results}/couchbase-cxx-client-${COUCHBASE_CXX_CLIENT_PACKAGE_VERSION}-${COUCHBASE_CXX_CLIENT_PACKAGE_RELEASE}.${distro}.${CMAKE_SYSTEM_PROCESSOR}"
+        --debbuildopts -j8 --debbuildopts "-us -uc" ${COUCHBASE_CXX_CLIENT_DEBIAN_DSC}
+      COMMAND touch ${timestamp}
+      DEPENDS ${dependencies})
+
+    set(last_output ${timestamp})
+  endforeach()
+
+  add_custom_target(packaging_deb DEPENDS ${last_output})
+endif()
+
 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
@@ -132,25 +247,26 @@ if(COUCHBASE_CXX_CLIENT_RPM_TARGETS)
 
   add_custom_target(packaging_srpm DEPENDS ${COUCHBASE_CXX_CLIENT_SRPM})
 
-  list(APPEND COUCHBASE_CXX_CLIENT_SUPPORTED_ROOTS
+  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}"
-  )
+    "fedora-41-${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
+  # 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)
+    if(last_output)
       list(APPEND dependencies ${last_output})
     endif()
 
@@ -158,8 +274,8 @@ if(COUCHBASE_CXX_CLIENT_RPM_TARGETS)
       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 ${MOCK} --rebuild --root=${root} --resultdir=${PROJECT_BINARY_DIR}/packaging/rpm/${root}
+              "${COUCHBASE_CXX_CLIENT_SRPM}"
       COMMAND touch ${timestamp}
       DEPENDS ${dependencies})
 
@@ -169,3 +285,50 @@ if(COUCHBASE_CXX_CLIENT_RPM_TARGETS)
   # add target that depends on the last root
   add_custom_target(packaging_rpm DEPENDS ${last_output})
 endif()
+
+option(COUCHBASE_CXX_CLIENT_APK_TARGETS "Enable targets for building APKs (for Alpine Linux)" FALSE)
+if(COUCHBASE_CXX_CLIENT_APK_TARGETS)
+  find_program(ABUILD abuild REQUIRED) # apk add alpine-sdk
+
+  set(COUCHBASE_CXX_CLIENT_TARBALL_NAME_ALPINE "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}")
+  set(COUCHBASE_CXX_CLIENT_TARBALL_ALPINE
+      "${PROJECT_BINARY_DIR}/packaging/${COUCHBASE_CXX_CLIENT_TARBALL_NAME_ALPINE}.tar.gz")
+  if(${COUCHBASE_CXX_CLIENT_NUMBER_OF_COMMITS} GREATER 0)
+    set(COUCHBASE_CXX_CLIENT_TARBALL_NAME_ALPINE
+        "couchbase-cxx-client-${COUCHBASE_CXX_CLIENT_PACKAGE_VERSION}_p${COUCHBASE_CXX_CLIENT_NUMBER_OF_COMMITS}")
+    set(COUCHBASE_CXX_CLIENT_TARBALL_ALPINE
+        "${PROJECT_BINARY_DIR}/packaging/${COUCHBASE_CXX_CLIENT_TARBALL_NAME_ALPINE}.tar.gz")
+  endif()
+
+  set(cxxcbc_apkbuild_file "${PROJECT_BINARY_DIR}/packaging/APKBUILD")
+  configure_file(${PROJECT_SOURCE_DIR}/cmake/APKBUILD.in "${cxxcbc_apkbuild_file}" @ONLY)
+
+  if(NOT
+     "${COUCHBASE_CXX_CLIENT_TARBALL}"
+     STREQUAL
+     "${COUCHBASE_CXX_CLIENT_TARBALL_ALPINE}")
+    add_custom_command(
+      OUTPUT ${COUCHBASE_CXX_CLIENT_TARBALL_ALPINE}
+      WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/packaging"
+      COMMAND ${CMAKE_COMMAND} -E copy "${COUCHBASE_CXX_CLIENT_TARBALL}" "${COUCHBASE_CXX_CLIENT_TARBALL_ALPINE}"
+      DEPENDS ${COUCHBASE_CXX_CLIENT_TARBALL})
+  endif()
+
+  set(cxxcbc_apkbuild_checksum "${PROJECT_BINARY_DIR}/packaging/apk_checksum_updated.txt")
+  add_custom_command(
+    OUTPUT ${cxxcbc_apkbuild_checksum}
+    WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/packaging"
+    COMMAND ${ABUILD} checksum
+    COMMAND touch ${cxxcbc_apkbuild_checksum}
+    DEPENDS ${COUCHBASE_CXX_CLIENT_TARBALL_ALPINE} ${cxxcbc_apkbuild_file})
+
+  set(cxxcbc_apkbuild_timestamp "${PROJECT_BINARY_DIR}/packaging/apk_timestamp.txt")
+  add_custom_command(
+    OUTPUT ${cxxcbc_apkbuild_timestamp}
+    WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/packaging"
+    COMMAND ${ABUILD} -r
+    COMMAND touch ${cxxcbc_apkbuild_timestamp}
+    DEPENDS ${COUCHBASE_CXX_CLIENT_TARBALL_ALPINE} ${cxxcbc_apkbuild_checksum})
+
+  add_custom_target(packaging_apk DEPENDS ${cxxcbc_apkbuild_timestamp})
+endif()

data/ext/couchbase/cmake/RPath.cmake

@@ -0,0 +1,10 @@
+if(NOT MSVC)
+  if(APPLE)
+    set(CMAKE_MACOSX_RPATH ON)
+  endif()
+  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
+  list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" isSystemDir)
+  if("${isSystemDir}" STREQUAL "-1")
+    set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+  endif()
+endif()

data/ext/couchbase/cmake/Testing.cmake

@@ -55,7 +55,6 @@ macro(integration_test name)
     Microsoft.GSL::GSL
     asio
     taocpp::json
-    fmt::fmt
     spdlog::spdlog
     test_utils)
   if(COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL)
@@ -101,7 +100,6 @@ macro(transaction_test name)
     asio
     taocpp::json
     spdlog::spdlog
-    fmt::fmt
     ${couchbase_cxx_client_DEFAULT_LIBRARY}
     test_utils)
   if(COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL)
@@ -146,7 +144,6 @@ macro(unit_test name)
     asio
     taocpp::json
     spdlog::spdlog
-    fmt::fmt
     ${couchbase_cxx_client_DEFAULT_LIBRARY}
     test_utils)
   if(COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL)
@@ -193,7 +190,6 @@ macro(integration_benchmark name)
     asio
     taocpp::json
     spdlog::spdlog
-    fmt::fmt
     ${couchbase_cxx_client_DEFAULT_LIBRARY}
     test_utils)
   if(COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL)

data/ext/couchbase/cmake/ThirdPartyDependencies.cmake

@@ -2,6 +2,8 @@
 
 include(cmake/CPM.cmake)
 
+set(CPM_USE_LOCAL_PACKAGES OFF)
+
 # https://cmake.org/cmake/help/v3.28/policy/CMP0063.html
 set(CMAKE_POLICY_DEFAULT_CMP0063 NEW)
 
@@ -15,36 +17,13 @@ function(declare_system_library target)
                                              $<TARGET_PROPERTY:${target},INTERFACE_INCLUDE_DIRECTORIES>)
 endfunction()
 
-if(NOT TARGET fmt::fmt)
-  # https://github.com/fmtlib/fmt/releases
-  cpmaddpackage(
-    NAME
-    fmt
-    GIT_TAG
-    11.0.1
-    VERSION
-    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"
-    "BUILD_SHARED_LIBS OFF"
-    "CMAKE_C_VISIBILITY_PRESET hidden"
-    "CMAKE_CXX_VISIBILITY_PRESET hidden"
-    "CMAKE_POSITION_INDEPENDENT_CODE ON")
-endif()
-
 if(NOT TARGET spdlog::spdlog)
   # https://github.com/gabime/spdlog/releases
   cpmaddpackage(
     NAME
     spdlog
     VERSION
-    1.14.1
+    1.15.0
     GITHUB_REPOSITORY
     "gabime/spdlog"
     EXCLUDE_FROM_ALL ON
@@ -54,8 +33,11 @@ if(NOT TARGET spdlog::spdlog)
     "CMAKE_C_VISIBILITY_PRESET hidden"
     "CMAKE_CXX_VISIBILITY_PRESET hidden"
     "CMAKE_POSITION_INDEPENDENT_CODE ON"
+    "NO_CMAKE_SYSTEM_PATH ON"
+    "NO_CMAKE_INSTALL_PREFIX ON"
+    "NO_CMAKE_SYSTEM_PACKAGE_REGISTRY ON"
     "SPDLOG_BUILD_SHARED OFF"
-    "SPDLOG_FMT_EXTERNAL ON")
+    "SPDLOG_FMT_EXTERNAL OFF")
 endif()
 
 if(NOT TARGET Microsoft.GSL::GSL)
@@ -246,6 +228,5 @@ declare_system_library(llhttp::llhttp)
 declare_system_library(hdr_histogram_static)
 declare_system_library(Microsoft.GSL::GSL)
 declare_system_library(spdlog::spdlog)
-declare_system_library(fmt::fmt)
 declare_system_library(asio)
 declare_system_library(taocpp::json)

data/ext/couchbase/cmake/VersionInfo.cmake

@@ -58,6 +58,7 @@ string(REGEX REPLACE "T.*" "" COUCHBASE_CXX_CLIENT_BUILD_DATE "${COUCHBASE_CXX_C
 set(COUCHBASE_CXX_CLIENT_SEMVER "${couchbase_cxx_client_VERSION}")
 set(COUCHBASE_CXX_CLIENT_PACKAGE_VERSION "${couchbase_cxx_client_VERSION}")
 set(COUCHBASE_CXX_CLIENT_PACKAGE_RELEASE "${couchbase_cxx_client_BUILD_NUMBER}")
+set(COUCHBASE_CXX_CLIENT_NUMBER_OF_COMMITS 0)
 if(COUCHBASE_CXX_CLIENT_GIT_DESCRIBE MATCHES
    "^([0-9]+\\.[0-9]+\\.[0-9]+)(-([a-zA-Z0-9\\.]+))?(-([0-9]+)-g([a-zA-Z0-9]+))?$")
   set(COUCHBASE_CXX_CLIENT_SEMVER "${CMAKE_MATCH_1}")
@@ -67,6 +68,7 @@ if(COUCHBASE_CXX_CLIENT_GIT_DESCRIBE MATCHES
     set(COUCHBASE_CXX_CLIENT_PACKAGE_RELEASE "${CMAKE_MATCH_3}.${couchbase_cxx_client_BUILD_NUMBER}")
   endif()
   if(CMAKE_MATCH_5 AND CMAKE_MATCH_5 GREATER 0) # number_of_commits.build_number.sha1
+    set(COUCHBASE_CXX_CLIENT_NUMBER_OF_COMMITS ${CMAKE_MATCH_5})
     set(COUCHBASE_CXX_CLIENT_SEMVER
         "${COUCHBASE_CXX_CLIENT_SEMVER}+${CMAKE_MATCH_5}.${couchbase_cxx_client_BUILD_NUMBER}.${CMAKE_MATCH_6}")
     if(CMAKE_MATCH_3) # pre-release
@@ -78,6 +80,8 @@ if(COUCHBASE_CXX_CLIENT_GIT_DESCRIBE MATCHES
   endif()
 endif()
 
+set(COUCHBASE_CXX_CLIENT_WRAPPER_UNIFIED_ID "" CACHE STRING "Unified ID for wrapper SDK formatted as '<name>/<version>'")
+
 configure_file(${PROJECT_SOURCE_DIR}/cmake/build_version.hxx.in
                ${PROJECT_BINARY_DIR}/generated/couchbase/build_version.hxx @ONLY)
 configure_file(${PROJECT_SOURCE_DIR}/cmake/build_config.hxx.in

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

@@ -32,5 +32,6 @@ constexpr auto COUCHBASE_CXX_CLIENT_VERSION_BUILD = @couchbase_cxx_client_BUILD_
 constexpr auto COUCHBASE_CXX_CLIENT_GIT_REVISION = "@COUCHBASE_CXX_CLIENT_GIT_REVISION@";
 constexpr auto COUCHBASE_CXX_CLIENT_GIT_REVISION_SHORT = "@COUCHBASE_CXX_CLIENT_GIT_REVISION_SHORT@";
 constexpr auto COUCHBASE_CXX_CLIENT_GIT_DESCRIBE = "@COUCHBASE_CXX_CLIENT_GIT_DESCRIBE@";
+constexpr auto COUCHBASE_CXX_CLIENT_WRAPPER_UNIFIED_ID = "@COUCHBASE_CXX_CLIENT_WRAPPER_UNIFIED_ID@";
 #cmakedefine COUCHBASE_CXX_CLIENT_STATIC_STDLIB 1
 #cmakedefine COUCHBASE_CXX_CLIENT_STATIC_OPENSSL 1

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

@@ -30,13 +30,13 @@ Source0: @COUCHBASE_CXX_CLIENT_TARBALL_NAME@.tar.gz
 This is the client and protocol library for Couchbase project.
 
 %package tools
-Summary: Couchbase C++ SDK - Tools
+Summary: Couchbase C++ SDK, command line 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
+Summary: Couchbase C++ SDK, development files
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description devel
 Development files for the Couchbase C++ SDK.

data/ext/couchbase/cmake/couchbase_cxx_client.pc.in

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

data/ext/couchbase/core/agent_config.cxx

@@ -15,7 +15,7 @@
 
 #include "agent_config.hxx"
 
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <string>
 

data/ext/couchbase/core/agent_group_config.cxx

@@ -15,7 +15,7 @@
 
 #include "agent_group_config.hxx"
 
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <string>
 

data/ext/couchbase/core/bucket.cxx

@@ -52,8 +52,8 @@
 #include <asio/io_context.hpp>
 #include <asio/post.hpp>
 #include <asio/ssl/context.hpp>
-#include <fmt/format.h>
 #include <gsl/span>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <algorithm>
 #include <chrono>
@@ -225,8 +225,8 @@ public:
     return {};
   }
 
-  auto direct_re_queue(const std::shared_ptr<mcbp::queue_request>& req,
-                       bool is_retry) -> std::error_code
+  auto direct_re_queue(const std::shared_ptr<mcbp::queue_request>& req, bool is_retry)
+    -> std::error_code
   {
     auto handle_error = [is_retry, req](std::error_code ec) {
       // We only want to log an error on retries if the error isn't cancelled.
@@ -281,8 +281,8 @@ public:
     return {};
   }
 
-  auto backoff_and_retry(const std::shared_ptr<mcbp::queue_request>& request,
-                         retry_reason reason) -> bool
+  auto backoff_and_retry(const std::shared_ptr<mcbp::queue_request>& request, retry_reason reason)
+    -> bool
   {
     auto action = retry_orchestrator::should_retry(request, reason);
     auto retried = action.need_to_retry();
@@ -314,8 +314,8 @@ public:
     return {};
   }
 
-  [[nodiscard]] auto server_by_vbucket(std::uint16_t vbucket,
-                                       std::size_t node_index) -> std::optional<std::size_t>
+  [[nodiscard]] auto server_by_vbucket(std::uint16_t vbucket, std::size_t node_index)
+    -> std::optional<std::size_t>
   {
     const std::scoped_lock lock(config_mutex_);
     if (config_) {
@@ -1141,8 +1141,8 @@ bucket::direct_dispatch(std::shared_ptr<mcbp::queue_request> req) -> std::error_
 }
 
 auto
-bucket::direct_re_queue(const std::shared_ptr<mcbp::queue_request>& req,
-                        bool is_retry) -> std::error_code
+bucket::direct_re_queue(const std::shared_ptr<mcbp::queue_request>& req, bool is_retry)
+  -> std::error_code
 {
   return impl_->direct_re_queue(req, is_retry);
 }