Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2015-01-07 09:38:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt" Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2014-12-30 00:49:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2015-01-07 09:38:56.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Jan 5 09:44:12 UTC 2015 - [email protected] + +- Replaced hard to maintain install-apparmor-profiles.patch + by upstreamed 30c6aecc-apparmor-lib64.patch. +- Reformatted libvirt.spec and libvirtd.init to pass upstream make + syntax-check + +------------------------------------------------------------------- Old: ---- install-apparmor-profiles.patch New: ---- 30c6aecc-apparmor-lib64.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ ++++ 1463 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/libvirt/libvirt.spec ++++ and /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.spec ++++++ 30c6aecc-apparmor-lib64.patch ++++++ >From 30c6aecc449202e930249215c6514d6c13a46c83 Mon Sep 17 00:00:00 2001 From: Cedric Bosdonnat <[email protected]> Date: Mon, 15 Dec 2014 15:14:48 +0100 Subject: [PATCH] Teach AppArmor, that /usr/lib64 may exist. The apparmor profiles forgot about /usr/lib64 folders, just add lib64 as a possible alternative to lib in the paths --- examples/apparmor/libvirt-qemu | 2 +- examples/apparmor/usr.lib.libvirt.virt-aa-helper | 4 ++-- examples/apparmor/usr.sbin.libvirtd | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu index c6de6dd..7aad391 100644 --- a/examples/apparmor/libvirt-qemu +++ b/examples/apparmor/libvirt-qemu @@ -111,7 +111,7 @@ /usr/bin/qemu-sparc32plus rmix, /usr/bin/qemu-sparc64 rmix, /usr/bin/qemu-x86_64 rmix, - /usr/lib/qemu/block-curl.so mr, + /usr/{lib,lib64}/qemu/block-curl.so mr, # for save and resume /bin/dash rmix, diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper index bceaaff..b34fb35 100644 --- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper +++ b/examples/apparmor/usr.lib.libvirt.virt-aa-helper @@ -1,7 +1,7 @@ # Last Modified: Mon Apr 5 15:10:27 2010 #include <tunables/global> -/usr/lib/libvirt/virt-aa-helper { +profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper { #include <abstractions/base> # needed for searching directories @@ -20,7 +20,7 @@ /sys/devices/ r, /sys/devices/** r, - /usr/lib/libvirt/virt-aa-helper mr, + /usr/{lib,lib64}/libvirt/virt-aa-helper mr, /sbin/apparmor_parser Ux, /etc/apparmor.d/libvirt/* r, diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd index 3011eff..7151052 100644 --- a/examples/apparmor/usr.sbin.libvirtd +++ b/examples/apparmor/usr.sbin.libvirtd @@ -44,7 +44,7 @@ /usr/bin/* PUx, /usr/sbin/* PUx, /lib/udev/scsi_id PUx, - /usr/lib/xen-common/bin/xen-toolstack PUx, + /usr/{lib,lib64}/xen-common/bin/xen-toolstack PUx, # force the use of virt-aa-helper audit deny /sbin/apparmor_parser rwxl, @@ -53,7 +53,7 @@ audit deny /sys/kernel/security/apparmor/matching rwxl, audit deny /sys/kernel/security/apparmor/.* rwxl, /sys/kernel/security/apparmor/profiles r, - /usr/lib/libvirt/* PUxr, + /usr/{lib,lib64}/libvirt/* PUxr, /etc/libvirt/hooks/** rmix, /etc/xen/scripts/** rmix, -- 2.1.2 ++++++ libvirtd.init ++++++ --- /var/tmp/diff_new_pack.FnQ3Ic/_old 2015-01-07 09:38:58.000000000 +0100 +++ /var/tmp/diff_new_pack.FnQ3Ic/_new 2015-01-07 09:38:58.000000000 +0100 @@ -22,7 +22,7 @@ LIBVIRTD_PIDFILE=/var/run/libvirtd.pid test -x $LIBVIRTD_BIN || { echo "$LIBVIRD_BIN not installed"; if [ "$1" = "stop" ]; then exit 0; - else exit 5; fi; } + else exit 5; fi; } . /etc/rc.status @@ -41,7 +41,7 @@ if [ -e $LIBVIRTD_PIDFILE ]; then if checkproc $LIBVIRTD_BIN ; then echo -n "libvirtd is already running." - rc_status -v + rc_status -v exit else echo "Removing stale PID file $LIBVIRTD_PIDFILE." @@ -76,7 +76,7 @@ rc_status ;; reload) - killproc -HUP $LIBVIRTD_BIN + killproc -HUP $LIBVIRTD_BIN rc_status -v ;; status) @@ -86,8 +86,8 @@ ;; *) echo "Usage: $0 {start|stop|restart|try-restart|reload|status}" - rc_failed 2 - rc_exit + rc_failed 2 + rc_exit ;; esac rc_exit ++++++ qemu-apparmor-screenshot.patch ++++++ --- /var/tmp/diff_new_pack.FnQ3Ic/_old 2015-01-07 09:38:58.000000000 +0100 +++ /var/tmp/diff_new_pack.FnQ3Ic/_new 2015-01-07 09:38:58.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.10/examples/apparmor/libvirt-qemu.in +Index: libvirt-1.2.11/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-1.2.10.orig/examples/apparmor/libvirt-qemu.in -+++ libvirt-1.2.10/examples/apparmor/libvirt-qemu.in +--- libvirt-1.2.11.orig/examples/apparmor/libvirt-qemu ++++ libvirt-1.2.11/examples/apparmor/libvirt-qemu @@ -124,6 +124,9 @@ /sys/bus/ r, /sys/class/ r, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
