gentoo resync : 21.05.2019

5 files changed, 43 insertions, 7 deletions

diff --git a/app-emulation/libvirt/files/libvirt-5.2.0-md-clear.patch b/app-emulation/libvirt/files/libvirt-5.2.0-md-clear.patch
new file mode 100644
index 000000000000..cd14d0d539ae
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-5.2.0-md-clear.patch
@@ -0,0 +1,36 @@
+From 538d873571d7a682852dc1d70e5f4478f4d64e85 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Fri, 5 Apr 2019 15:11:20 +0200
+Subject: [PATCH] cpu_map: Define md-clear CPUID bit
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091
+
+The bit is set when microcode provides the mechanism to invoke a flush
+of various exploitable CPU buffers by invoking the VERW instruction.
+
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ src/cpu_map/x86_features.xml                                | 3 +++
+
+diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
+index efcc10b1ae..370807f88e 100644
+--- a/src/cpu_map/x86_features.xml
++++ b/src/cpu_map/x86_features.xml
+@@ -320,6 +320,9 @@
+   <feature name='avx512-4fmaps'>
+     <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000008'/>
+   </feature>
++  <feature name='md-clear'> <!-- md_clear -->
++    <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000400'/>
++  </feature>
+   <feature name='pconfig'>
+     <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00040000'/>
+   </feature>
+-- 
+2.21.0
+
diff --git a/app-emulation/libvirt/files/libvirtd.init-r16 b/app-emulation/libvirt/files/libvirtd.init-r16
index be660e35a1d8..2a3fb52696ab 100644
--- a/app-emulation/libvirt/files/libvirtd.init-r16
+++ b/app-emulation/libvirt/files/libvirtd.init-r16
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="Virtual Machine Management daemon (libvirt)"
@@ -10,7 +10,7 @@ LIBVIRTD_TIMEOUT=${LIBVIRTD_TERMTIMEOUT:-"TERM/25/KILL/5"}
 command="/usr/sbin/libvirtd"
 command_args="-d ${LIBVIRTD_OPTS}"
 start_stop_daemon_args="--env KRB5_KTNAME=/etc/libvirt/krb5.tab"
-pidfile="/var/run/libvirtd.pid"
+pidfile="/run/libvirtd.pid"
 retry="${LIBVIRTD_TERMTIMEOUT}"
 
 depend() {
diff --git a/app-emulation/libvirt/files/libvirtd.init-r17 b/app-emulation/libvirt/files/libvirtd.init-r17
index ca3f872e14e0..0f89df82db46 100644
--- a/app-emulation/libvirt/files/libvirtd.init-r17
+++ b/app-emulation/libvirt/files/libvirtd.init-r17
@@ -10,7 +10,7 @@ LIBVIRTD_TIMEOUT=${LIBVIRTD_TERMTIMEOUT:-"TERM/25/KILL/5"}
 command="/usr/sbin/libvirtd"
 command_args="-d ${LIBVIRTD_OPTS}"
 start_stop_daemon_args="--env KRB5_KTNAME=/etc/libvirt/krb5.tab"
-pidfile="/var/run/libvirtd.pid"
+pidfile="/run/libvirtd.pid"
 retry="${LIBVIRTD_TERMTIMEOUT}"
 
 depend() {
diff --git a/app-emulation/libvirt/files/virtlockd.init-r1 b/app-emulation/libvirt/files/virtlockd.init-r1
index e7c3db2990e9..1e812d870c19 100644
--- a/app-emulation/libvirt/files/virtlockd.init-r1
+++ b/app-emulation/libvirt/files/virtlockd.init-r1
@@ -1,11 +1,11 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="libvirt virtual machine lock manager"
 command="/usr/sbin/virtlockd"
 command_args="-d"
-pidfile="/var/run/virtlockd.pid"
+pidfile="/run/virtlockd.pid"
 
 extra_started_commands="reload"
 description_reload="re-exec the daemon, while maintaining locks and clients"
diff --git a/app-emulation/libvirt/files/virtlogd.init-r1 b/app-emulation/libvirt/files/virtlogd.init-r1
index 438070e344db..ff9c2446e8c3 100644
--- a/app-emulation/libvirt/files/virtlogd.init-r1
+++ b/app-emulation/libvirt/files/virtlogd.init-r1
@@ -1,11 +1,11 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="libvirt virtual machine logging manager"
 command="/usr/sbin/virtlogd"
 command_args="-d"
-pidfile="/var/run/virtlogd.pid"
+pidfile="/run/virtlogd.pid"
 
 extra_started_commands="reload"
 description_reload="re-exec the daemon, while maintaining open connections"