From 4944e1cb71cb3f89a6d50cb28649fa173876df38 Mon Sep 17 00:00:00 2001 From: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com> Date: Fri, 8 Aug 2025 16:55:30 +0000 Subject: [PATCH 1/3] libmamba/2.3.1 package update Signed-off-by: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com> --- libmamba.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libmamba.yaml b/libmamba.yaml index 46eb1692ef5..c22dcf20b8c 100644 --- a/libmamba.yaml +++ b/libmamba.yaml @@ -1,6 +1,6 @@ package: name: libmamba - version: 2.3.0 + version: "2.3.1" epoch: 0 description: Cross-Platform Package Manager copyright: @@ -59,7 +59,7 @@ environment: pipeline: - uses: git-checkout with: - expected-commit: 0ad2c5695c0f0d6b5429ba0812db2e473e314997 + expected-commit: 4185322d51cc58cbb2ad8dafcb28bfdabcf9bbe5 repository: https://github.com/mamba-org/mamba tag: ${{package.version}} From 6a8bb4cff061600fa62e6cc6f7dc09413ac5146c Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Mon, 11 Aug 2025 11:30:49 -0400 Subject: [PATCH 2/3] libmamba: refresh support-shared-libs.patch In addition to fixing its application, simplify the patch by keeping upstream's shared library definitions with their existing indentation: this should reduce the amount of manual intervention required in future. --- libmamba/support-shared-libs.patch | 80 ++++++------------------------ 1 file changed, 15 insertions(+), 65 deletions(-) diff --git a/libmamba/support-shared-libs.patch b/libmamba/support-shared-libs.patch index 7d527021119..56ca13210a5 100644 --- a/libmamba/support-shared-libs.patch +++ b/libmamba/support-shared-libs.patch @@ -1,10 +1,10 @@ From: https://github.com/wolfi-dev/os/pull/29763#issuecomment-2463427683 diff --git a/libmamba/CMakeLists.txt b/libmamba/CMakeLists.txt -index 5fe133ce..7e9dcaf6 100644 +index 582d82b..548e0f2 100644 --- a/libmamba/CMakeLists.txt +++ b/libmamba/CMakeLists.txt -@@ -453,174 +453,29 @@ macro(libmamba_create_target target_name linkage output_name) +@@ -470,146 +470,7 @@ macro(libmamba_create_target target_name linkage output_name) SPDLOG_FMT_EXTERNAL "SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_${BUILD_LOG_LEVEL}" ) @@ -101,6 +101,15 @@ index 5fe133ce..7e9dcaf6 100644 - - set(CMAKE_PREFIX_PATH "$ENV{VCPKG_ROOT}/installed/x64-windows-static-md/") - +- # TODO AND CONTEXT: We found a link error in libarchive which lacked a link to XmlLite +- # which is provided by Windows. libarchive has cmake scripts doing the necessary work to +- # link that library but for some reason we couldnt identify it is not linking in this +- # specific case (it was before but the version changed apparently). As a workaround we +- # manually link with that required library but a better solution would be to find why +- # libarchive doesnt do it itself. +- set(SYSTEM_PROVIDED_LIBRARIES XmlLite.lib) # required by libarchive +- set(ENABLE_WIN32_XMLLITE ON) +- - # For Windows we have a vcpkg based build system right now. - find_package(LibArchive MODULE REQUIRED) - find_package(CURL CONFIG REQUIRED) @@ -120,6 +129,7 @@ index 5fe133ce..7e9dcaf6 100644 - ${target_name} - PUBLIC - ${CRYPTO_LIBRARIES} +- ${SYSTEM_PROVIDED_LIBRARIES} - ${LibArchive_LIBRARY} - ${LIBXML2_LIBRARY} - ${ICONV_LIBRARY} @@ -138,67 +148,7 @@ index 5fe133ce..7e9dcaf6 100644 - include_directories($ENV{VCPKG_ROOT}/installed/x64-windows-static-md/include/) - endif() - else() -- message(" -> Dynamically linking against libmamba (shared) dependencies") -- -- mamba_target_check_type(yaml-cpp::yaml-cpp SHARED_LIBRARY WARNING) -- -- find_package(CURL REQUIRED) -- find_package(LibArchive REQUIRED) -- find_package(zstd REQUIRED) -- find_package(BZip2 REQUIRED) -- find_package(OpenSSL REQUIRED) -- -- target_link_libraries( -- ${target_name} -- PUBLIC -- ${LIBSOLV_LIBRARIES} -- ${LIBSOLVEXT_LIBRARIES} -- yaml-cpp::yaml-cpp -- fmt::fmt -- # Since conda-forge spdlog is built with a bundled version of fmt we use the header -- # only version to avoid chasing after the correct fmt version matching the one used -- # in the bundle -- spdlog::spdlog_header_only -- PRIVATE -- ${LibArchive_LIBRARIES} -- ${CURL_LIBRARIES} -- ${OPENSSL_LIBRARIES} -- BZip2::BZip2 -- reproc -- reproc++ -- simdjson::simdjson -- zstd::libzstd_shared -- solv::libsolv -- solv::libsolvext -- solv::cpp -- ) -- # CMake 3.17 provides a LibArchive::LibArchive target that could be used instead of -- # LIBRARIES/INCLUDE_DIRS -- target_include_directories(${target_name} PRIVATE "${LibArchive_INCLUDE_DIRS}") -- endif() -+ message(" -> Using shared libraries for libmamba dependencies") -+ find_package(CURL REQUIRED) -+ find_package(LibArchive REQUIRED) -+ find_package(zstd REQUIRED) -+ find_package(BZip2 REQUIRED) -+ find_package(OpenSSL REQUIRED) -+ -+ target_link_libraries( -+ ${target_name} -+ PUBLIC ${LIBSOLV_LIBRARIES} ${LIBSOLVEXT_LIBRARIES} yaml-cpp::yaml-cpp fmt::fmt spdlog::spdlog_header_only -+ PRIVATE -+ ${LibArchive_LIBRARIES} -+ ${CURL_LIBRARIES} -+ ${OPENSSL_LIBRARIES} -+ BZip2::BZip2 -+ reproc -+ reproc++ -+ simdjson::simdjson -+ zstd::libzstd_shared -+ solv::libsolv -+ solv::libsolvext -+ solv::cpp -+ ) ++ if(TRUE) + message(" -> Dynamically linking against libmamba (shared) dependencies") - if(WIN32) - find_path( + mamba_target_check_type(yaml-cpp::yaml-cpp SHARED_LIBRARY WARNING) From 55310ac471c32400a8eebf97d434ea048d1df227 Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Mon, 11 Aug 2025 11:32:54 -0400 Subject: [PATCH 3/3] libmamba: drop upstream-appled assert.patch --- libmamba.yaml | 1 - libmamba/assert.patch | 16 ---------------- 2 files changed, 17 deletions(-) delete mode 100644 libmamba/assert.patch diff --git a/libmamba.yaml b/libmamba.yaml index c22dcf20b8c..9da9a2100d6 100644 --- a/libmamba.yaml +++ b/libmamba.yaml @@ -67,7 +67,6 @@ pipeline: with: patches: | support-shared-libs.patch - assert.patch - uses: cmake/configure with: diff --git a/libmamba/assert.patch b/libmamba/assert.patch deleted file mode 100644 index ed49450793d..00000000000 --- a/libmamba/assert.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Fix issue with assert call? -Author: James Page - -diff --git a/libmamba/src/util/encoding.cpp b/libmamba/src/util/encoding.cpp -index 08033f3..b32a7aa 100644 ---- a/libmamba/src/util/encoding.cpp -+++ b/libmamba/src/util/encoding.cpp -@@ -5,6 +5,7 @@ - // The full license is in the file LICENSE, distributed with this software. - - #include -+#include - #include - #include - #include -