couchbase 4.4.2 → 4.4.4

package/deps/couchbase-cxx-client/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(
@@ -62,6 +67,7 @@ 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\")
 ")
@@ -84,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
@@ -106,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
@@ -131,22 +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-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()
 
@@ -154,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})
 
@@ -165,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()

package/deps/couchbase-cxx-client/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()

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}")

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"
@@ -36,6 +58,7 @@ string(TIMESTAMP COUCHBASE_CXX_CLIENT_BUILD_DATE "%Y-%m-%d" UTC)
 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}")
@@ -45,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
@@ -56,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

package/deps/couchbase-cxx-client/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

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

@@ -1,3 +1,9 @@
+%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@
@@ -6,21 +12,31 @@ 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
+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.
@@ -28,6 +44,13 @@ 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 \
@@ -38,15 +61,32 @@ Development files for the Couchbase C++ SDK.
     -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 %{_docdir}/couchbase_cxx_client/LICENSE.txt
-%license %{_docdir}/tao/pegtl/LICENSE
-%license %{_docdir}/tao/json/LICENSE
+%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
@@ -62,4 +102,3 @@ Development files for the Couchbase C++ SDK.
 %changelog
 * @COUCHBASE_CXX_CLIENT_RPM_DATE@ Couchbase SDK Team <support@couchbase.com> - @COUCHBASE_CXX_CLIENT_PACKAGE_VERSION@-@COUCHBASE_CXX_CLIENT_PACKAGE_RELEASE@
 - Automated build.
-%{_libdir}/libcouchbase_cxx_client_static.a

package/deps/couchbase-cxx-client/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}

package/deps/couchbase-cxx-client/cmake/debian/changelog.in

@@ -0,0 +1,5 @@
+couchbase-cxx-client (@COUCHBASE_CXX_CLIENT_PACKAGE_VERSION@-@COUCHBASE_CXX_CLIENT_PACKAGE_RELEASE@) unstable; urgency=medium
+
+  * Automated build.
+
+ -- Couchbase SDK Team <support@couchbase.com>  @COUCHBASE_CXX_CLIENT_DEB_DATE@

package/deps/couchbase-cxx-client/cmake/debian/compat

@@ -0,0 +1 @@
+10

package/deps/couchbase-cxx-client/cmake/debian/control

@@ -0,0 +1,40 @@
+Source: couchbase-cxx-client
+Section: libs
+Priority: optional
+Maintainer: Couchbase SDK Team <support@couchbase.com>
+Build-Depends: debhelper (>= 9), cmake, pkg-config
+Standards-Version: 4.5.0
+Vcs-Browser: https://github.com/couchbase/couchbase-cxx-client
+Vcs-Git: https://github.com/couchbase/couchbase-cxx-client.git
+
+Package: couchbase-cxx-client
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Couchbase C++ SDK.
+ This is the client and protocol library for Couchbase project.
+
+Package: couchbase-cxx-client-tools
+Architecture: any
+Multi-Arch: same
+Section: utils
+Depends: couchbase-cxx-client (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: Couchbase C++ SDK, command line tools.
+ This is the command line tools for the client and protocol library for
+ Couchbase project.
+
+Package: couchbase-cxx-client-dev
+Architecture: any
+Multi-Arch: same
+Depends: couchbase-cxx-client (= ${binary:Version}), ${misc:Depends}
+Description: Couchbase C++ SDK, development files.
+ This is the development files for the client and protocol library for
+ Couchbase project.
+
+Package: couchbase-cxx-client-dbg
+Architecture: any
+Multi-Arch: same
+Depends: couchbase-cxx-client (= ${binary:Version}), ${misc:Depends}
+Description: Couchbase C++ SDK, debug symbols.
+ This is the debug symbols for the client and protocol library for Couchbase
+ project.

package/deps/couchbase-cxx-client/cmake/debian/rules

@@ -0,0 +1,41 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@ --buildsystem=cmake
+
+override_dh_strip:
+	dh_strip -pcouchbase-cxx-client-tools -pcouchbase-cxx-client --dbg-package=couchbase-cxx-client-dbg
+	dh_strip --remaining-packages
+
+override_dh_auto_configure:
+	echo "usr/include/couchbase" \
+		> debian/couchbase-cxx-client-dev.install
+	echo "usr/lib/$(DEB_HOST_MULTIARCH)/libcouchbase_cxx_client.so" \
+		>> debian/couchbase-cxx-client-dev.install
+	echo "usr/lib/$(DEB_HOST_MULTIARCH)/cmake" \
+		>> debian/couchbase-cxx-client-dev.install
+	echo "usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig" \
+		>> debian/couchbase-cxx-client-dev.install
+	echo "usr/bin/*" \
+		> debian/couchbase-cxx-client-tools.install
+	echo "usr/lib/$(DEB_HOST_MULTIARCH)/libcouchbase_cxx_client.so.*" \
+		> debian/couchbase-cxx-client.install
+	echo "usr/share/doc/tao/json/LICENSE" \
+		>> debian/couchbase-cxx-client.install
+	echo "usr/share/doc/tao/pegtl/LICENSE" \
+		>> debian/couchbase-cxx-client.install
+	echo "usr/share/doc/couchbase_cxx_client/LICENSE.txt" \
+		>> debian/couchbase-cxx-client.install
+	dh_auto_configure -- \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-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
+
+override_dh_auto_build:
+	dh_auto_build

package/deps/couchbase-cxx-client/cmake/debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

package/deps/couchbase-cxx-client/core/agent_group.cxx

@@ -132,7 +132,11 @@ public:
 
   auto free_form_http_request(const http_request& request,
                               free_form_http_request_callback&& callback)
+#ifdef COUCHBASE_CXX_CLIENT_COLUMNAR
+    -> tl::expected<std::shared_ptr<pending_operation>, error_union>
+#else
     -> tl::expected<std::shared_ptr<pending_operation>, std::error_code>
+#endif
   {
     return cluster_agent_.free_form_http_request(request, std::move(callback));
   }
@@ -221,7 +225,11 @@ agent_group::search_query(const search_query_options& options, search_query_call
 auto
 agent_group::free_form_http_request(const http_request& request,
                                     free_form_http_request_callback&& callback)
+#ifdef COUCHBASE_CXX_CLIENT_COLUMNAR
+  -> tl::expected<std::shared_ptr<pending_operation>, error_union>
+#else
   -> tl::expected<std::shared_ptr<pending_operation>, std::error_code>
+#endif
 {
   return impl_->free_form_http_request(request, std::move(callback));
 }

package/deps/couchbase-cxx-client/core/agent_group.hxx

@@ -70,7 +70,11 @@ public:
 
   auto free_form_http_request(const http_request& request,
                               free_form_http_request_callback&& callback)
+#ifdef COUCHBASE_CXX_CLIENT_COLUMNAR
+    -> tl::expected<std::shared_ptr<pending_operation>, error_union>;
+#else
     -> tl::expected<std::shared_ptr<pending_operation>, std::error_code>;
+#endif
 
   auto wait_until_ready(std::chrono::milliseconds timeout,
                         const wait_until_ready_options& options,