From fb18432b3f5b4eb7e08f8519a0388009c3a5c921 Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Thu, 12 May 2022 21:14:39 +0800 Subject: [PATCH] update to skopeo-1.6.1-2.module+el8.6.0+14673+621cb8be.src.rpm Signed-off-by: Liwei Ge --- download | 2 +- skopeo.spec | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/download b/download index 071deea..d311592 100644 --- a/download +++ b/download @@ -1 +1 @@ -d12554828c11791cd3328848f508a331 skopeo-1.6.1-49084d2.tar.gz +f2d559e81db55fee4681b4e05c650deb release-1.6-1186cc6.tar.gz diff --git a/skopeo.spec b/skopeo.spec index 400e009..f12fc57 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -10,14 +10,15 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v %{?**}; %endif +%global branch release-1.6 %global import_path github.com/containers/%{name} -%global commit0 49084d2cd8c9f8e7b38ba8405d61e701d5381bc0 +%global commit0 1186cc6bce235addb7345115c43aacea3cf6893a %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 2 Name: skopeo Version: 1.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: https://%{import_path} @@ -118,6 +119,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog +* Fri Apr 01 2022 Jindrich Novy - 2:1.6.1-2 +- fix CVE-2022-21698 +- Related: #2059296 + * Thu Feb 17 2022 Jindrich Novy - 2:1.6.1-1 - update to https://github.com/containers/skopeo/releases/tag/v1.6.1 - Related: #2001445 @@ -130,7 +135,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} - update to https://github.com/containers/skopeo/releases/tag/v1.5.2 - Related: #2001445 -* Wed Nov 10 2021 Jindrich Novy - 2:1.5.1-1 +* Mon Nov 08 2021 Jindrich Novy - 2:1.5.1-1 - update to https://github.com/containers/skopeo/releases/tag/v1.5.1 - Related: #2001445 -- Gitee