couchbase 3.8.2 → 3.9.0

data/ext/couchbase/cmake/VersionInfo.cmake

@@ -47,6 +47,56 @@ if(NOT COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP)
   endif()
 endif()
 
+# SOURCE_DATE_EPOCH is the single, timezone-free anchor for every embedded date (the source
+# tarball mtime, the Debian changelog / RPM %changelog dates, and the .apk mtimes). It is derived
+# from the most recent tag's commit time (git %ct) -- or HEAD's commit time for an untagged commit
+# -- frozen into TarballRelease.cmake at tarball creation, and reused unchanged when packages are
+# later built from the tarball (which has no .git).
+# Use DEFINED/empty rather than truthiness: the valid epoch 0 (1970-01-01) is CMake-falsey and
+# would otherwise be treated as unset and overwritten, breaking reproducibility.
+if(NOT DEFINED COUCHBASE_CXX_CLIENT_SOURCE_DATE_EPOCH OR COUCHBASE_CXX_CLIENT_SOURCE_DATE_EPOCH STREQUAL "")
+  if(DEFINED ENV{SOURCE_DATE_EPOCH})
+    set(COUCHBASE_CXX_CLIENT_SOURCE_DATE_EPOCH "$ENV{SOURCE_DATE_EPOCH}")
+  elseif(GIT)
+    # Prefer the most recent tag's commit time; if no tag is reachable (untagged commit) fall back
+    # to HEAD's commit time -- still deterministic per commit -- rather than the wall clock.
+    execute_process(
+      COMMAND git describe --tags --abbrev=0 HEAD
+      WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+      RESULT_VARIABLE _sde_tag_result
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      OUTPUT_VARIABLE _sde_last_tag)
+    if(_sde_tag_result EQUAL 0)
+      set(_sde_ref "${_sde_last_tag}")
+    else()
+      set(_sde_ref "HEAD")
+    endif()
+    execute_process(
+      COMMAND git log --max-count=1 --no-patch --format=%ct ${_sde_ref}
+      WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      OUTPUT_VARIABLE COUCHBASE_CXX_CLIENT_SOURCE_DATE_EPOCH)
+  endif()
+  if(NOT DEFINED COUCHBASE_CXX_CLIENT_SOURCE_DATE_EPOCH OR COUCHBASE_CXX_CLIENT_SOURCE_DATE_EPOCH STREQUAL "")
+    string(TIMESTAMP COUCHBASE_CXX_CLIENT_SOURCE_DATE_EPOCH "%s" UTC)
+  endif()
+endif()
+
+# Fail early with an actionable message if the epoch is not a decimal integer: it is threaded
+# into tar (--mtime=@...), rpm/dpkg/abuild, and the rootless mock wrapper, where a bad value
+# would otherwise surface as a cryptic downstream error.
+if(NOT COUCHBASE_CXX_CLIENT_SOURCE_DATE_EPOCH MATCHES "^[0-9]+$")
+  message(FATAL_ERROR
+    "COUCHBASE_CXX_CLIENT_SOURCE_DATE_EPOCH must be a decimal integer (seconds since the Unix "
+    "epoch), but is '${COUCHBASE_CXX_CLIENT_SOURCE_DATE_EPOCH}'. Check the SOURCE_DATE_EPOCH "
+    "environment variable.")
+endif()
+
+# Anchor it in the environment so every string(TIMESTAMP ...) evaluated afterwards (here and in
+# Packaging.cmake) formats this frozen instant instead of the wall clock, and so child build tools
+# (dpkg-buildpackage, rpmbuild, abuild) that honor SOURCE_DATE_EPOCH inherit the same value.
+set(ENV{SOURCE_DATE_EPOCH} "${COUCHBASE_CXX_CLIENT_SOURCE_DATE_EPOCH}")
+
 string(REGEX REPLACE "T.*" "" COUCHBASE_CXX_CLIENT_BUILD_DATE "${COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP}")
 
 # set(couchbase_cxx_client_BUILD_NUMBER 142)

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

@@ -23,6 +23,7 @@
 #cmakedefine COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_SHA256 "@COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_SHA256@"
 #cmakedefine COUCHBASE_CXX_CLIENT_BORINGSSL_SHA "@COUCHBASE_CXX_CLIENT_BORINGSSL_SHA@"
 #cmakedefine COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL
-#cmakedefine COUCHBASE_CXX_CLIENT_COLUMNAR
+#cmakedefine COUCHBASE_CXX_CLIENT_BUILD_COUCHBASE2
 #cmakedefine COUCHBASE_CXX_CLIENT_CREATE_OPERATION_SPAN_IN_CORE
 #cmakedefine COUCHBASE_CXX_CLIENT_BUILD_OPENTELEMETRY
+

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

@@ -1,3 +1,36 @@
+# Reproducibility: derive SOURCE_DATE_EPOCH from the (frozen) %changelog date and clamp file
+# mtimes to it, and pin the recorded build host, so RPMs are byte-identical across build machines.
+# These are redhat-rpm-config knobs, effective on Fedora/EL9+ (and on by default there); we set
+# them explicitly so the intent is applied wherever supported. On toolchains that predate them or
+# do not implement them (e.g. EL8, Amazon Linux) an
+# unrecognized global macro is simply ignored, so mtime/buildhost reproducibility is not guaranteed
+# there.
+%global source_date_epoch_from_changelog 1
+%global clamp_mtime_to_source_date_epoch 1
+%global _buildhost couchbase-reproducible-build
+
+# gRPC support gate (grpc_supported).
+#
+# gRPC, Protobuf, Abseil, re2 and c-ares are built from source (cmake/GrpcProtobuf.cmake) and
+# embedded statically, so this gate no longer tracks what the distribution packages. Linking the
+# platform's gRPC would pull in the platform's OpenSSL alongside the BoringSSL this package already
+# links statically -- two TLS stacks in one address space -- and would couple the build to the
+# distribution's protobuf version. Neither is acceptable for a redistributable binary, so the
+# packages are not installed and the from-source path is the only one taken.
+#
+# What the gate now tracks is whether the toolchain has been verified to compile gRPC v1.65.5 and
+# the Abseil it vendors. EL8 (gcc 8) is excluded because that combination is untested there, not
+# because of a known incompatibility -- gRPC itself only asks for cxx_std_14. EL8 already opts out
+# of OpenTelemetry below for related toolchain-age reasons. To add it, build the mock root and
+# confirm before flipping this test.
+#
+# The gate matches any Amazon Linux; the only amzn build root is amazonlinux-2023. A tighter
+# "amzn >= 2023" test is deliberately avoided: RPM's conditional expression parser treats the
+# leading-zero form (02023) as octal, so that comparison is false on AL2023.
+%if 0%{?fedora} > 0 || 0%{?rhel} >= 9 || 0%{?amzn}
+%global grpc_supported 1
+%endif
+
 Name: couchbase-cxx-client
 Summary: Couchbase C++ SDK
 Version: @COUCHBASE_CXX_CLIENT_PACKAGE_VERSION@
@@ -6,24 +39,26 @@ 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
-%if 0%{?suse_version} > 0
-BuildRequires: libcurl-devel
-BuildRequires: protobuf-devel
-BuildRequires: nlohmann_json-devel
-%else
+# OpenTelemetry's OTLP/HTTP exporter -- linked by cbc, not by the SDK library, which uses only the
+# header-only opentelemetry_api -- needs libcurl and nlohmann-json. curl is built from source here
+# and linked against this package's BoringSSL, so the platform's libcurl (and the OpenSSL behind it)
+# stays out of the picture entirely; only nlohmann-json, which is header-only and therefore
+# duplicates nothing, is taken from the distribution. Protobuf is deliberately absent: OpenTelemetry
+# reuses the protobuf that the from-source gRPC builds.
 %if 0%{?amzn} == 0 && (0%{?rhel} >= 9 || 0%{?fedora} > 0)
-BuildRequires: curl-devel
-BuildRequires: protobuf-devel
 BuildRequires: json-devel
 %else
 # CentOS 8 / Rocky 8 - skip these packages (no OpenTelemetry)
 %endif
+%if 0%{?grpc_supported}
+# gRPC links zlib, and it is the one gRPC dependency taken from the system
+# (gRPC_ZLIB_PROVIDER=package). zlib is a distribution shared library that other libraries loaded
+# alongside this one already use, so bundling gRPC's copy would add a second one rather than remove
+# a dependency. Previously satisfied only as a transitive dependency of grpc-devel, which is no
+# longer installed.
+BuildRequires: zlib-devel
 %endif
 Source0: @COUCHBASE_CXX_CLIENT_TARBALL_NAME@.tar.gz
 
@@ -36,39 +71,57 @@ Source0: @COUCHBASE_CXX_CLIENT_TARBALL_NAME@.tar.gz
 %description
 This is the client and protocol library for Couchbase project.
 
+# No dependency on the library package: cbc links the static library, because it needs protobuf in
+# its own right (through OpenTelemetry's OTLP exporter) and would otherwise load a second copy
+# alongside the one inside libcouchbase_cxx_client.so.
 %package tools
 Summary: Couchbase C++ SDK, command line tools
-Requires: %{name}%{?_isa} = %{version}-%{release}
 %description -n %{name}-tools
 CLI tools from the Couchbase C++ SDK.
 
+# zlib-devel because the installed CMake config for the static library emits find_dependency(ZLIB):
+# the archive carries gRPC objects that call it, and BuildRequires do not reach consumers.
 %package devel
 Summary: Couchbase C++ SDK, development files
 Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: zlib-devel
 %description devel
 Development files for the Couchbase C++ SDK.
 
+%if 0%{?grpc_supported}
+%package fit-performer
+Summary: Couchbase C++ SDK, FIT performer
+%description fit-performer
+FIT integration-test performer built against the Couchbase C++ SDK. It is
+packaged separately so that nothing depends on it automatically; install it on
+demand to run integration verification against the production SDK packages.
+%endif
+
 %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_PACKAGE_BUILD=ON \
     -DCOUCHBASE_CXX_CLIENT_BUILD_EXAMPLES=OFF \
     -DCOUCHBASE_CXX_CLIENT_BUILD_TESTS=OFF \
-%if 0%{?amzn} == 0 && (0%{?rhel} >= 9 || 0%{?fedora} > 0 || 0%{?suse_version} > 0)
+%if 0%{?amzn} == 0 && (0%{?rhel} >= 9 || 0%{?fedora} > 0)
     -DCOUCHBASE_CXX_CLIENT_BUILD_OPENTELEMETRY=ON \
 %else
     -DCOUCHBASE_CXX_CLIENT_BUILD_OPENTELEMETRY=OFF \
 %endif
     -DCOUCHBASE_CXX_CLIENT_BUILD_TOOLS=ON \
+%if 0%{?grpc_supported}
+    -DCOUCHBASE_CXX_CLIENT_BUILD_FIT_PERFORMER=ON \
+    -DCOUCHBASE_CXX_CLIENT_BUILD_COUCHBASE2=ON \
+%else
+    -DCOUCHBASE_CXX_CLIENT_BUILD_FIT_PERFORMER=OFF \
+    -DCOUCHBASE_CXX_CLIENT_BUILD_COUCHBASE2=OFF \
+%endif
     -DCOUCHBASE_CXX_CLIENT_BUILD_STATIC=ON \
     -DCOUCHBASE_CXX_CLIENT_BUILD_SHARED=ON
 
@@ -76,9 +129,6 @@ Development files for the Couchbase C++ SDK.
 %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
 
@@ -88,17 +138,33 @@ DESTDIR="%{buildroot}" /usr/bin/cmake --install "redhat-linux-build"
 %else
 %cmake_install
 %endif
-%if 0%{?suse_version} == 1500
-%__mv %{buildroot}%{_docdir}/../tao %{buildroot}%{_docdir}/tao
-%endif
+# The vendored gRPC installs its headers, pkg-config files and etc/roots.pem regardless of
+# gRPC_INSTALL. cmake/GrpcProtobuf.cmake redirects all of them under this one prefix so they can be
+# dropped together; nothing packaged here comes from it.
+rm -rf "%{buildroot}%{_prefix}/vendored-not-installed"
 
 %files
 %license %{_docdir}/couchbase*/LICENSE.txt
 %license %{_docdir}/tao/pegtl/LICENSE
 %license %{_docdir}/tao/json/LICENSE
+# Notices for the dependencies compiled into this binary. Vendoring moved them out of distribution
+# packages that carried their own terms, so the terms ship here instead. rpm permits several
+# subpackages to own these paths because each stages the identical file from one buildroot.
+%license %{_docdir}/couchbase*/third_party/*/*
 %{_libdir}/libcouchbase_cxx_client.so.*
 
+# The licence files are repeated here rather than inherited: this package no longer requires the
+# base package, and cbc carries the SDK and taocpp code inside the binary, so installing it alone
+# must still install the terms that code ships under. rpm accepts the same path in several
+# subpackages because every one of them stages the identical file out of the same buildroot.
 %files tools
+%license %{_docdir}/couchbase*/LICENSE.txt
+%license %{_docdir}/tao/pegtl/LICENSE
+%license %{_docdir}/tao/json/LICENSE
+# Notices for the dependencies compiled into this binary. Vendoring moved them out of distribution
+# packages that carried their own terms, so the terms ship here instead. rpm permits several
+# subpackages to own these paths because each stages the identical file from one buildroot.
+%license %{_docdir}/couchbase*/third_party/*/*
 %{_bindir}/cbc
 
 %files devel
@@ -110,6 +176,18 @@ DESTDIR="%{buildroot}" /usr/bin/cmake --install "redhat-linux-build"
 %{_libdir}/pkgconfig/couchbase_cxx_client.pc
 %{_libdir}/pkgconfig/couchbase_cxx_client_static.pc
 
+%if 0%{?grpc_supported}
+%files fit-performer
+%license %{_docdir}/couchbase*/LICENSE.txt
+%license %{_docdir}/tao/pegtl/LICENSE
+%license %{_docdir}/tao/json/LICENSE
+# Notices for the dependencies compiled into this binary. Vendoring moved them out of distribution
+# packages that carried their own terms, so the terms ship here instead. rpm permits several
+# subpackages to own these paths because each stages the identical file from one buildroot.
+%license %{_docdir}/couchbase*/third_party/*/*
+%{_bindir}/fit_performer
+%endif
+
 %changelog
 * @COUCHBASE_CXX_CLIENT_RPM_DATE@ Couchbase SDK Team <support@couchbase.com> - @COUCHBASE_CXX_CLIENT_PACKAGE_VERSION@-@COUCHBASE_CXX_CLIENT_PACKAGE_RELEASE@
 - Automated build.

data/ext/couchbase/cmake/couchbase_cxx_client_static-config.cmake.in

@@ -1,9 +1,16 @@
 @PACKAGE_INIT@
 
+include(CMakeFindDependencyMacro)
+@couchbase_cxx_client_static_FIND_DEPENDENCIES@
+
 add_library(couchbase_cxx_client::couchbase_cxx_client_static STATIC IMPORTED GLOBAL)
 
+# The archive holds every vendored dependency, but not the platform libraries their objects still
+# reference; see cmake/Packaging.cmake for which and why.
 set_target_properties(couchbase_cxx_client::couchbase_cxx_client_static PROPERTIES
   IMPORTED_LOCATION "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/libcouchbase_cxx_client_static.a"
+  INTERFACE_LINK_LIBRARIES "@couchbase_cxx_client_static_LINK_LIBRARIES@"
+  INTERFACE_LINK_OPTIONS "@couchbase_cxx_client_static_LINK_OPTIONS@"
 )
 
 set(COUCHBASE_CXX_CLIENT_STATIC_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@")

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

@@ -7,4 +7,6 @@ Name: couchbase_cxx_client_static-@COUCHBASE_CXX_CLIENT_PKGCONFIG_VERSION@
 Description: Couchbase C++ SDK (static)
 Version: @COUCHBASE_CXX_CLIENT_PKGCONFIG_VERSION@
 Libs: -L${libdir} -lcouchbase_cxx_client_static
+Requires.private: @couchbase_cxx_client_static_PC_REQUIRES_PRIVATE@
+Libs.private: @couchbase_cxx_client_static_PC_LIBS_PRIVATE@
 Cflags: -I${includedir}

data/ext/couchbase/cmake/gRPC_Generate.cmake

@@ -0,0 +1,58 @@
+function(GRPC_GENERATE_CPP SRCS HDRS DEST)
+  if(TARGET gRPC::grpc_cpp_plugin)
+    set(GRPC_CPP_PLUGIN $<TARGET_FILE:gRPC::grpc_cpp_plugin>)
+  else()
+    find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin)
+  endif()
+  if(NOT ARGN)
+    message(SEND_ERROR "Error: GRPC_GENERATE_CPP() called without any proto files")
+    return()
+  endif()
+
+  if(GRPC_GENERATE_CPP_APPEND_PATH)
+    # Create an include path for each file specified
+    foreach(FIL ${ARGN})
+      get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
+      get_filename_component(ABS_PATH ${ABS_FIL} PATH)
+      list(FIND _protobuf_include_path ${ABS_PATH} _contains_already)
+      if(${_contains_already} EQUAL -1)
+          list(APPEND _protobuf_include_path -I ${ABS_PATH})
+      endif()
+    endforeach()
+  else()
+    set(_protobuf_include_path -I ${CMAKE_CURRENT_SOURCE_DIR})
+  endif()
+
+  if(DEFINED PROTOBUF_IMPORT_DIRS)
+    foreach(DIR ${PROTOBUF_IMPORT_DIRS})
+      get_filename_component(ABS_PATH ${DIR} ABSOLUTE)
+      list(FIND _protobuf_include_path ${ABS_PATH} _contains_already)
+      if(${_contains_already} EQUAL -1)
+          list(APPEND _protobuf_include_path -I ${ABS_PATH})
+      endif()
+    endforeach()
+  endif()
+
+  set(${SRCS})
+  set(${HDRS})
+  foreach(FIL ${ARGN})
+    get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
+    get_filename_component(FIL_WLE ${FIL} NAME_WLE)
+
+    list(APPEND ${SRCS} "${DEST}/${FIL_WLE}.grpc.pb.cc")
+    list(APPEND ${HDRS} "${DEST}/${FIL_WLE}.grpc.pb.h")
+
+    add_custom_command(
+      OUTPUT "${DEST}/${FIL_WLE}.grpc.pb.cc"
+             "${DEST}/${FIL_WLE}.grpc.pb.h"
+      COMMAND protobuf::protoc
+      ARGS --grpc_out ${DEST} ${_protobuf_include_path} --plugin=protoc-gen-grpc=${GRPC_CPP_PLUGIN} ${ABS_FIL} --experimental_allow_proto3_optional
+      DEPENDS ${ABS_FIL} protobuf::protoc gRPC::grpc_cpp_plugin
+      COMMENT "Running C++ gRPC compiler (with --experimental_allow_proto3_optional) on ${FIL}"
+      VERBATIM )
+  endforeach()
+
+  set_source_files_properties(${${SRCS}} ${${HDRS}} PROPERTIES GENERATED TRUE)
+  set(${SRCS} ${${SRCS}} PARENT_SCOPE)
+  set(${HDRS} ${${HDRS}} PARENT_SCOPE)
+endfunction()

data/ext/couchbase/cmake/protobuf_Generate.cmake

@@ -0,0 +1,69 @@
+#
+# Generates C++ sources from the .proto files
+#
+# protobuf_generate_cpp (<SRCS> <HDRS> <DEST> [<ARGN>...])
+#
+#  SRCS - variable to define with autogenerated source files
+#  HDRS - variable to define with autogenerated header files
+#  DEST - directory where the source files will be created
+#  ARGN - .proto files
+#
+function(PROTOBUF_GENERATE_CPP_OPTIONAL SRCS HDRS DEST)
+  if(NOT ARGN)
+    message(SEND_ERROR "Error: PROTOBUF_GENERATE_CPP() called without any proto files")
+    return()
+  endif()
+
+  if(PROTOBUF_GENERATE_CPP_APPEND_PATH)
+    # Create an include path for each file specified
+    foreach(FIL ${ARGN})
+      get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
+      get_filename_component(ABS_PATH ${ABS_FIL} PATH)
+      list(FIND _protobuf_include_path ${ABS_PATH} _contains_already)
+      if(${_contains_already} EQUAL -1)
+          list(APPEND _protobuf_include_path -I ${ABS_PATH})
+      endif()
+    endforeach()
+  else()
+    set(_protobuf_include_path -I ${CMAKE_CURRENT_SOURCE_DIR})
+  endif()
+
+  if(DEFINED PROTOBUF_IMPORT_DIRS)
+    foreach(DIR ${PROTOBUF_IMPORT_DIRS})
+      get_filename_component(ABS_PATH ${DIR} ABSOLUTE)
+      list(FIND _protobuf_include_path ${ABS_PATH} _contains_already)
+      if(${_contains_already} EQUAL -1)
+          list(APPEND _protobuf_include_path -I ${ABS_PATH})
+      endif()
+    endforeach()
+  endif()
+
+  set(${SRCS})
+  set(${HDRS})
+  foreach(FIL ${ARGN})
+    get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
+    get_filename_component(FIL_WLE ${FIL} NAME_WLE)
+
+    list(APPEND ${SRCS} "${DEST}/${FIL_WLE}.pb.cc")
+    list(APPEND ${HDRS} "${DEST}/${FIL_WLE}.pb.h")
+
+    add_custom_command(
+      OUTPUT "${DEST}/${FIL_WLE}.pb.cc"
+             "${DEST}/${FIL_WLE}.pb.h"
+      COMMAND protobuf::protoc
+      ARGS --cpp_out ${DEST}  ${_protobuf_include_path} ${ABS_FIL} --experimental_allow_proto3_optional
+      DEPENDS ${ABS_FIL} protobuf::protoc
+      COMMENT "Running C++ protocol buffer compiler (with --experimental_allow_proto3_optional) on ${FIL}"
+      VERBATIM )
+  endforeach()
+
+  set_source_files_properties(${${SRCS}} ${${HDRS}} PROPERTIES GENERATED TRUE)
+  set(${SRCS} ${${SRCS}} PARENT_SCOPE)
+  set(${HDRS} ${${HDRS}} PARENT_SCOPE)
+endfunction()
+
+# By default have PROTOBUF_GENERATE_CPP macro pass -I to protoc
+# for each directory where a proto file is referenced.
+if(NOT DEFINED PROTOBUF_GENERATE_CPP_APPEND_PATH)
+  set(PROTOBUF_GENERATE_CPP_APPEND_PATH TRUE)
+endif()

data/ext/couchbase/cmake/require-git-checkout.cmake

@@ -0,0 +1,25 @@
+# Fail loudly, at the first step of any package build, if this is not a git
+# checkout. The source manifest is generated with `git ls-files`; a bare
+# jujutsu (jj) workspace has no .git, which would otherwise produce an empty
+# manifest and a silently broken (empty) source tarball.
+# Run via: cmake -P require-git-checkout.cmake  (cwd = source tree)
+# Distinguish "git missing" from "not a work tree" so each fails with an accurate message.
+find_program(_git_executable git)
+if(NOT _git_executable)
+  message(FATAL_ERROR
+    "git was not found in PATH. Package builds generate the source manifest with 'git ls-files', "
+    "so git must be installed.")
+endif()
+
+execute_process(
+  COMMAND "${_git_executable}" rev-parse --is-inside-work-tree
+  RESULT_VARIABLE _git_result
+  OUTPUT_QUIET
+  ERROR_QUIET)
+if(NOT _git_result EQUAL 0)
+  message(FATAL_ERROR
+    "Package builds require a git checkout: the source manifest is generated with "
+    "'git ls-files'. If you use jujutsu (jj), build packages from the co-located git "
+    "checkout (the workspace that has .git) or a git worktree -- not a bare jj workspace, "
+    "which has no .git.")
+endif()

data/ext/couchbase/cmake/tarball_glob.txt

@@ -27,6 +27,7 @@ cli11/*/cli11/single-include/CMakeLists.txt
 cli11/*/cli11/src/*
 cli11/*/cli11/src/**/*
 cpm/*.cmake
+fit_protocol/*/fit_protocol/operational/*.proto
 fmt/*/fmt/CMakeLists.txt
 fmt/*/fmt/ChangeLog.md
 fmt/*/fmt/LICENSE
@@ -100,3 +101,51 @@ opentelemetry/*/opentelemetry/**/LICENSE
 opentelemetry/*/opentelemetry/**/*.h
 opentelemetry/*/opentelemetry/**/*.cc
 opentelemetry/*/opentelemetry/third_party/opentelemetry-proto/opentelemetry/proto/**/*.proto
+grpc/*/grpc/CMakeLists.txt
+grpc/*/grpc/LICENSE
+grpc/*/grpc/NOTICE.txt
+grpc/*/grpc/**/CMakeLists.txt
+grpc/*/grpc/**/LICENSE*
+grpc/*/grpc/**/*.c
+grpc/*/grpc/**/*.cc
+grpc/*/grpc/**/*.h
+grpc/*/grpc/**/*.hpp
+grpc/*/grpc/**/*.h.in
+grpc/*/grpc/**/*.inc
+grpc/*/grpc/**/*.proto
+grpc/*/grpc/**/*.cmake
+grpc/*/grpc/**/*.cmake.in
+grpc/*/grpc/**/*.pc.in
+grpc/*/grpc/**/*.def
+grpc/*/grpc/**/*.map
+grpc/*/grpc/**/version.json
+grpc/*/grpc/**/README*
+grpc/*/grpc/etc/*.pem
+grpc/*/grpc/**/*.cmakein
+grpc/*/grpc/**/*.rc
+grpc/*/grpc/**/*.rc.in
+curl/*/curl/CMakeLists.txt
+curl/*/curl/COPYING*
+curl/*/curl/**/CMakeLists.txt
+curl/*/curl/CMake/*
+curl/*/curl/CMake/**/*
+# These are `find -wholename` patterns, in which `**/` still requires an intervening path segment:
+# it matches lib/vtls/openssl.c but NOT lib/urldata.c or the curl-config.in at the top of the tree.
+# Each extension therefore needs both spellings.
+curl/*/curl/*.c
+curl/*/curl/*.h
+curl/*/curl/*.in
+curl/*/curl/*.inc
+curl/*/curl/**/*.c
+curl/*/curl/**/*.h
+curl/*/curl/**/*.in
+curl/*/curl/**/*.inc
+curl/*/curl/*.rc
+curl/*/curl/**/*.rc
+curl/*/curl/**/*.cmake
+# Read by the install rules of curl from its source tree, so a tarball without it fails the install
+# step of every package build even though nothing links it.
+curl/*/curl/scripts/mk-ca-bundle.pl
+protostellar/*/protostellar/**/*.proto
+api_common_protos/*/api_common_protos/google/rpc/*.proto
+api_common_protos/*/api_common_protos/LICENSE*

data/ext/couchbase/core/agent_group.cxx

@@ -132,11 +132,7 @@ 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));
   }
@@ -225,11 +221,7 @@ 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));
 }

data/ext/couchbase/core/agent_group.hxx

@@ -70,11 +70,7 @@ 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,