- Fixed a number of QEMU apparmor abstraction problems. bsc#921355

apparmor-fixes.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=441

apparmor-fixes.patch

@@ -0,0 +1,33 @@
+Index: libvirt-1.2.13/examples/apparmor/libvirt-qemu
+===================================================================
+--- libvirt-1.2.13.orig/examples/apparmor/libvirt-qemu
++++ libvirt-1.2.13/examples/apparmor/libvirt-qemu
+@@ -59,6 +59,7 @@
+   # access to firmware's etc
+   /usr/share/kvm/** r,
+   /usr/share/qemu/** r,
++  /usr/share/qemu-kvm/** r,
+   /usr/share/bochs/** r,
+   /usr/share/openbios/** r,
+   /usr/share/openhackware/** r,
+@@ -73,6 +74,7 @@
+   # the various binaries
+   /usr/bin/kvm rmix,
+   /usr/bin/qemu rmix,
++  /usr/bin/qemu-kvm rmix,
+   /usr/bin/qemu-system-arm rmix,
+   /usr/bin/qemu-system-cris rmix,
+   /usr/bin/qemu-system-i386 rmix,
+@@ -118,6 +120,12 @@
+   /bin/dd rmix,
+   /bin/cat rmix,
+ 
++  # for restore
++  /bin/bash rmix,
++
++  /run/nscd/passwd r,
++  /run/nscd/group r,
++
+   # for usb access
+   /dev/bus/usb/ r,
+   /etc/udev/udev.conf r,

libvirt.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  9 16:51:08 UTC 2015 - cbosdonnat@suse.com
+
+- Fixed a number of QEMU apparmor abstraction problems. bsc#921355
+  apparmor-fixes.patch
+
 -------------------------------------------------------------------
 Mon Mar  2 12:05:43 MST 2015 - jfehlig@suse.com
 

libvirt.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libvirt
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -441,6 +441,7 @@ Patch151:       xen-pv-cdrom.patch
 Patch152:       blockcopy-check-dst-identical-device.patch
 Patch153:       libvirt-power8-models.patch
 Patch154:       ppc64le-canonical-name.patch
+Patch155:       apparmor-fixes.patch
 # Our patches
 Patch200:       libvirtd-defaults.patch
 Patch201:       libvirtd-init-script.patch
@@ -973,6 +974,7 @@ Provides a dissector for the libvirt RPC protocol to help debugging it.
 %patch152 -p1
 %patch153 -p1
 %patch154 -p1
+%patch155 -p1
 %patch200 -p1
 %patch201 -p1
 %patch202 -p1

qemu-apparmor-screenshot.patch

@@ -2,7 +2,7 @@ Index: libvirt-1.2.13/examples/apparmor/libvirt-qemu
 ===================================================================
 --- libvirt-1.2.13.orig/examples/apparmor/libvirt-qemu
 +++ libvirt-1.2.13/examples/apparmor/libvirt-qemu
-@@ -124,6 +124,9 @@
+@@ -132,6 +132,9 @@
    /sys/bus/ r,
    /sys/class/ r,