From fa1ea8cd93f94b00bc4613aa19c4495619448e72 Mon Sep 17 00:00:00 2001
From: AlmaLinux RelEng Bot <eabdullin@almalinux.org>
Date: Thu, 3 Sep 2026 07:55:55 -0400
Subject: [PATCH] import CS skopeo-1.22.2-4.el9

---
 .gitignore        |  2 +-
 .skopeo.metadata  |  2 +-
 SPECS/skopeo.spec | 28 ++++++++++++++++++----------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6e889e8..198e067 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/skopeo-1.23.0-9645b28.tar.gz
+SOURCES/release-1.22-094478d.tar.gz
diff --git a/.skopeo.metadata b/.skopeo.metadata
index caf4c1d..24d7053 100644
--- a/.skopeo.metadata
+++ b/.skopeo.metadata
@@ -1 +1 @@
-4f6cf1af4235d63e7a4048104b8c711d4dd9e85b SOURCES/skopeo-1.23.0-9645b28.tar.gz
+6916d6b37dd41ec4e9fac895fdabe7442db24d84 SOURCES/release-1.22-094478d.tar.gz
diff --git a/SPECS/skopeo.spec b/SPECS/skopeo.spec
index 5b818c0..919b546 100644
--- a/SPECS/skopeo.spec
+++ b/SPECS/skopeo.spec
@@ -9,8 +9,8 @@
 
 %global gomodulesmode GO111MODULE=on
 
-#%%global branch release-1.21
-%global commit0 9645b282ca2d8792235db5a3e142ea9ae2f0c63b
+%global branch release-1.22
+%global commit0 094478d3691b8e54b8d9e87d9693f7933d75408c
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 # No btrfs on RHEL
@@ -28,7 +28,7 @@
 %define conditional_epoch 1
 %define fakeroot 1
 %else
-%define conditional_epoch 2
+%define conditional_epoch 3
 %endif
 
 Name: skopeo
@@ -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.23.0
+Version: 1.22.2
 # 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: 1%{?dist}
+Release: 4%{?dist}
 %if %{defined golang_arches_future}
 ExclusiveArch: %{golang_arches_future}
 %else
@@ -56,7 +56,7 @@ Summary: Inspect container images and repositories on registries
 URL: https://github.com/containers/%{name}
 # Tarball fetched from upstream
 %if 0%{?branch:1}
-Source0: https://github.com/containers/%{name}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
+Source0: https://gitlab.cee.redhat.com/sustaining-engineering/container-tools/src-git/%{name}/-/archive/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
 %else
 Source0: https://github.com/containers/%{name}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
 %endif
@@ -106,11 +106,7 @@ Recommends: fakeroot
 This package installs system test dependencies for %{name}
 
 %prep
-%if 0%{?branch:1}
-%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
-%else
 %autosetup -Sgit -n %{name}-%{commit0}
-%endif
 # The %%install stage should not rebuild anything but only install what's
 # built in the %%build stage. So, remove any dependency on build targets.
 sed -i 's/^install-binary: bin\/%{name}.*/install-binary:/' Makefile
@@ -186,6 +182,18 @@ cp -pav systemtest/* %{buildroot}/%{_datadir}/%{name}/test/system/
 %{_datadir}/%{name}/test
 
 %changelog
+* Wed Aug 19 2026 Jindrich Novy <jnovy@redhat.com> - 3:1.22.2-4
+- Rebuild for golang-1.26.6 CVE fixes (CVE-2025-68121 CVE-2026-33811
+  CVE-2026-27145 CVE-2026-33818 CVE-2026-56853 CVE-2026-56858 CVE-2026-56859
+  CVE-2026-56860 CVE-2026-56862)
+- Resolves: RHEL-164492 RHEL-187324 RHEL-190003 RHEL-241116 RHEL-241304
+  RHEL-241601 RHEL-241835 RHEL-242236
+
+* Thu Jul 30 2026 Jindrich Novy <jnovy@redhat.com> - 3:1.22.2-1
+- switch to sustaining-engineering GitLab release-1.22 branch and bump epoch to
+  fix upgrade path
+- Resolves: RHEL-220456
+
 * Wed Jun 17 2026 Jindrich Novy <jnovy@redhat.com> - 2:1.23.0-1
 - update to https://github.com/containers/skopeo/releases/tag/v1.23.0
 - Resolves: RHEL-185740