diff --git a/.gitignore b/.gitignore index 8fd3960..c77b134 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/conmon-fac48d0.tar.gz -SOURCES/v1.4.2-stable2.tar.gz +SOURCES/v1.4.2-stable3.tar.gz diff --git a/.podman.metadata b/.podman.metadata index aa42e5b..4010ac0 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -1,2 +1,2 @@ 9f8d9819e66e79e6d24b441d6f7fa4dbecb61695 SOURCES/conmon-fac48d0.tar.gz -7fca33bd483b3dd97bb9159e1b5e496b84324deb SOURCES/v1.4.2-stable2.tar.gz +a990e0ad09cabb092ff7350a98ad37715b433112 SOURCES/v1.4.2-stable3.tar.gz diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 2760211..5b280dc 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -26,9 +26,9 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" - %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit 29c137ff665314f18a65cf55ba55522e702987b3 +%global commit 01aa3cbb5186ca20b4b0853e82078b8e80288c1c %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global tag v1.4.2-stable2 +%global tag v1.4.2-stable3 %global tag_version %(t=%{tag}; echo ${t:1}) %global import_path_conmon github.com/containers/conmon @@ -38,7 +38,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" - Name: podman Version: 1.4.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git_podman} @@ -236,7 +236,7 @@ manage pods, containers and container images. %{name}-remote supports ssh connections as well. %prep -%setup -q -n %{repo}-%{tag_version} +%setup -q -n %{repo}-%{commit} mv pkg/hooks/README.md pkg/hooks/README-hooks.md # untar conmon @@ -339,6 +339,10 @@ exit 0 %{_bindir}/%{name}-remote %changelog +* Thu Nov 21 2019 Jindrich Novy - 1.4.2-6 +- update to 1.4.2-stable3 +- Resolves: #1770176 + * Thu Sep 12 2019 Jindrich Novy - 1.4.2-5 - Fix CVE-2019-10214 (#1734649).