[gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/, app-emulation/libvirt/files/

["Matthias Maier" <tamiko@gentoo.org>]

commit:     fc3adeb678e02011af18951e3868f21ac0141532
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 03:48:09 2015 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 03:48:09 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc3adeb6

app-emulation/libvirt: fix apparmor conf in 1.2.17 and 1.2.18 (bug #554628)

The libvirtd daemon also needs acces to virt-aa-helper and libvirtb_lxc
helper residing under /usr/libexec. This is now fixed.

Thanks to aporilel.

Gentoo-Bug: 554628

Package-Manager: portage-2.2.20.1

 .../libvirt/files/libvirt-1.2.17-fix_paths_for_apparmor.patch         | 4 +++-
 .../libvirt/{libvirt-1.2.17-r4.ebuild => libvirt-1.2.17-r5.ebuild}    | 0
 .../libvirt/{libvirt-1.2.18.ebuild => libvirt-1.2.18-r1.ebuild}       | 0
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app-emulation/libvirt/files/libvirt-1.2.17-fix_paths_for_apparmor.patch b/app-emulation/libvirt/files/libvirt-1.2.17-fix_paths_for_apparmor.patch
index c900ada..8e19c0f 100644
--- a/app-emulation/libvirt/files/libvirt-1.2.17-fix_paths_for_apparmor.patch
+++ b/app-emulation/libvirt/files/libvirt-1.2.17-fix_paths_for_apparmor.patch
@@ -145,12 +145,14 @@ diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.li
 index 5d606e6..ab2f1a9 100644
 --- a/examples/apparmor/usr.sbin.libvirtd
 +++ b/examples/apparmor/usr.sbin.libvirtd
-@@ -58,8 +58,8 @@
+@@ -58,8 +58,10 @@
    audit deny /sys/kernel/security/apparmor/.* rwxl,
    /sys/kernel/security/apparmor/profiles r,
    /usr/{lib,lib64}/libvirt/* PUxr,
 -  /usr/{lib,lib64}/libvirt/libvirt_parthelper ix,
 -  /usr/{lib,lib64}/libvirt/libvirt_iohelper ix,
++  /usr/libexec/virt-aa-helper PUxr,
++  /usr/libexec/libvirt_lxc PUxr,
 +  /usr/libexec/libvirt_parthelper ix,
 +  /usr/libexec/libvirt_iohelper ix,
    /etc/libvirt/hooks/** rmix,

diff --git a/app-emulation/libvirt/libvirt-1.2.17-r4.ebuild b/app-emulation/libvirt/libvirt-1.2.17-r5.ebuild
similarity index 100%
rename from app-emulation/libvirt/libvirt-1.2.17-r4.ebuild
rename to app-emulation/libvirt/libvirt-1.2.17-r5.ebuild

diff --git a/app-emulation/libvirt/libvirt-1.2.18.ebuild b/app-emulation/libvirt/libvirt-1.2.18-r1.ebuild
similarity index 100%
rename from app-emulation/libvirt/libvirt-1.2.18.ebuild
rename to app-emulation/libvirt/libvirt-1.2.18-r1.ebuild