This is an automated email from the ASF dual-hosted git repository.
xyz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pulsar-client-cpp.git
The following commit(s) were added to refs/heads/main by this push:
new 11e32c6 Bump dependencies to latest versions for CVEs (#540)
11e32c6 is described below
commit 11e32c6f2ff1f22d7a22ef68c3ddc6216df70512
Author: Yunze Xu <[email protected]>
AuthorDate: Wed Mar 4 10:51:24 2026 +0800
Bump dependencies to latest versions for CVEs (#540)
---
.github/workflows/ci-pr-validation.yaml | 71 +++++++++++++++++++++++++--------
CMakeLists.txt | 12 ++++++
LegacyFindPackages.cmake | 56 +++++++++++++++++++++++---
build-support/merge_archives.sh | 1 +
build-support/merge_archives_vcpkg.sh | 11 ++++-
lib/CMakeLists.txt | 55 +++++++++++++++++++++++--
lib/CurlWrapper.h | 9 ++---
lib/MessageBuilder.cc | 6 +--
lib/MessageImpl.cc | 6 +--
pkg/mac/build-static-library.sh | 19 +--------
pkg/mac/vcpkg-curl-patch.diff | 28 -------------
pkg/rpm/Dockerfile | 3 +-
vcpkg | 2 +-
vcpkg.json | 34 +++++++---------
14 files changed, 205 insertions(+), 108 deletions(-)
diff --git a/.github/workflows/ci-pr-validation.yaml
b/.github/workflows/ci-pr-validation.yaml
index 29026e6..8d14e7d 100644
--- a/.github/workflows/ci-pr-validation.yaml
+++ b/.github/workflows/ci-pr-validation.yaml
@@ -90,6 +90,13 @@ jobs:
fetch-depth: 0
submodules: recursive
+ - name: Restore vcpkg installed cache
+ uses: actions/cache@v4
+ with:
+ path: build/vcpkg_installed
+ key: vcpkg-${{ runner.os }}-${{ hashFiles('vcpkg.json',
'CMakeLists.txt', 'vcpkg-triplets/**') }}
+ restore-keys: vcpkg-${{ runner.os }}-
+
- name: Build the project
run: |
cmake -B build -DINTEGRATE_VCPKG=ON -DBUILD_TESTS=ON
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
@@ -117,6 +124,15 @@ jobs:
fetch-depth: 0
submodules: recursive
+ - name: Restore vcpkg installed cache
+ uses: actions/cache@v4
+ with:
+ path: |
+ build/vcpkg_installed
+ build-boost-asio/vcpkg_installed
+ key: vcpkg-${{ runner.os }}-${{ hashFiles('vcpkg.json',
'CMakeLists.txt', 'vcpkg-triplets/**') }}
+ restore-keys: vcpkg-${{ runner.os }}-
+
- name: Build core libraries
run: |
cmake -B build -DINTEGRATE_VCPKG=ON -DBUILD_TESTS=OFF
@@ -154,8 +170,8 @@ jobs:
- name: Verify custom vcpkg installation
run: |
- mv vcpkg /tmp/
- cmake -B build-2 -DINTEGRATE_VCPKG=ON
-DCMAKE_TOOLCHAIN_FILE="/tmp/vcpkg/scripts/buildsystems/vcpkg.cmake"
+ mv vcpkg /tmp/vcpkg-custom
+ cmake -B build-2 -DINTEGRATE_VCPKG=ON
-DCMAKE_TOOLCHAIN_FILE="/tmp/vcpkg-custom/scripts/buildsystems/vcpkg.cmake"
cpp20-build:
name: Build with the C++20 standard
@@ -206,31 +222,45 @@ jobs:
arch: '-A Win32'
steps:
- - name: checkout
- uses: actions/checkout@v3
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
- name: Restore vcpkg and its artifacts.
- uses: actions/cache@v3
+ uses: actions/cache@v4
id: vcpkg-cache
+ continue-on-error: true
with:
path: |
- ${{ env.VCPKG_ROOT }}
- vcpkg_installed
- !${{ env.VCPKG_ROOT }}/.git
- !${{ env.VCPKG_ROOT }}/buildtrees
- !${{ env.VCPKG_ROOT }}/packages
- !${{ env.VCPKG_ROOT }}/downloads
- key: |
- ${{ runner.os }}-${{ matrix.triplet}}-${{ hashFiles( 'vcpkg.json'
) }}
+ ${{ github.workspace }}/vcpkg_installed
+ ${{ env.VCPKG_ROOT }}/downloads
+ ${{ env.VCPKG_ROOT }}/vcpkg.exe
+ key: ${{ runner.os }}-${{ matrix.triplet }}-vcpkg-${{
hashFiles('vcpkg.json') }}
+ restore-keys: |
+ ${{ runner.os }}-${{ matrix.triplet }}-vcpkg-
+ save-always: true
- name: Get vcpkg(windows)
if: ${{ runner.os == 'Windows' && steps.vcpkg-cache.outputs.cache-hit
!= 'true' }}
+ shell: pwsh
run: |
cd ${{ github.workspace }}
- mkdir build -force
- git clone https://github.com/Microsoft/vcpkg.git
- cd vcpkg
- .\bootstrap-vcpkg.bat
+ mkdir build -Force
+ # If vcpkg.exe already exists, skip bootstrapping to save time and
avoid
+ # modifying the checked-out vcpkg directory.
+ if (Test-Path "${{ github.workspace }}\\vcpkg\\vcpkg.exe") {
+ Write-Host "vcpkg.exe present — skipping bootstrap"
+ } else {
+ if (Test-Path vcpkg) {
+ # If vcpkg was checked out as a submodule it may be shallow;
fetch full history
+ git -C vcpkg fetch --unshallow || true
+ } else {
+ git clone https://github.com/Microsoft/vcpkg.git
+ }
+ Push-Location vcpkg
+ .\bootstrap-vcpkg.bat
+ Pop-Location
+ }
- name: remove system vcpkg(windows)
if: runner.os == 'Windows'
@@ -355,6 +385,13 @@ jobs:
fetch-depth: 0
submodules: recursive
+ - name: Restore vcpkg installed cache
+ uses: actions/cache@v4
+ with:
+ path: build-osx/vcpkg_installed
+ key: vcpkg-${{ runner.os }}-arm64-${{ hashFiles('vcpkg.json',
'CMakeLists.txt', 'vcpkg-triplets/**') }}
+ restore-keys: vcpkg-${{ runner.os }}-arm64-
+
- name: Build libraries
run: ./pkg/mac/build-static-library.sh
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a0bd91..b4f66c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,6 +127,7 @@ if (INTEGRATE_VCPKG)
find_package(ZLIB REQUIRED)
find_package(OpenSSL REQUIRED)
find_package(protobuf CONFIG REQUIRED)
+ find_package(absl CONFIG REQUIRED)
find_package(zstd CONFIG REQUIRED)
find_package(Snappy CONFIG REQUIRED)
set(COMMON_LIBS CURL::libcurl
@@ -134,6 +135,17 @@ if (INTEGRATE_VCPKG)
OpenSSL::SSL
OpenSSL::Crypto
protobuf::libprotobuf
+ absl::base
+ absl::log
+ absl::log_internal_message
+ absl::log_internal_check_op
+ absl::status
+ absl::statusor
+ absl::strings
+ absl::str_format
+ absl::time
+ absl::synchronization
+ absl::cord
$<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>
Snappy::snappy
)
diff --git a/LegacyFindPackages.cmake b/LegacyFindPackages.cmake
index 3fa78d6..d799e7d 100644
--- a/LegacyFindPackages.cmake
+++ b/LegacyFindPackages.cmake
@@ -23,6 +23,22 @@ if (VCPKG_TRIPLET)
set(CMAKE_PREFIX_PATH
"${PROJECT_SOURCE_DIR}/vcpkg_installed/${VCPKG_TRIPLET}")
message(STATUS "Use CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
set(PROTOC_PATH "${CMAKE_PREFIX_PATH}/tools/protobuf/protoc")
+ if (MSVC)
+ # vcpkg host tools (protoc, etc.) are always built for the host machine
+ # architecture (x64 on GitHub Actions), regardless of the target
triplet.
+ # Use find_program to locate protoc.exe across known host tool paths.
+ find_program(PROTOC_PATH NAMES protoc.exe
+ PATHS
+
"${PROJECT_SOURCE_DIR}/vcpkg_installed/x64-windows/tools/protobuf"
+
"${PROJECT_SOURCE_DIR}/vcpkg_installed/arm64-windows/tools/protobuf"
+
"${PROJECT_SOURCE_DIR}/vcpkg_installed/${VCPKG_TRIPLET}/tools/protobuf"
+ NO_DEFAULT_PATH)
+ if (NOT PROTOC_PATH)
+ set(PROTOC_PATH "${CMAKE_PREFIX_PATH}/tools/protobuf/protoc.exe")
+ endif ()
+ # Set the cache variable so protobuf's CMake module compatibility shim
finds it
+ set(Protobuf_PROTOC_EXECUTABLE "${PROTOC_PATH}" CACHE FILEPATH "protoc
executable" FORCE)
+ endif ()
message(STATUS "Use protoc: ${PROTOC_PATH}")
set(VCPKG_ROOT "${PROJECT_SOURCE_DIR}/vcpkg_installed/${VCPKG_TRIPLET}")
set(VCPKG_DEBUG_ROOT "${VCPKG_ROOT}/debug")
@@ -51,6 +67,10 @@ if (APPLE AND NOT LINK_STATIC)
# The latest Protobuf dependency on macOS requires the C++17 support and
# it could only be found by the CONFIG mode
set(LATEST_PROTOBUF TRUE)
+elseif (MSVC AND VCPKG_TRIPLET)
+ # protobuf >= 6.x on Windows with vcpkg requires CONFIG mode to resolve
+ # the protobuf::libprotobuf CMake target and its abseil dependencies
+ set(LATEST_PROTOBUF TRUE)
else ()
set(LATEST_PROTOBUF FALSE)
endif ()
@@ -83,8 +103,13 @@ message("OPENSSL_INCLUDE_DIR: " ${OPENSSL_INCLUDE_DIR})
message("OPENSSL_LIBRARIES: " ${OPENSSL_LIBRARIES})
if (LATEST_PROTOBUF)
- # See https://github.com/apache/arrow/issues/35987
- add_definitions(-DPROTOBUF_USE_DLLS)
+ if (NOT LINK_STATIC)
+ # Only needed when protobuf itself is a DLL; static builds must NOT
define this
+ # because it marks symbols as __declspec(dllimport), causing LNK2019
when
+ # linking against a static libprotobuf.lib.
+ # See https://github.com/apache/arrow/issues/35987
+ add_definitions(-DPROTOBUF_USE_DLLS)
+ endif ()
# Use Config mode to avoid FindProtobuf.cmake does not find the Abseil
library
find_package(Protobuf REQUIRED CONFIG)
else ()
@@ -127,8 +152,10 @@ if (LINK_STATIC AND NOT VCPKG_TRIPLET)
add_definitions(-DCURL_STATICLIB)
endif()
elseif (LINK_STATIC AND VCPKG_TRIPLET)
- find_package(Protobuf REQUIRED)
- message(STATUS "Found protobuf static library: " ${Protobuf_LIBRARIES})
+ if (NOT LATEST_PROTOBUF)
+ find_package(Protobuf REQUIRED)
+ message(STATUS "Found protobuf static library: " ${Protobuf_LIBRARIES})
+ endif ()
if (MSVC AND (${CMAKE_BUILD_TYPE} STREQUAL Debug))
find_library(ZLIB_LIBRARIES NAMES zlibd)
else ()
@@ -264,8 +291,8 @@ if (MSVC)
wldap32.lib
Normaliz.lib)
if (LINK_STATIC)
- # add external dependencies of libcurl
- set(COMMON_LIBS ${COMMON_LIBS} ws2_32.lib crypt32.lib)
+ # add external dependencies of libcurl (iphlpapi for if_nametoindex)
+ set(COMMON_LIBS ${COMMON_LIBS} ws2_32.lib crypt32.lib iphlpapi.lib)
# the default compile options have /MD, which cannot be used to build
DLLs that link static libraries
string(REGEX REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG
${CMAKE_CXX_FLAGS_DEBUG})
string(REGEX REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE
${CMAKE_CXX_FLAGS_RELEASE})
@@ -279,6 +306,23 @@ if (MSVC)
message(STATUS "CMAKE_CXX_FLAGS_RELEASE: " ${CMAKE_CXX_FLAGS_RELEASE})
message(STATUS "CMAKE_CXX_FLAGS_RELWITHDEBINFO: "
${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
endif ()
+ if (VCPKG_TRIPLET)
+ # protobuf >= 6.x requires abseil; link it explicitly since MSVC static
+ # linking does not resolve transitive dependencies automatically
+ find_package(absl CONFIG REQUIRED)
+ set(COMMON_LIBS ${COMMON_LIBS}
+ absl::base
+ absl::log
+ absl::log_internal_message
+ absl::log_internal_check_op
+ absl::status
+ absl::statusor
+ absl::strings
+ absl::str_format
+ absl::time
+ absl::synchronization
+ absl::cord)
+ endif ()
else()
set(COMMON_LIBS ${COMMON_LIBS} m)
endif()
diff --git a/build-support/merge_archives.sh b/build-support/merge_archives.sh
index 065130d..85916ac 100755
--- a/build-support/merge_archives.sh
+++ b/build-support/merge_archives.sh
@@ -45,6 +45,7 @@ for ITEM in $ITEMS; do
cd ..
done
+rm -f $MERGED_LIBRARY
ar -qc $MERGED_LIBRARY $LIBS
diff --git a/build-support/merge_archives_vcpkg.sh
b/build-support/merge_archives_vcpkg.sh
index 73c445f..bc70012 100755
--- a/build-support/merge_archives_vcpkg.sh
+++ b/build-support/merge_archives_vcpkg.sh
@@ -27,12 +27,19 @@ if [[ $# -lt 1 ]]; then
fi
CMAKE_BUILD_DIRECTORY=$1
+
+# libprotoc.a is the protobuf compiler (protoc) tool library, not the runtime.
+# It pulls in google::protobuf::compiler::java::* and absl debugging/VDSO
symbols
+# that are not needed by client code and cannot be satisfied without
additional deps.
+# libprotobuf-lite.a is a subset of libprotobuf.a and causes duplicate symbols.
+EXCLUDE_PATTERN="libprotoc.a\|libprotobuf-lite.a"
+
if [[ $VCPKG_TRIPLET ]]; then
./merge_archives.sh $CMAKE_BUILD_DIRECTORY/libpulsarwithdeps.a \
$CMAKE_BUILD_DIRECTORY/lib/libpulsar.a \
- $(find "$CMAKE_BUILD_DIRECTORY/vcpkg_installed/$VCPKG_TRIPLET" -name
"*.a" | grep -v debug)
+ $(find "$CMAKE_BUILD_DIRECTORY/vcpkg_installed/$VCPKG_TRIPLET" -name
"*.a" | grep -v '/debug/' | grep -v "$EXCLUDE_PATTERN")
else
./merge_archives.sh $CMAKE_BUILD_DIRECTORY/libpulsarwithdeps.a \
$CMAKE_BUILD_DIRECTORY/lib/libpulsar.a \
- $(find "$CMAKE_BUILD_DIRECTORY/vcpkg_installed" -name "*.a" | grep -v
debug)
+ $(find "$CMAKE_BUILD_DIRECTORY/vcpkg_installed" -name "*.a" | grep -v
'/debug/' | grep -v "$EXCLUDE_PATTERN")
fi
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index e34555d..b877560 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -140,12 +140,59 @@ if (LINK_STATIC AND BUILD_STATIC_LIB)
add_library(pulsarStaticWithDeps STATIC ${PULSAR_SOURCES})
target_include_directories(pulsarStaticWithDeps PRIVATE
${dlfcn-win32_INCLUDE_DIRS})
- if (CMAKE_BUILD_TYPE STREQUAL "Debug")
- remove_libtype("${COMMON_LIBS}" "optimized" STATIC_LIBS)
+ if (VCPKG_TRIPLET)
+ # Collect ALL vcpkg-installed static archives so every transitive
dependency
+ # (protobuf, abseil, curl, zlib, etc.) is merged into the fat lib
without
+ # requiring manual enumeration of individual targets.
+ set(_vcpkg_dir
"${PROJECT_SOURCE_DIR}/vcpkg_installed/${VCPKG_TRIPLET}")
+ file(GLOB _release_libs "${_vcpkg_dir}/lib/*.lib")
+ file(GLOB _debug_libs "${_vcpkg_dir}/debug/lib/*.lib")
+ # Exclude the protobuf compiler tool and lite runtime (not needed
at runtime)
+ foreach (_excl "libprotoc" "libprotobuf-lite")
+ list(FILTER _release_libs EXCLUDE REGEX "/${_excl}\\.lib$")
+ list(FILTER _debug_libs EXCLUDE REGEX "/${_excl}\\.lib$")
+ endforeach ()
+ # Build per-lib generator expressions to select debug vs release
archive
+ # for multi-config generators (Visual Studio).
+ set(_vcpkg_static_libs "")
+ foreach (_rlib IN LISTS _release_libs)
+ get_filename_component(_libname "${_rlib}" NAME)
+ set(_dlib "${_vcpkg_dir}/debug/lib/${_libname}")
+ if (EXISTS "${_dlib}")
+ list(APPEND _vcpkg_static_libs
"$<IF:$<CONFIG:Debug>,${_dlib},${_rlib}>")
+ else ()
+ list(APPEND _vcpkg_static_libs "${_rlib}")
+ endif ()
+ endforeach ()
+ # Also merge Windows system DLL import libs so pulsarWithDeps.lib
is fully
+ # self-contained. lib.exe carries the import records into the
archive; the
+ # final linker then resolves DLL deps without the user listing
them.
+ # lib.exe finds these by name via the LIB env var set up by
MSBuild/MSVC.
+ list(APPEND _vcpkg_static_libs
+ ws2_32.lib crypt32.lib wldap32.lib Normaliz.lib iphlpapi.lib)
+ set_property(TARGET pulsarStaticWithDeps PROPERTY
STATIC_LIBRARY_OPTIONS ${_vcpkg_static_libs})
else ()
- remove_libtype("${COMMON_LIBS}" "debug" STATIC_LIBS)
+ # Non-vcpkg MSVC static build: resolve COMMON_LIBS entries for
lib.exe.
+ # CMake imported target names cannot be passed to lib.exe
directly; replace
+ # them with $<TARGET_FILE:...> generator expressions.
+ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+ remove_libtype("${COMMON_LIBS}" "optimized" STATIC_LIBS)
+ else ()
+ remove_libtype("${COMMON_LIBS}" "debug" STATIC_LIBS)
+ endif ()
+ set(RESOLVED_STATIC_LIBS "")
+ foreach (LIB IN LISTS STATIC_LIBS)
+ if (TARGET ${LIB})
+ get_target_property(_LIB_TYPE ${LIB} TYPE)
+ if (_LIB_TYPE STREQUAL "STATIC_LIBRARY" OR _LIB_TYPE
STREQUAL "UNKNOWN_LIBRARY")
+ list(APPEND RESOLVED_STATIC_LIBS
"$<TARGET_FILE:${LIB}>")
+ endif ()
+ elseif (IS_ABSOLUTE "${LIB}" AND LIB MATCHES "\\.(lib|a)$")
+ list(APPEND RESOLVED_STATIC_LIBS "${LIB}")
+ endif ()
+ endforeach ()
+ set_property(TARGET pulsarStaticWithDeps PROPERTY
STATIC_LIBRARY_OPTIONS ${RESOLVED_STATIC_LIBS})
endif ()
- set_property(TARGET pulsarStaticWithDeps PROPERTY
STATIC_LIBRARY_OPTIONS ${STATIC_LIBS})
set_property(TARGET pulsarStaticWithDeps PROPERTY OUTPUT_NAME
${LIB_NAME}WithDeps)
set_property(TARGET pulsarStaticWithDeps PROPERTY VERSION
${LIBRARY_VERSION})
install(TARGETS pulsarStaticWithDeps DESTINATION lib)
diff --git a/lib/CurlWrapper.h b/lib/CurlWrapper.h
index 749a79c..d6b5df3 100644
--- a/lib/CurlWrapper.h
+++ b/lib/CurlWrapper.h
@@ -21,16 +21,11 @@
#include <assert.h>
#include <curl/curl.h>
+#include <mutex>
#include <string>
namespace pulsar {
-struct CurlInitializer {
- CurlInitializer() { curl_global_init(CURL_GLOBAL_ALL); }
- ~CurlInitializer() { curl_global_cleanup(); }
-};
-static CurlInitializer curlInitializer;
-
class CurlWrapper {
public:
CurlWrapper() noexcept {}
@@ -47,6 +42,8 @@ class CurlWrapper {
// It must be called before calling other methods
bool init() {
+ static std::once_flag initFlag;
+ std::call_once(initFlag, [] { curl_global_init(CURL_GLOBAL_ALL); });
handle_ = curl_easy_init();
return handle_ != nullptr;
}
diff --git a/lib/MessageBuilder.cc b/lib/MessageBuilder.cc
index ae56d10..a9e61d4 100644
--- a/lib/MessageBuilder.cc
+++ b/lib/MessageBuilder.cc
@@ -149,11 +149,11 @@ MessageBuilder&
MessageBuilder::setReplicationClusters(const std::vector<std::st
MessageBuilder& MessageBuilder::disableReplication(bool flag) {
checkMetadata();
- google::protobuf::RepeatedPtrField<std::string> r;
+ google::protobuf::RepeatedPtrField<std::string>* replicateTo =
impl_->metadata.mutable_replicate_to();
+ replicateTo->Clear();
if (flag) {
- r.AddAllocated(new std::string("__local__"));
+ replicateTo->Add("__local__");
}
- r.Swap(impl_->metadata.mutable_replicate_to());
return *this;
}
diff --git a/lib/MessageImpl.cc b/lib/MessageImpl.cc
index 17239a8..cfc573a 100644
--- a/lib/MessageImpl.cc
+++ b/lib/MessageImpl.cc
@@ -61,11 +61,11 @@ void MessageImpl::setReplicationClusters(const
std::vector<std::string>& cluster
}
void MessageImpl::disableReplication(bool flag) {
- google::protobuf::RepeatedPtrField<std::string> r;
+ google::protobuf::RepeatedPtrField<std::string>* replicateTo =
metadata.mutable_replicate_to();
+ replicateTo->Clear();
if (flag) {
- r.AddAllocated(new std::string("__local__"));
+ replicateTo->Add("__local__");
}
- r.Swap(metadata.mutable_replicate_to());
}
void MessageImpl::setProperty(const std::string& name, const std::string&
value) {
diff --git a/pkg/mac/build-static-library.sh b/pkg/mac/build-static-library.sh
index 9190b86..1209467 100755
--- a/pkg/mac/build-static-library.sh
+++ b/pkg/mac/build-static-library.sh
@@ -34,22 +34,6 @@ else
exit 1
fi
-# Apply the patch to support building libcurl with IPv6 disabled
-COMMIT_ID=$(grep "builtin-baseline" vcpkg.json | sed 's/"//g' | sed 's/,//' |
awk '{print $2}')
-cd vcpkg
-git reset --hard $COMMIT_ID
-git apply ../pkg/mac/vcpkg-curl-patch.diff
-git add ports/curl
-git commit -m "Disable IPv6 for macOS in curl"
-./bootstrap-vcpkg.sh
-./vcpkg x-add-version --all
-git add versions/
-git commit -m "Update version"
-COMMIT_ID=$(git log --pretty=oneline | head -n 1 | awk '{print $1}')
-cd ..
-sed -i.bak "s/.*builtin-baseline.*/ \"builtin-baseline\": \"$COMMIT_ID\",/"
vcpkg.json
-sed -i.bak "s/\"version>=\": \"8\.13\.0#1\"/\"version>=\": \"8.13.0#2\"/"
vcpkg.json
-
INSTALL_DIR=$PWD/pkg/mac/.install
set -x
cmake -B build-osx \
@@ -72,5 +56,6 @@ cp ./build-osx/libpulsarwithdeps.a $INSTALL_DIR/lib/
# Test the libraries
clang++ win-examples/example.cc -o dynamic.out -std=c++17 -arch $ARCH -I
$INSTALL_DIR/include -L $INSTALL_DIR/lib -Wl,-rpath $INSTALL_DIR/lib -lpulsar
./dynamic.out
-clang++ win-examples/example.cc -o static.out -std=c++17 -arch $ARCH -I
$INSTALL_DIR/include $INSTALL_DIR/lib/libpulsarwithdeps.a
+clang++ win-examples/example.cc -o static.out -std=c++17 -arch $ARCH -I
$INSTALL_DIR/include $INSTALL_DIR/lib/libpulsarwithdeps.a \
+ -framework CoreFoundation -framework SystemConfiguration
./static.out
diff --git a/pkg/mac/vcpkg-curl-patch.diff b/pkg/mac/vcpkg-curl-patch.diff
deleted file mode 100644
index c932fee..0000000
--- a/pkg/mac/vcpkg-curl-patch.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
-index 427bccb217..ddfd75d30f 100644
---- a/ports/curl/portfile.cmake
-+++ b/ports/curl/portfile.cmake
-@@ -62,6 +62,10 @@ if(VCPKG_TARGET_IS_WINDOWS)
- list(APPEND OPTIONS -DENABLE_UNICODE=ON)
- endif()
-
-+if(VCPKG_TARGET_IS_OSX)
-+ list(APPEND OPTIONS -DENABLE_IPV6=OFF)
-+endif()
-+
- vcpkg_find_acquire_program(PKGCONFIG)
-
- vcpkg_cmake_configure(
-diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json
-index 31955859d0..50e619b846 100644
---- a/ports/curl/vcpkg.json
-+++ b/ports/curl/vcpkg.json
-@@ -1,7 +1,7 @@
- {
- "name": "curl",
- "version": "8.13.0",
-- "port-version": 1,
-+ "port-version": 2,
- "description": "A library for transferring data with URLs",
- "homepage": "https://curl.se/";,
- "license": "curl AND ISC AND BSD-3-Clause",
diff --git a/pkg/rpm/Dockerfile b/pkg/rpm/Dockerfile
index 09635b4..d3475cf 100644
--- a/pkg/rpm/Dockerfile
+++ b/pkg/rpm/Dockerfile
@@ -38,4 +38,5 @@ RUN yum install -y cmake
RUN dnf --enablerepo=devel install -y ninja-build
# Dependencies when building OpenSSL
-RUN yum install -y perl-IPC-Cmd
+# OpenSSL 3.6.1 requires the Time::Piece Perl module (packaged separately on
EL8)
+RUN yum install -y perl-IPC-Cmd perl-Time-Piece
diff --git a/vcpkg b/vcpkg
index 0d9d468..62159a4 160000
--- a/vcpkg
+++ b/vcpkg
@@ -1 +1 @@
-Subproject commit 0d9d4684352ba8de70bdf251c6fc9a3c464fa12b
+Subproject commit 62159a45e18f3a9ac0548628dcaf74fcb60c6ff9
diff --git a/vcpkg.json b/vcpkg.json
index 5c40c19..3452492 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,8 +1,8 @@
{
"name": "pulsar-cpp",
- "version": "3.8.0",
+ "version": "4.1.0",
"description": "Pulsar C++ SDK",
- "builtin-baseline": "d6995a0cf3cafda5e9e52749fad075dd62bfd90c",
+ "builtin-baseline": "62159a45e18f3a9ac0548628dcaf74fcb60c6ff9",
"dependencies": [
{
"name": "asio",
@@ -13,15 +13,15 @@
},
{
"name": "boost-accumulators",
- "version>=": "1.88.0"
+ "version>=": "1.90.0#1"
},
{
"name": "boost-format",
- "version>=": "1.88.0"
+ "version>=": "1.90.0#1"
},
{
"name": "boost-property-tree",
- "version>=": "1.88.0"
+ "version>=": "1.90.0#1"
},
{
"name": "curl",
@@ -29,7 +29,7 @@
"features": [
"openssl"
],
- "version>=": "8.13.0#1"
+ "version>=": "8.18.0#1"
},
{
"name": "dlfcn-win32",
@@ -37,15 +37,15 @@
},
{
"name": "openssl",
- "version>=": "3.5.0"
+ "version>=": "3.6.1"
},
{
"name": "protobuf",
- "version>=": "3.21.12"
+ "version>=": "6.33.4#1"
},
{
"name": "snappy",
- "version>=": "1.1.10"
+ "version>=": "1.2.2"
},
{
"name": "zlib",
@@ -53,7 +53,7 @@
},
{
"name": "zstd",
- "version>=": "1.5.5"
+ "version>=": "1.5.7"
}
],
"features": {
@@ -62,7 +62,7 @@
"dependencies": [
{
"name": "boost-asio",
- "version>=": "1.88.0"
+ "version>=": "1.90.0#1"
}
]
},
@@ -71,7 +71,7 @@
"dependencies": [
{
"name": "boost-program-options",
- "version>=": "1.88.0"
+ "version>=": "1.90.0#1"
}
]
},
@@ -80,15 +80,9 @@
"dependencies": [
{
"name": "gtest",
- "version>=": "1.14.0"
+ "version>=": "1.17.0"
}
]
}
- },
- "overrides": [
- {
- "name": "protobuf",
- "version": "3.21.12"
- }
- ]
+ }
}
