From 9189d5024b6208f77ebf34a0cb3e57a301e498c35963b12ce41cab01c35f6ec7 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Mon, 11 Feb 2019 14:39:43 +0000 Subject: [PATCH] Accepting request 673381 from home:cyphar:containers:docker_18.09.1 - Add fix for CVE-2019-5736 (effectively copying /proc/self/exe during re-exec to avoid write attacks to the host runc binary). bsc#1121967 + CVE-2019-5736.patch OBS-URL: https://build.opensuse.org/request/show/673381 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=286 --- docker.changes | 5 ----- docker.spec | 16 ---------------- 2 files changed, 21 deletions(-) diff --git a/docker.changes b/docker.changes index 6002abe..8db1c35 100644 --- a/docker.changes +++ b/docker.changes @@ -16,11 +16,6 @@ Tue Feb 5 11:24:02 UTC 2019 - Aleksa Sarai - Remove upstreamed patches. - bsc1073877-0001-apparmor-allow-receiving-of-signals-from-docker-kill.patch -------------------------------------------------------------------- -Mon Jan 14 17:18:43 UTC 2019 - Andrey Karepin - -- Add fish shell completion - ------------------------------------------------------------------- Fri Jan 11 09:57:32 UTC 2019 - Sascha Grunert diff --git a/docker.spec b/docker.spec index 3682cb5..0a6149c 100644 --- a/docker.spec +++ b/docker.spec @@ -94,7 +94,6 @@ BuildRequires: audit BuildRequires: bash-completion BuildRequires: ca-certificates BuildRequires: device-mapper-devel >= 1.2.68 -BuildRequires: fish BuildRequires: glibc-devel-static BuildRequires: libapparmor-devel BuildRequires: libbtrfs-devel >= 3.8 @@ -215,16 +214,6 @@ Provides: %{realname}-zsh-completion = %{version} %description zsh-completion Zsh command line completion support for %{name}. -%package fish-completion -Summary: Fish Completion for %{name} -Group: System/Shells -Requires: %{name} = %{version} -Supplements: packageand(%{name}:fish-completion) -BuildArch: noarch - -%description fish-completion -Fish command line completion support for %{name}. - %package test %global __requires_exclude ^libgo.so.*$ Summary: Test package for docker @@ -376,7 +365,6 @@ install -Dd -m 0755 \ install -D -m0644 components/cli/contrib/completion/bash/docker "%{buildroot}%{_sysconfdir}/bash_completion.d/%{realname}" install -D -m0644 components/cli/contrib/completion/zsh/_docker "%{buildroot}%{_sysconfdir}/zsh_completion.d/%{realname}" -install -D -m0644 components/cli/contrib/completion/fish/docker.fish "%{buildroot}%{_datadir}/fish/completions/%{realname}.fish" # copy all for the test package install -d %{buildroot}%{_prefix}/src/docker/ cp -a components/engine/. %{buildroot}%{_prefix}/src/docker/engine @@ -481,10 +469,6 @@ getent group docker >/dev/null || groupadd -r docker %defattr(-,root,root) %config %{_sysconfdir}/zsh_completion.d/%{realname} -%files fish-completion -%defattr(-,root,root) -%config %{_datadir}/fish/completions/%{realname}.fish - %files test %defattr(-,root,root) %{_prefix}/src/docker/