diff --git a/SOURCES/podman-1834346.patch b/SOURCES/podman-1834346.patch new file mode 100644 index 0000000..151e1d5 --- /dev/null +++ b/SOURCES/podman-1834346.patch @@ -0,0 +1,27 @@ +From fadd011a80c62f7a2fb971fac34d7b470c6a60df Mon Sep 17 00:00:00 2001 +From: Brent Baude +Date: Mon, 27 Apr 2020 16:03:00 -0500 +Subject: [PATCH] separate healthcheck and container log paths + +instead of using the container log path to derive where to put the healthchecks, we now put them into the rundir to avoid collision of health check log files when the log path is set by user. + +Fixes: #5915 + +Signed-off-by: Brent Baude +--- + libpod/healthcheck.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libpod/healthcheck.go b/libpod/healthcheck.go +index daddb6561d..aec5fa4e0f 100644 +--- libpod-5cc92849f7fc9dd734ca2fd8f3ae8830b9a7eb26/libpod/healthcheck.go ++++ libpod-5cc92849f7fc9dd734ca2fd8f3ae8830b9a7eb26/libpod/healthcheck.go +@@ -238,7 +238,7 @@ func (c *Container) updateHealthCheckLog(hcl define.HealthCheckLog, inStartPerio + + // HealthCheckLogPath returns the path for where the health check log is + func (c *Container) healthCheckLogPath() string { +- return filepath.Join(filepath.Dir(c.LogPath()), "healthcheck.log") ++ return filepath.Join(filepath.Dir(c.state.RunDir), "healthcheck.log") + } + + // GetHealthCheckLog returns HealthCheck results by reading the container's diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 61e274b..0ee2e8c 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -29,7 +29,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl Name: podman Version: 1.6.4 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -53,6 +53,9 @@ Patch5: podman-1807310.patch # tracker bug: https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2020-10696 # backported: https://github.com/containers/buildah/commit/c61925b8936e93a5e900f91b653a846f7ea3a9ed.patch Patch6: podman-CVE-2020-10696.patch +# related bug: https://bugzilla.redhat.com/show_bug.cgi?id=1834346 +# patch: https://github.com/containers/libpod/pull/6009.patch +Patch7: podman-1834346.patch Provides: %{name}-manpages = %{version}-%{release} Obsoletes: %{name}-manpages < %{version}-%{release} BuildRequires: golang >= 1.12.12-4 @@ -352,6 +355,10 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Mon May 18 2020 Jindrich Novy - 1.6.4-12 +- fix "Please backport correction patch for the native container healthchecks" +- Resolves: #1834346 + * Wed Apr 01 2020 Jindrich Novy - 1.6.4-11 - fix "CVE-2020-10696 buildah: crafted input tar file may lead to local file overwriting during image build process" - Resolves: #1819391