From 657232903cc662bf2d783931a96b1bdfc6b69fd0 Mon Sep 17 00:00:00 2001 From: dann frazier Date: Tue, 1 Apr 2025 14:55:53 +0000 Subject: [PATCH] curl,curl-rusttls: Establish libcurl-abi virtual package Allow only libcurl libraries built from the same upstream source version instead of only relying on SONAMEs. curl may pick up new symbols from a minor libcurl bump. https://github.com/chainguard-dev/internal-dev/issues/10381 This is take #2. The first attempt failed due to a resolver issue in apko that has now been.. resolved. Signed-off-by: dann frazier --- curl-rustls.yaml | 4 +++- curl.yaml | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/curl-rustls.yaml b/curl-rustls.yaml index 23e835982f3..25108bef78e 100644 --- a/curl-rustls.yaml +++ b/curl-rustls.yaml @@ -1,7 +1,7 @@ package: name: curl-rustls version: "8.12.1" - epoch: 2 + epoch: 3 description: "URL retrieval utility and library" copyright: - license: MIT @@ -67,6 +67,8 @@ subpackages: description: "curl library (rustls backend)" dependencies: provider-priority: 10 + provides: + - libcurl-abi=${{package.version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}"/usr/lib diff --git a/curl.yaml b/curl.yaml index b749eda5453..ea8474e5f38 100644 --- a/curl.yaml +++ b/curl.yaml @@ -1,10 +1,16 @@ package: name: curl version: "8.12.1" - epoch: 2 + epoch: 3 description: "URL retrieval utility and library" copyright: - license: MIT + dependencies: + runtime: + # Allow only libcurl libraries built from the same upstream + # source version instead of only relying on SONAMEs. + # https://github.com/chainguard-dev/internal-dev/issues/10381 + - libcurl-abi=${{package.version}} environment: contents: @@ -91,6 +97,8 @@ subpackages: # raise the priority here so this beats rustls # TODO: revert this to "5" once rustls is fixed. provider-priority: 15 + provides: + - libcurl-abi=${{package.version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}"/usr/lib