diff --git a/.gitignore b/.gitignore index 520d28b..544f59b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/release-1.6-1186cc6.tar.gz +SOURCES/release-1.6-c20c32d.tar.gz diff --git a/.skopeo.metadata b/.skopeo.metadata index e4451b5..a943f3d 100644 --- a/.skopeo.metadata +++ b/.skopeo.metadata @@ -1 +1 @@ -c63d765cb5d19198d9fbd22683413bf5d0a2baf8 SOURCES/release-1.6-1186cc6.tar.gz +18a43c622d36200dd624006d49be199666511ad5 SOURCES/release-1.6-c20c32d.tar.gz diff --git a/SPECS/skopeo.spec b/SPECS/skopeo.spec index 8f9fccd..6f2b6c4 100644 --- a/SPECS/skopeo.spec +++ b/SPECS/skopeo.spec @@ -12,13 +12,13 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %global branch release-1.6 %global import_path github.com/containers/%{name} -%global commit0 1186cc6bce235addb7345115c43aacea3cf6893a +%global commit0 c20c32dc25f4bb0ec2e0cfadb51d692f4b0b50ca %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 2 Name: skopeo -Version: 1.6.1 -Release: 2%{?dist} +Version: 1.6.2 +Release: 5%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: https://%{import_path} @@ -30,7 +30,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.16.6 +BuildRequires: golang >= 1.17.7 BuildRequires: go-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel @@ -119,9 +119,42 @@ 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: #2068168 +* Tue Aug 16 2022 Jindrich Novy - 2:1.6.2-5 +- update to the latest content of https://github.com/containers/skopeo/tree/release-1.6 + (https://github.com/containers/skopeo/commit/c20c32d) +- Related: #2061390 + +* Fri Jul 29 2022 Jindrich Novy - 2:1.6.2-4 +- update to the latest content of https://github.com/containers/skopeo/tree/release-1.6 + (https://github.com/containers/skopeo/commit/f952195) +- Related: #2061390 + +* Wed Jul 27 2022 Jindrich Novy - 2:1.6.2-3 +- update to the latest content of https://github.com/containers/skopeo/tree/release-1.6 + (https://github.com/containers/skopeo/commit/4414e52) +- Related: #2061390 + +* Fri May 06 2022 Jindrich Novy - 2:1.6.2-2 +- update to the latest content of https://github.com/containers/skopeo/tree/release-1.6 + (https://github.com/containers/skopeo/commit/4336972) +- Related: #2061390 + +* Fri Apr 29 2022 Jindrich Novy - 2:1.6.2-1 +- update to the latest content of https://github.com/containers/skopeo/tree/release-1.6 + (https://github.com/containers/skopeo/commit/540efb3) +- Related: #2061390 + +* Fri Apr 29 2022 Jindrich Novy - 2:1.6.1-3 +- consume release-1.6 branch for the 4.0 stable stream +- Related: #2061390 + +* Fri Apr 08 2022 Jindrich Novy - 2:1.7.0-2 +- bump golang BR to 1.17.7 +- Related: #2061390 + +* Fri Mar 25 2022 Jindrich Novy - 2:1.7.0-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.7.0 +- Related: #2061390 * Thu Feb 17 2022 Jindrich Novy - 2:1.6.1-1 - update to https://github.com/containers/skopeo/releases/tag/v1.6.1