From 98907ec4690e75469689fe4309744e7fdbf9bffb Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 9 Nov 2021 04:53:22 -0500 Subject: [PATCH] import skopeo-1.2.2-10.module+el8.5.0+11808+4e1db630 --- .gitignore | 2 +- .skopeo.metadata | 2 +- SPECS/skopeo.spec | 42 +++++++++--------------------------------- 3 files changed, 11 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index bde368e..3c64205 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/release-1.2-e7880c4.tar.gz +SOURCES/release-1.2-e72dd9c.tar.gz diff --git a/.skopeo.metadata b/.skopeo.metadata index 8bb523a..b7f56bc 100644 --- a/.skopeo.metadata +++ b/.skopeo.metadata @@ -1 +1 @@ -ffeef33b1b8d0be913b7ac87b4a0093f8805cfda SOURCES/release-1.2-e7880c4.tar.gz +a4755f6059727897a3dde8b77756e871409ef459 SOURCES/release-1.2-e72dd9c.tar.gz diff --git a/SPECS/skopeo.spec b/SPECS/skopeo.spec index f1dbd60..0b526e5 100644 --- a/SPECS/skopeo.spec +++ b/SPECS/skopeo.spec @@ -17,18 +17,18 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl # These vendored components must have the same version. If it is not the case, # pick the oldest version on c/image, c/common, c/storage vendored in # podman/skopeo/podman. -%global podman_branch v3.0.1-rhel -%global image_branch v5.10.5 +%global podman_branch v3.0 +%global image_branch v5.10.2 %global common_branch v0.33.4 -%global storage_branch v1.24.8 +%global storage_branch v1.24.6 %global shortnames_branch main -%global commit0 e7880c4a8991966f16e367f085d42375ad70197e +%global commit0 e72dd9c5c834f3cd7fb8b1aab4021d9d4412f305 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 1 Name: skopeo Version: 1.2.2 -Release: 8%{?dist} +Release: 10%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: %{git0} @@ -233,35 +233,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog -* Thu Jul 15 2021 Jindrich Novy - 1:1.2.2-8 +* Thu Jul 15 2021 Jindrich Novy - 1:1.2.2-10 - update shortnames from Pyxis -- Related: #1954702 - -* Wed Apr 07 2021 Jindrich Novy - 1:1.2.2-7 -- use runc as default OCI runtime in RHEL8 -- Resolves: #1940854 - -* Thu Mar 18 2021 Jindrich Novy - 1:1.2.2-6 -- update documentation and configs according to the current - versions of vendored projects -- Related: #1938234 - -* Mon Mar 15 2021 Jindrich Novy - 1:1.2.2-5 -- use infra_image = registry.redhat.io/ubi8/pause in contiainers.conf - (unlike previous one ubi8/pause doesn't require authentication) -- Related: #1934947 - -* Fri Mar 12 2021 Jindrich Novy - 1:1.2.2-4 -- quote infra_image registry, otherwise it can't be parsed -- Related: #1934947 - -* Thu Mar 11 2021 Jindrich Novy - 1:1.2.2-3 -- use infra_image = registry.redhat.io/rhel8/pause in contiainers.conf -- Resolves: #1934947 - -* Tue Mar 02 2021 Jindrich Novy - 1:1.2.2-2 -- update rhel-shortnames.conf to include only trusted registries -- Resolves: #1931785 +- sync with the vendored versions in 3.0-8.5.0 +- bump release to assure upgrade path from 3.0-8.4.0 +- Related: #1934415 * Fri Feb 19 2021 Jindrich Novy - 1:1.2.2-1 - update to the latest content of https://github.com/containers/skopeo/tree/release-1.2