diff --git a/.gitignore b/.gitignore index 5612c59..520d28b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/skopeo-1.5.2-8a88191.tar.gz +SOURCES/release-1.6-1186cc6.tar.gz diff --git a/.skopeo.metadata b/.skopeo.metadata index 52595c6..e4451b5 100644 --- a/.skopeo.metadata +++ b/.skopeo.metadata @@ -1 +1 @@ -90849e5c46e5407a8ce9e10ae4a5811db884c526 SOURCES/skopeo-1.5.2-8a88191.tar.gz +c63d765cb5d19198d9fbd22683413bf5d0a2baf8 SOURCES/release-1.6-1186cc6.tar.gz diff --git a/SPECS/skopeo.spec b/SPECS/skopeo.spec index 3047eef..f12fc57 100644 --- a/SPECS/skopeo.spec +++ b/SPECS/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 8a88191c844a35cd54048c34bee3a6656ed5df5f +%global commit0 1186cc6bce235addb7345115c43aacea3cf6893a %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 2 Name: skopeo -Version: 1.5.2 -Release: 1%{?dist} +Version: 1.6.1 +Release: 2%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: https://%{import_path} @@ -118,14 +119,104 @@ 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 + +* Thu Feb 03 2022 Jindrich Novy - 2:1.6.0-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.6.0 +- Related: #2001445 + * Mon Nov 29 2021 Jindrich Novy - 2:1.5.2-1 - update to https://github.com/containers/skopeo/releases/tag/v1.5.2 -- Related: #2021990 +- 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 +* Fri Oct 15 2021 Jindrich Novy - 2:1.5.0-2 +- bump Epoch to preserve upgrade path +- Related: #2001445 + +* Wed Oct 13 2021 Jindrich Novy - 1:1.5.0-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.5.0 +- Related: #2001445 + +* Wed Oct 13 2021 Jindrich Novy - 1:1.5.1-0.3 +- update to the latest content of https://github.com/containers/skopeo/tree/main + (https://github.com/containers/skopeo/commit/9c9a9f3) +- Related: #2001445 + +* Fri Oct 08 2021 Jindrich Novy - 1:1.5.1-0.2 +- update to the latest content of https://github.com/containers/skopeo/tree/main + (https://github.com/containers/skopeo/commit/116e75f) +- Related: #2001445 + +* Thu Oct 07 2021 Jindrich Novy - 1:1.5.1-0.1 +- update to the latest content of https://github.com/containers/skopeo/tree/main + (https://github.com/containers/skopeo/commit/fc81803) +- Related: #2001445 + +* Wed Oct 06 2021 Jindrich Novy - 1:1.4.1-0.12 +- update to the latest content of https://github.com/containers/skopeo/tree/main + (https://github.com/containers/skopeo/commit/ff88d3f) +- Related: #2001445 + +* Mon Oct 04 2021 Jindrich Novy - 1:1.4.1-0.11 +- update to the latest content of https://github.com/containers/skopeo/tree/main + (https://github.com/containers/skopeo/commit/a95b0cc) +- Related: #2001445 + +* Fri Oct 01 2021 Jindrich Novy - 1:1.4.1-0.10 +- update to the latest content of https://github.com/containers/skopeo/tree/main + (https://github.com/containers/skopeo/commit/53cf287) +- Related: #2001445 + +* Wed Sep 29 2021 Jindrich Novy - 1:1.4.1-0.9 +- update to the latest content of https://github.com/containers/skopeo/tree/main + (https://github.com/containers/skopeo/commit/86fa758) +- Related: #2001445 + +* Mon Sep 27 2021 Jindrich Novy - 1:1.4.1-0.8 +- update to the latest content of https://github.com/containers/skopeo/tree/main + (https://github.com/containers/skopeo/commit/4d3588e) +- Related: #2001445 + +* Thu Sep 23 2021 Jindrich Novy - 1:1.4.1-0.7 +- update to the latest content of https://github.com/containers/skopeo/tree/main + (https://github.com/containers/skopeo/commit/25d3e7b) +- Related: #2001445 + +* Wed Sep 22 2021 Jindrich Novy - 1:1.4.1-0.6 +- update to the latest content of https://github.com/containers/skopeo/tree/main + (https://github.com/containers/skopeo/commit/c5a5199) +- Related: #2001445 + +* Tue Sep 21 2021 Jindrich Novy - 1:1.4.1-0.5 +- update to the latest content of https://github.com/containers/skopeo/tree/main + (https://github.com/containers/skopeo/commit/db1e814) +- Related: #2001445 + +* Fri Sep 17 2021 Jindrich Novy - 1:1.4.1-0.4 +- update to the latest content of https://github.com/containers/skopeo/tree/main + (https://github.com/containers/skopeo/commit/31b8981) +- Related: #2001445 + +* Wed Sep 15 2021 Jindrich Novy - 1:1.4.1-0.3 +- update to the latest content of https://github.com/containers/skopeo/tree/main + (https://github.com/containers/skopeo/commit/177443f) +- Related: #2001445 + +* Fri Sep 10 2021 Jindrich Novy - 1:1.4.1-0.2 +- update to the latest content of https://github.com/containers/skopeo/tree/main + (https://github.com/containers/skopeo/commit/47b8082) +- Related: #2001445 + * Thu Aug 26 2021 Jindrich Novy - 1:1.4.2-0.1 - update to the latest content of https://github.com/containers/skopeo/tree/release-1.4 (https://github.com/containers/skopeo/commit/01e51ce)