diff --git a/.gitignore b/.gitignore index 2666b5f..205658d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v1.6.4-rhel-2c7b579.tar.gz +SOURCES/v1.6.4-rhel-bcbbbc4.tar.gz diff --git a/.podman.metadata b/.podman.metadata index 9679e34..cfefcaf 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -1 +1 @@ -b118b9148d847b4bbee931fb6d241b34a21054db SOURCES/v1.6.4-rhel-2c7b579.tar.gz +22b238c694a87bb760fcd7611511315f09a501c8 SOURCES/v1.6.4-rhel-bcbbbc4.tar.gz diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 851acce..1fd44ea 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -27,12 +27,12 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 2c7b579fe7328dc6db48bdaf60d0ddd9136b1e24 +%global commit0 bcbbbc433e74476e6ec9410e422b1b6450fe7718 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: podman Version: 1.6.4 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -346,6 +346,12 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Wed Mar 03 2021 Jindrich Novy - 1.6.4-26 +- fix regression introduced by fix of CVE-2021-20188 +- update to the latest content of https://github.com/containers/podman/tree/v1.6.4-rhel + (https://github.com/containers/podman/commit/bcbbbc4) +- Resolves: #1934649 + * Fri Feb 12 2021 Jindrich Novy - 1.6.4-25 - bump NVR to preserve upgrade path - Related: #1920383