| 1 |
commit: adcefe5c40a45576ec0999c39f34b9c9ab85708d |
| 2 |
Author: Jonathan Davies <jpds <AT> protonmail <DOT> com> |
| 3 |
AuthorDate: Tue Oct 6 17:03:44 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 6 18:07:10 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adcefe5c |
| 7 |
|
| 8 |
app-emulation/libvirt: fix libvirt-6.7.0-fix-paths-for-apparmor.patch |
| 9 |
|
| 10 |
* File renames are handled by meson.build. |
| 11 |
* Restored libvirt in front of virt-aa-helper.in. |
| 12 |
* Renamed local helper to also be under libexec. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/746182 |
| 15 |
|
| 16 |
Signed-off-by: Jonathan Davies <jpds <AT> protonmail.com> |
| 17 |
Closes: https://github.com/gentoo/gentoo/pull/17823 |
| 18 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 19 |
|
| 20 |
.../libvirt-6.7.0-fix-paths-for-apparmor.patch | 31 +++++++++++++++++++--- |
| 21 |
1 file changed, 28 insertions(+), 3 deletions(-) |
| 22 |
|
| 23 |
diff --git a/app-emulation/libvirt/files/libvirt-6.7.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-6.7.0-fix-paths-for-apparmor.patch |
| 24 |
index 1ca70030062..fcd15191eca 100644 |
| 25 |
--- a/app-emulation/libvirt/files/libvirt-6.7.0-fix-paths-for-apparmor.patch |
| 26 |
+++ b/app-emulation/libvirt/files/libvirt-6.7.0-fix-paths-for-apparmor.patch |
| 27 |
@@ -10,10 +10,31 @@ index 80986ae..d550d8c 100644 |
| 28 |
|
| 29 |
# pki for libvirt-vnc and libvirt-spice (LP: #901272, #1690140) |
| 30 |
/etc/pki/CA/ r, |
| 31 |
-diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/security/apparmor/usr.libexec.virt-aa-helper.in |
| 32 |
+ |
| 33 |
+--- a/src/security/apparmor/meson.build 2020-10-06 17:45:18.590000000 +0100 |
| 34 |
++++ b/src/security/apparmor/meson.build 2020-10-06 17:45:07.044000000 +0100 |
| 35 |
+@@ -1,5 +1,5 @@ |
| 36 |
+ apparmor_gen_profiles = [ |
| 37 |
+- 'usr.lib.libvirt.virt-aa-helper', |
| 38 |
++ 'usr.libexec.libvirt.virt-aa-helper', |
| 39 |
+ 'usr.sbin.libvirtd', |
| 40 |
+ ] |
| 41 |
+ |
| 42 |
+@@ -32,7 +32,7 @@ install_data( |
| 43 |
+ ) |
| 44 |
+ |
| 45 |
+ install_data( |
| 46 |
+- 'usr.lib.libvirt.virt-aa-helper.local', |
| 47 |
++ 'usr.libexec.libvirt.virt-aa-helper.local', |
| 48 |
+ install_dir: apparmor_dir / 'local', |
| 49 |
+- rename: 'usr.lib.libvirt.virt-aa-helper', |
| 50 |
++ rename: 'usr.libexec.libvirt.virt-aa-helper', |
| 51 |
+ ) |
| 52 |
+ |
| 53 |
+diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in |
| 54 |
similarity index 97% |
| 55 |
rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in |
| 56 |
-rename to src/security/apparmor/usr.libexec.virt-aa-helper.in |
| 57 |
+rename to src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in |
| 58 |
index dd18c8a..d06f9cb 100644 |
| 59 |
--- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in |
| 60 |
+++ b/src/security/apparmor/usr.libexec.virt-aa-helper.in |
| 61 |
@@ -22,5 +43,9 @@ index dd18c8a..d06f9cb 100644 |
| 62 |
/**/disk{,.*} r, |
| 63 |
|
| 64 |
- #include <local/usr.lib.libvirt.virt-aa-helper> |
| 65 |
-+ #include <local/usr.libexec.virt-aa-helper> |
| 66 |
++ #include <local/usr.libexec.libvirt.virt-aa-helper> |
| 67 |
} |
| 68 |
+diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local |
| 69 |
+similarity index 100% |
| 70 |
+rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local |
| 71 |
+rename to src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local |
Archives