From e7b93ecf661a1791bfa566adabc82fc767a5aea6 Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Thu, 21 Sep 2023 20:28:40 +0000
Subject: [PATCH] import CS skopeo-1.13.3-1.el9

---
 .gitignore        |  2 +-
 .skopeo.metadata  |  2 +-
 SPECS/skopeo.spec | 61 ++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index ea964e1..cf203a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/skopeo-1.11.0-9686701.tar.gz
+SOURCES/skopeo-1.13.3-9e29e4c.tar.gz
diff --git a/.skopeo.metadata b/.skopeo.metadata
index 24ec449..73ab69e 100644
--- a/.skopeo.metadata
+++ b/.skopeo.metadata
@@ -1 +1 @@
-c2944ffc716dc90c68dfcad686b0e03c516effdf SOURCES/skopeo-1.11.0-9686701.tar.gz
+758a95f4018d4d005a3011d4d5cca702073e0d55 SOURCES/skopeo-1.13.3-9e29e4c.tar.gz
diff --git a/SPECS/skopeo.spec b/SPECS/skopeo.spec
index 80a8255..00cf622 100644
--- a/SPECS/skopeo.spec
+++ b/SPECS/skopeo.spec
@@ -8,13 +8,13 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 %endif
 
 %global import_path github.com/containers/%{name}
-#%%global branch main
-%global commit0 968670116c56023d37e9e98b48346478599c6801
+#%%global branch release-1.11
+%global commit0 9e29e4cede9bdaa4a54aa5b0af86efedb823bde4
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Epoch: 2
 Name: skopeo
-Version: 1.11.0
+Version: 1.13.3
 Release: 1%{?dist}
 Summary: Inspect container images and repositories on registries
 License: ASL 2.0
@@ -47,9 +47,12 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
 #Requires: bats  (which RHEL8 doesn't have. If it ever does, un-comment this)
 Requires: gnupg
 Requires: jq
+Requires: golang
 Requires: podman
+Requires: crun
 Requires: httpd-tools
 Requires: openssl
+Requires: squashfs-tools
 
 %description tests
 %{summary}
@@ -121,6 +124,58 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/%{name}/test
 
 %changelog
+* Fri Aug 25 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.13.3-1
+- update to https://github.com/containers/skopeo/releases/tag/v1.13.3
+- Related: #2176063
+
+* Fri Aug 11 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.13.2-1
+- update to https://github.com/containers/skopeo/releases/tag/v1.13.2
+- Related: #2176063
+
+* Fri Jul 21 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.13.1-1
+- update to https://github.com/containers/skopeo/releases/tag/v1.13.1
+- Related: #2176063
+
+* Fri Jul 07 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.13.0-1
+- update to https://github.com/containers/skopeo/releases/tag/v1.13.0
+- Related: #2176063
+
+* Wed Jun 14 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.12.0-3
+- rebuild for following CVEs:
+CVE-2022-41724 CVE-2022-41725 CVE-2023-24537 CVE-2023-24538 CVE-2023-24534 CVE-2023-24536 CVE-2022-41723 CVE-2023-24539 CVE-2023-24540 CVE-2023-29400
+- Resolves: #2179967
+- Resolves: #2187323
+- Resolves: #2187384
+- Resolves: #2203703
+- Resolves: #2207523
+
+* Mon Apr 24 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.12.0-2
+- remove fakeroot from skopeo-tests
+- Related: #2176063
+
+* Wed Apr 19 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.12.0-1
+- update to 1.12.0
+- Related: #2176063
+
+* Mon Apr 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.11.3-0.1
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.11
+  (https://github.com/containers/skopeo/commit/d79588e)
+- Related: #2176063
+
+* Sun Mar 26 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.11.2-0.2
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.11
+  (https://github.com/containers/skopeo/commit/8191ef3)
+- Related: #2176063
+
+* Tue Feb 21 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.11.2-0.1
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.11
+  (https://github.com/containers/skopeo/commit/3f98753)
+- Related: #2124478
+
+* Mon Feb 20 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.11.1-1
+- update to https://github.com/containers/skopeo/releases/tag/v1.11.1
+- Related: #2124478
+
 * Fri Jan 27 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.11.0-1
 - update to 1.11.0 release
 - Related: #2124478