diff --git a/podman.changes b/podman.changes index 5dc823c..772a491 100644 --- a/podman.changes +++ b/podman.changes @@ -1,9 +1,19 @@ +------------------------------------------------------------------- +Thu Feb 20 15:57:54 UTC 2020 - Ralf Haferkamp + +- The name of the cni-bridge in the default config changed from + "cni0" to "podman-cni0" with podman-1.6.0. Add a %trigger to + rename the bridge in the system to the new default if it exists. + The trigger is only excuted when updating podman-cni-config + from something older than 1.6.0. This is mainly needed for SLE + where we're updating from 1.4.4 to 1.8.0 (bsc#1160460). + ------------------------------------------------------------------- Fri Feb 7 14:18:16 UTC 2020 - Sascha Grunert - Remove: 0001-clarify-container-prune-force.patch because it's now included in the release -- Update podman to v1.8.0: +- Update podman to v1.8.0 (bsc#1160460): * Features - The podman system service command has been added, providing a preview of Podman's new Docker-compatible API. This API is @@ -521,6 +531,12 @@ Thu Sep 5 15:26:01 UTC 2019 - Marco Vedovati - Add katacontainers as a recommended package, and include it as an additional OCI runtime in the configuration. +------------------------------------------------------------------- +Mon Sep 2 12:02:44 UTC 2019 - Sascha Grunert + +- Add patch for CVE-2019-10214. bsc#1144065 + + CVE-2019-10214.patch + ------------------------------------------------------------------- Tue Aug 27 08:04:20 UTC 2019 - Marco Vedovati @@ -692,6 +708,12 @@ Wed Aug 14 08:26:22 UTC 2019 - Sascha Grunert `runc` and `conmon` binaries. - Re-enable 32bit build +-------------------------------------------------------------------- +Tue Jul 30 07:46:16 UTC 2019 - Sascha Grunert + +- Remove fuse-overlayfs because it's (currently) an unsatisfied dependency on + SLE (bsc#1143386) + ------------------------------------------------------------------- Thu Jul 25 09:20:47 UTC 2019 - Richard Brown diff --git a/podman.spec b/podman.spec index 90583c9..ba3750e 100644 --- a/podman.spec +++ b/podman.spec @@ -87,6 +87,8 @@ skopeo, as they all share the same datastore backend. Summary: Basic CNI configuration for podman Group: System/Management Requires: %{name} = %{version} +# iproute2 is needed by the %triggerun scriplet +Requires: iproute2 BuildArch: noarch %description cni-config @@ -195,4 +197,14 @@ install -D -m 0644 contrib/varlink/io.podman.socket %{buildroot}%{_unitdir}/io.p %postun %service_del_postun io.podman.service io.podman.socket +%triggerun cni-config -- %{name}-cni-config < 1.6.0 +# The name of the network bridge changed from cni0 to podman-cni0 with +# podman 1.6. We need to rename the existing bridge to the new name to +# to avoid network issues after upgrade +if ip link show dev cni0 > /dev/null 2>&1; then + ip link set dev cni0 down + ip link set dev cni0 name cni-podman0 + ip link set dev cni-podman0 up +fi + %changelog