summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Maier <tamiko@gentoo.org>2015-07-29 20:53:38 +0000
committerMatthias Maier <tamiko@gentoo.org>2015-07-29 20:53:38 +0000
commit9776ae8f400cdafd81082b2d8e6dd860baae7492 (patch)
treebb6abba9641483f4194e64546cdaf29ba5906cb9 /app-emulation/libvirt
parentFix syntax errors causing hppa build failures (bug 556196) (diff)
downloadgentoo-2-9776ae8f400cdafd81082b2d8e6dd860baae7492.tar.gz
gentoo-2-9776ae8f400cdafd81082b2d8e6dd860baae7492.tar.bz2
gentoo-2-9776ae8f400cdafd81082b2d8e6dd860baae7492.zip
fix apparmor configuration, many thanks to aporilel, bug #544628
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key BD3A97A3)
Diffstat (limited to 'app-emulation/libvirt')
-rw-r--r--app-emulation/libvirt/ChangeLog8
-rw-r--r--app-emulation/libvirt/files/libvirt-1.2.17-fix_paths_for_apparmor.patch4
-rw-r--r--app-emulation/libvirt/libvirt-1.2.17-r3.ebuild (renamed from app-emulation/libvirt/libvirt-1.2.17-r2.ebuild)2
3 files changed, 10 insertions, 4 deletions
diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 0e0b14fac303..7543ad86c93c 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-emulation/libvirt
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.439 2015/07/28 16:54:00 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.440 2015/07/29 20:53:38 tamiko Exp $
+
+*libvirt-1.2.17-r3 (29 Jul 2015)
+
+ 29 Jul 2015; Matthias Maier <tamiko@gentoo.org> +libvirt-1.2.17-r3.ebuild,
+ -libvirt-1.2.17-r2.ebuild, files/libvirt-1.2.17-fix_paths_for_apparmor.patch:
+ fix apparmor configuration, many thanks to aporilel, bug #544628
*libvirt-1.2.17-r2 (28 Jul 2015)
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 767002d7d4f0..c900ada85f95 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
@@ -96,7 +96,7 @@ index 0000000..b34fb35
+# Last Modified: Mon Apr 5 15:10:27 2010
+#include <tunables/global>
+
-+profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
++profile virt-aa-helper /usr/libexec/virt-aa-helper {
+ #include <abstractions/base>
+
+ # needed for searching directories
@@ -115,7 +115,7 @@ index 0000000..b34fb35
+ /sys/devices/ r,
+ /sys/devices/** r,
+
-+ /usr/{lib,lib64}/libvirt/virt-aa-helper mr,
++ /usr/libexec/virt-aa-helper mr,
+ /sbin/apparmor_parser Ux,
+
+ /etc/apparmor.d/libvirt/* r,
diff --git a/app-emulation/libvirt/libvirt-1.2.17-r2.ebuild b/app-emulation/libvirt/libvirt-1.2.17-r3.ebuild
index a04dd8ff2c40..196be7e9b9a8 100644
--- a/app-emulation/libvirt/libvirt-1.2.17-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.17-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.17-r2.ebuild,v 1.1 2015/07/28 16:54:00 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.17-r3.ebuild,v 1.1 2015/07/29 20:53:38 tamiko Exp $
EAPI=5