From a506f2f67282e85f0d9dd831cc1e8dedeb06206e Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Mon, 24 Aug 2026 09:40:56 -0400 Subject: [PATCH] import CS skopeo-1.23.0-1.el9 --- .gitignore | 2 +- .skopeo.metadata | 2 +- SPECS/skopeo.spec | 25 +++++++++++++++++++++---- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 212cbe4..6e889e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/skopeo-1.22.0-23dddaa.tar.gz +SOURCES/skopeo-1.23.0-9645b28.tar.gz diff --git a/.skopeo.metadata b/.skopeo.metadata index 154a420..caf4c1d 100644 --- a/.skopeo.metadata +++ b/.skopeo.metadata @@ -1 +1 @@ -06ebb83aa9f3b48104e29cd26025383a4dc85b9b SOURCES/skopeo-1.22.0-23dddaa.tar.gz +4f6cf1af4235d63e7a4048104b8c711d4dd9e85b SOURCES/skopeo-1.23.0-9645b28.tar.gz diff --git a/SPECS/skopeo.spec b/SPECS/skopeo.spec index 191fe18..5b818c0 100644 --- a/SPECS/skopeo.spec +++ b/SPECS/skopeo.spec @@ -10,7 +10,7 @@ %global gomodulesmode GO111MODULE=on #%%global branch release-1.21 -%global commit0 23dddaad3d8f86f8c1d3204646b14aa0da86a85e +%global commit0 9645b282ca2d8792235db5a3e142ea9ae2f0c63b %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # No btrfs on RHEL @@ -43,10 +43,10 @@ Epoch: %{conditional_epoch} # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.22.0 +Version: 1.23.0 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 -Release: 2%{?dist} +Release: 1%{?dist} %if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} %else @@ -157,6 +157,10 @@ make \ PREFIX=%{_prefix} \ install-binary install-docs install-completions +# system tests +install -d -p %{buildroot}/%{_datadir}/%{name}/test/system +cp -pav systemtest/* %{buildroot}/%{_datadir}/%{name}/test/system/ + #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -177,10 +181,23 @@ make \ %dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/_%{name} -# Only test dependencies installed, no files. %files tests +%license LICENSE vendor/modules.txt +%{_datadir}/%{name}/test %changelog +* Wed Jun 17 2026 Jindrich Novy - 2:1.23.0-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.23.0 +- Resolves: RHEL-185740 +* Thu Apr 23 2026 Jindrich Novy - 2:1.22.2-2 +- update to https://github.com/containers/skopeo/releases/tag/v1.22.2 +- re-add test file installation to fix tier0 tests +- Resolves: RHEL-170602 + +* Thu Apr 23 2026 Jindrich Novy - 2:1.22.2-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.22.2 +- Resolves: RHEL-170602 + * Mon Feb 23 2026 Jindrich Novy - 1:1.22.0-2 - Rebuild for new golang to address CVE-2025-68121 - Resolves: RHEL-149649