From b1774d43e5871b84ceff74280c424472161c00d6 Mon Sep 17 00:00:00 2001
From: dann frazier <dann.frazier@chainguard.dev>
Date: Sat, 25 Jan 2025 18:42:54 +0000
Subject: [PATCH] libmamba: use semver tags

We were tracking the date-based tags, but these tags are not
always forward-moving. Switch to the semver tags instead.

Patch is adjusted for context, and a reference to its origin is added.

Signed-off-by: dann frazier <dann.frazier@chainguard.dev>
---
 libmamba.yaml                      | 15 +++++++++++----
 libmamba/support-shared-libs.patch | 11 ++++++++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/libmamba.yaml b/libmamba.yaml
index 1ca97de6118..080d83d2893 100644
--- a/libmamba.yaml
+++ b/libmamba.yaml
@@ -1,7 +1,7 @@
 package:
   name: libmamba
-  version: 2024.10.02
-  epoch: 3
+  version: 2.0.5
+  epoch: 0
   description: Cross-Platform Package Manager
   copyright:
     - license: BSD-3-Clause
@@ -57,9 +57,9 @@ environment:
 pipeline:
   - uses: git-checkout
     with:
-      expected-commit: 31b23473e059b47c03b065e5592ea5a7cf77fc9b
+      expected-commit: 4cbb3f7de08b75a5bffd50fd6b4bb79f0291dd42
       repository: https://github.com/mamba-org/mamba
-      tag: ${{package.version}}
+      tag: libmamba-${{package.version}}
 
   - uses: patch
     with:
@@ -165,8 +165,15 @@ subpackages:
 
 update:
   enabled: true
+  ignore-regex-patterns:
+    - .*alpha.*
+    - .*beta.*
+    - .*rc.*
   github:
     identifier: mamba-org/mamba
+    tag-filter-prefix: libmamba-
+    strip-prefix: libmamba-
+    use-tag: true
 
 test:
   environment:
diff --git a/libmamba/support-shared-libs.patch b/libmamba/support-shared-libs.patch
index 69129116193..7d527021119 100644
--- a/libmamba/support-shared-libs.patch
+++ b/libmamba/support-shared-libs.patch
@@ -1,8 +1,10 @@
+From: https://github.com/wolfi-dev/os/pull/29763#issuecomment-2463427683
+
 diff --git a/libmamba/CMakeLists.txt b/libmamba/CMakeLists.txt
-index 16716339..72dcfd1f 100644
+index 5fe133ce..7e9dcaf6 100644
 --- a/libmamba/CMakeLists.txt
 +++ b/libmamba/CMakeLists.txt
-@@ -445,171 +445,29 @@ macro(libmamba_create_target target_name linkage output_name)
+@@ -453,174 +453,29 @@ macro(libmamba_create_target target_name linkage output_name)
          SPDLOG_FMT_EXTERNAL "SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_${BUILD_LOG_LEVEL}"
      )
  
@@ -100,7 +102,7 @@ index 16716339..72dcfd1f 100644
 -            set(CMAKE_PREFIX_PATH "$ENV{VCPKG_ROOT}/installed/x64-windows-static-md/")
 -
 -            # For Windows we have a vcpkg based build system right now.
--            find_package(LibArchive REQUIRED)
+-            find_package(LibArchive MODULE REQUIRED)
 -            find_package(CURL CONFIG REQUIRED)
 -            find_library(LIBLZMA_LIBRARIES lzma REQUIRED)
 -            find_library(LZ4_LIBRARY NAMES lz4)
@@ -170,6 +172,9 @@ index 16716339..72dcfd1f 100644
 -                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)