From 58466459de7f6c189c57916a88eb443ceee436c9 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 22 May 2024 13:51:38 +0000 Subject: [PATCH] import CS skopeo-1.14.3-2.module_el8+1018+4b0e659b --- .gitignore | 2 +- .skopeo.metadata | 2 +- SPECS/skopeo.spec | 50 ++++++++++++++++++++++++++++++++++++----------- 3 files changed, 41 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index cf203a2..6407c29 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/skopeo-1.13.3-9e29e4c.tar.gz +SOURCES/release-1.14-5f2b9af.tar.gz diff --git a/.skopeo.metadata b/.skopeo.metadata index 73ab69e..eb3b338 100644 --- a/.skopeo.metadata +++ b/.skopeo.metadata @@ -1 +1 @@ -758a95f4018d4d005a3011d4d5cca702073e0d55 SOURCES/skopeo-1.13.3-9e29e4c.tar.gz +ba762ce24a6214b6ff7c716d7282f3d60c3432c4 SOURCES/release-1.14-5f2b9af.tar.gz diff --git a/SPECS/skopeo.spec b/SPECS/skopeo.spec index dbe28d0..88e0c78 100644 --- a/SPECS/skopeo.spec +++ b/SPECS/skopeo.spec @@ -9,14 +9,14 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %endif %global import_path github.com/containers/%{name} -#%%global branch release-1.11 -%global commit0 9e29e4cede9bdaa4a54aa5b0af86efedb823bde4 +%global branch release-1.14 +%global commit0 5f2b9afebe813012e936cd5b3f4bae1caae8bd6f %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 2 Name: skopeo -Version: 1.13.3 -Release: 3%{?dist} +Version: 1.14.3 +Release: 2%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: https://%{import_path} @@ -28,7 +28,7 @@ Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz %endif BuildRequires: git-core -BuildRequires: golang >= 1.20.6 +BuildRequires: golang >= 1.17.7 BuildRequires: /usr/bin/go-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel @@ -122,13 +122,41 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog -* Tue Jan 23 2024 Jindrich Novy - 2:1.13.3-3 -- Make the module buildable again -- Resolves: RHEL-16299 +* Fri Apr 19 2024 Jindrich Novy - 2:1.14.3-2 +- update to the latest content of https://github.com/containers/skopeo/tree/release-1.14 + (https://github.com/containers/skopeo/commit/5f2b9af) +- Resolves: RHEL-28728 -* Mon Dec 04 2023 Lokesh Mandvekar - 2:1.13.3-2 -- Rebuild with golang 1.20.10 for CVE-2023-39321 -- Related: Jira:RHEL-4517 +* Mon Apr 01 2024 Lokesh Mandvekar - 2:1.14.3-1 +- update to the latest content of https://github.com/containers/skopeo/tree/release-1.14 + (https://github.com/containers/skopeo/commit/4a2bc3a) +- Resolves: RHEL-28226 + +* Mon Mar 18 2024 Jindrich Novy - 2:1.14.3-0.2 +- update to the latest content of https://github.com/containers/skopeo/tree/release-1.14 + (https://github.com/containers/skopeo/commit/d0a0f1a) +- Resolves: RHEL-28226 + +* Fri Feb 02 2024 Jindrich Novy - 2:1.14.3-0.1 +- update to the latest content of https://github.com/containers/skopeo/tree/release-1.14 + (https://github.com/containers/skopeo/commit/1c2ab99) +- Related: Jira:RHEL-2110 + +* Wed Jan 31 2024 Jindrich Novy - 2:1.14.1-2 +- Switch to the maint branch +- Related: Jira:RHEL-2110 + +* Fri Jan 19 2024 Jindrich Novy - 2:1.14.1-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.14.1 +- Related: Jira:RHEL-2110 + +* Tue Jan 02 2024 Jindrich Novy - 2:1.14.0-2 +- update to latest content of https://github.com/containers/skopeo/releases/tag/1.14.0 + (https://github.com/containers/skopeo/commit/6abf96bb82666fbb3d4ad9faf1812e5ae2d31a74) + +* Thu Dec 07 2023 Lokesh Mandvekar - 2:1.14.0-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.14.0 +- Related: Jira:RHEL-2110 * Fri Aug 25 2023 Jindrich Novy - 2:1.13.3-1 - update to https://github.com/containers/skopeo/releases/tag/v1.13.3