fix apparmor configuration, many thanks to aporilel, bug #544628

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

4 files changed, 26 insertions, 20 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/Manifest b/app-emulation/libvirt/Manifest
index 6c52163c6f7d..f7a9c7896911 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA256
 
 AUX libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch 641 SHA256 a8417304d8dfd4d042956d33bfb373d61c7c2c0e8ead8c384300bf32f8acee8e SHA512 df9960b80c7dda852e38d992ab31181d79091bd6e1ba88c0b0c1af8a2f2d1445ee95c957df38ab27b452cd2de01d36b88164e665a867ad69c15ca15c18b1d588 WHIRLPOOL 892bc9d14257929718e29671bea2eb44ed25a8ed5f7f4d8ee72c9d82a4e6a96b5da67f43279de29c06d6abe41ab2792b48515c2dea46aa4a452d76e85ebda973
-AUX libvirt-1.2.17-fix_paths_for_apparmor.patch 4811 SHA256 43d40ac2b0c3d711e54ba9604285fae4e838eb3a17320a30588692d5fb3a2ad6 SHA512 0b8b0d9ea34d8417823634e22e80995e0b90df6d496b6f9c4df684981c163c567898ca5a691f73f6a7b9161960e54f60efcffa528360046466975aad9ebcee92 WHIRLPOOL 0c1d64dc69801657e7aee76f5881ed859a46f8cac350a58abccd8dc93669977492df7bac53e7655ea56bfc395157e675e1faff1def259ef468c2a37736ca259b
+AUX libvirt-1.2.17-fix_paths_for_apparmor.patch 4787 SHA256 635c3155ab71ee37813306882aae4b34b8fa372b57f669f0f51ffdee3dc56a95 SHA512 df4fbb504f037e3852e69208bcc190d5fa4ba81cc36e571f938e727edaaf7f013fe93871b3ae8f5e80387f698aee42c85e2f9f0ac6627fa56992a923d840d998 WHIRLPOOL 11e00d56559e8a1a1f8845f601f3e1f182c46e8f465adc7f0383c3843304a14aca9eba5d7f71a05ea3a97f55528f9d1f2cbb496d3a64713099894680f69edd25
 AUX libvirt-1.2.9-do_not_use_sysconf.patch 3879 SHA256 1a0c0b29c481097ee218cc752b11f00193a87a010feefc71ea3f56e041c5844d SHA512 cd8881ed2fd928e4fc122a8615fc328f515181129253cba1124c1faf48549729428113822b56034143e192c44944b1a40e83b960f742db64738e5bc05b9bb371 WHIRLPOOL 9413e40883d98d5d78a2c269786a2f640ec9689744ef431a4e9a092d251d33deda954ad8631520a04a16d8c30ca2e9b28bc8b78562f27267f80740901907a253
 AUX libvirtd.confd-r4 2015 SHA256 c2ca5d9a2d4ed433e91bd215c2ca678109cc981072897a497955e36760dc3b9f SHA512 b3e1d2433be7838a35386747422a8f98f2a7f6a92a03089f9472eb8ee2efb7d10d2becd363fea7cdaf8771da31b58cd60d192b25e089b6257ad5341b1074e540 WHIRLPOOL 284e72e704b759433d5ddc1a3e4019164dda6b48cb2734ea9a6780747938bba2855a99dcf1b125ab3f500a6145315cafa4a3531ff6938c0c62e5b1a6f99ea9b3
 AUX libvirtd.confd-r6 2748 SHA256 c0efc7ed4c8ded561bbb86a35be8ed3e20c7a6f1a0aa093f10af9e1d25365ddd SHA512 e2fc96cdd15d101a58a9206a1680b55b7dc39a5743637ae32eed05523a5a5794ce5e94ffd419fd84334d26e137e4d739800a35b501c62f543db2f3348b9a2d4b WHIRLPOOL b77eef58320c86538a163878973cec2ccde8957cf53b764cb89b57fa7b583f7f90a5dcc00917daf17b8f93f3ab1a0477d507de99888c8551a44988e5f25e5e4d
@@ -14,24 +14,24 @@ AUX virtlockd.init-r1 689 SHA256 d156cf6a2b00d8d81529e63231fd49b2599838f6c79740f
 DIST libvirt-1.2.15.tar.gz 29094868 SHA256 5f88041b8c212f8f687c672fe583108833240d6175b512ce4de92ab6660194c6 SHA512 c5dd3af86e89e3804d6c3b527c6dbd98c79d87d2591725a13af33530e0e9a9a2e9aeb9491844469d44ec4f4d17adb036c76391f964158ada23ec042a75556fbc WHIRLPOOL a43aad4caeff707c8d7a6872ff3c46911c96fd90ece02a7f6ceabb4ccd00e467b5341ab9d922912cc2968a2bb8826e970b253b257c5a8981b37364550f9b3616
 DIST libvirt-1.2.17.tar.gz 29320317 SHA256 e07eaf20b0590fae05ba3b53ad4dac3e5fbd771437563cc78b692f23ddd02fad SHA512 133ee2da30352d5eeb81c3e24f6eaf21c40b5afeb05abece9298956fa9c52c62ebc3468433311853cf2d65894e38e98f5c6744269d2d64fa3b3cf6f4b9b0cc46 WHIRLPOOL 4fdd6554989ea7d32600cc978d2c95582433ac223e933b55d838ba4ddffba2d6444a0d556348681ad36766e73ba2bf9788b37180c980636324b5b6fa093a2347
 EBUILD libvirt-1.2.15-r1.ebuild 13114 SHA256 28891eb6ac237e81e27348873aee084e79cb0bcdcb4a6414cbef42b5e25b259c SHA512 6b917e31971c93502a93cb133aab84c49647827b60e25f596f566c65854f1e48bedd4a333b3c307f88f738b54f73e0915e5be4c3648fc8a42e7fa83667b0d9af WHIRLPOOL 22c63f65ef9f4775b350226aa86b2c7eba32e71043d82b826b14e77f4bec5a43cdb834539f92a8e5cd5f8f7f8e1d694023fb7b5b2d413cde58e61f8e59c4e911
-EBUILD libvirt-1.2.17-r2.ebuild 13511 SHA256 3adef1557b577d786eb8c165536d291d65256d1d67ebd0f6fa2cfad04b4cabfa SHA512 5299ca7f6f86339c9ee49356c15983bd3ef2d89182240aefb8a3d7c60c58799cb9b06fc652c1f67e94942cff5e252df189d2a1d6cf81d8cf3a6f927f195fe550 WHIRLPOOL fc6e897494c12c7be37d9a699755cbc3b907cf65b55a50e1aca45ddbb67820f362ae8ca4c3df8d037b5da56643dbd5d96acf1d6f8782fe78667f235317e14d79
+EBUILD libvirt-1.2.17-r3.ebuild 13511 SHA256 97210296978b6533166b0a7d5631df5c1c06f184086bf7808a2b7e430154058c SHA512 ece84d6453625922453c3fdd9eb05c5ffe0493333bdb1f9a33677fb16421e487adc34ae7878732078f2dd4996e8c76664edf82517358a99e026e434d07171984 WHIRLPOOL 431d6a9faa61deb8d01ecbce6f171f4176e7027db19d64c17ed94c65f74b3271a3e97693ee0cac3a8ea4b5ace2133cda6a36163f8e4800e61f79b40bc4152bc1
 EBUILD libvirt-9999.ebuild 13507 SHA256 99470b10d93c8714d7ab5a1800997b299c669c0971e2cfa44da9270f7d6dfa7b SHA512 74e654035a736422257fb5c6020ff8983333050145d1a491eccad697bcc13f208ab8447f2eba3be80eb3d0fd2e5db89d6fcb57646e0109c5c7136fcf06f13cf0 WHIRLPOOL dc141c506491702798060ea2591548c0f9c071d9ad0d97b1b298e8860db452edd5bc65e4be82d8c7add4477fe8085ab0ae01b942c8fce70c6ee098418f7ada99
-MISC ChangeLog 32492 SHA256 fd0f8e3a0ee8e6b1559ca8725f65eba602dd3c51e6c34f2009750ab944686bb1 SHA512 bd1b371339246f234be8484fb3ce2bb7efa0985af5531fe29cda8af835e8b7653ba36c29385770fe813876dbc21a83b5ac002bc8dec5a05fd23f0b56b8803e12 WHIRLPOOL 95d0d20a37a8af50510fac17910463e0d7254511259c124d8d4e153fadf80c3e7fb0b62edcace5f0e5a8a1ce9c8710f2829e215d105e2afcac46928bec6beb55
+MISC ChangeLog 32751 SHA256 8504b5f17052cc857933704c2217495fb3721fd9176642649f2dfac73d75dfa8 SHA512 55889b95cbd03cf88ee8760dfcbfb1d9fa31aec3fd96bab5f430fd3d851576360a8114368a836346b0b62eaaf20f40062b67a7c54ce57b2103ba8201c0057dfd WHIRLPOOL 7ad305dff3e2788c1b38931470b797eaa507fa5b1cfd96f0f758bf09cfd2aa5ad50a42b07999dc363ad5c9d1df1a2d5f2c609667698443c9d200ae83ff6592d3
 MISC metadata.xml 3658 SHA256 c7c446bc631d4418ea5e9b78abccbb270be9cdba9421ff8a4c43ff48a62fd432 SHA512 49c1e323e82dcbd22978358412820d4b1dd1741208598013eebc1da78f71b0fd803e5e2f9158958bc0f96fafc3041d8ddb0a1401365d6eb840919681279c03a3 WHIRLPOOL fe9848544bf084013ac380986ec763423c6fb762981875cd90ee1ddced949258e9a96122bbc3987800ee7955df9e1559b74f713469ec10cd088154d17d7e1b73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJVt7OpAAoJELhOzYlK7nn/ojwP/3VgfhMkiosavuMFbd1gFq5I
-8Z+Li0+o5pqLrSUIVyadvcTSRmmN1OPTqL7chfiJ0eC1EzqyOTG7OmapNB/IzUNs
-cfkVTrRkkS5atdTu/rb4BO/d+1zH86/9srvY1xjtgih94gDZ/7LNA3pmERp8gUFO
-Q6h3DTgFcw/Zw8ItZsG9bMiv9fdxsPldHAGdW4hQPaPc0g+x0vGvSsgeZpPy+S+s
-KE0wYfj03cQzfnK6hjuQ2NrcS61jEHcgOC+Mg6UGpjZULH+xmvAQ9Vioah7hyRMr
-sJNPiH4yCTFSr6gbBpvtYf8cIaS54XkHPzUIfx5sz+FJiSNKwwa041K+JW+JLS8S
-XXp0C3xZUhpJA0fSAPz5w8s0XsmVD4iFmTxqR3Zr/xAlaEC79S2fKe2zIbryV8AO
-T/FEZxZDNUJuWTXzgDPut+8+1jpSpCboX1Xf90amxaM0m5IGb3lZgKAmCAKoZZ/J
-itlAZUBwEMKKj4DXF08pvDT6FLAQ1yxV17spV9HgHBZODzG+u38/QP9UNEYHNz0u
-WCW9leaehRgaLvs+NIvkRvcQpoVxGFX1pabGbnthAOVIM+SlvAv17YxaLqQoXc99
-G1ITmZChuq+OrZQlFTHyTtSJZa3xhOuvgoIiRKQu4fP1BWf2t1UE8IISadBVaVRA
-hv0+OKy+s1KFCMJXoyL9
-=uIpJ
+iQIcBAEBCAAGBQJVuT1UAAoJELhOzYlK7nn/BWkP/3IZ5Y2I/TmwPmNfJm7bXVay
+6Cq2DlIrnORRiRfHOTHeXYM9yy25HUi7LTa86lLHAAm/Uvr39PpzWLx61uVn7AiG
+ZNg2qHTahyKxEj1eUDTrGK63m9aZmaBa1BOqxwz7OukHh41mixev4LgOynQlq5Fh
+A7hd3EMqzeDBCO6KAAW1DlpohAInwExRPwC8hBYSGrjCp82yv/E1Uxb9YLEH4BZu
+Z7uVZSgcfRxdENbOcKF65/qZFcLtvvuZXv+b3PyHnwfVsgiW1RRYFi8l2APTwSRQ
+WsmpGP/fyYMBLrZy6J8xfSj9DFNIDv8GON1EE/hDMi1Hr0iNQvk0XxMp6KtMlEva
+ZSjR8smJJeA1zwDwI+AlqrzGpPCXK3RVyc36Fj04/YV9Ly3AAx4SqOhPkcrgZQsc
+mWdL//ErSW4sE2Wr7HCOlKa0nK/eqNKXp7gKL+XkXQYTXvAxVCd2U2ZN+Y5NO9ov
+8Gz/yFCOrLv6tT7om1LAqGPdi6LJCZlJQHjl1nvBtqgJahk3LaSAfI0m6Qbxgp0q
+W+NXJp0BXnhPlFz99ntDsR8sBvgV8ToP2DP5b9KrEFhwtG81j4TYsmkFsMyKwLKZ
+Z6Nvj8AlPvkzWuk3W5mfEWibH5SZm1TqCMf/bxeJlxNsAIw7YLLeVkcqp+OSoa+3
+Vn+6uaKKPIGoUu3s6/Lx
+=72Iy
 -----END PGP SIGNATURE-----
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