1 |
commit: a4d74d2fec11558f4de07a0411e143d5dbe2db72 |
2 |
Author: aporilel <aporilel <AT> yandex <DOT> ru> |
3 |
AuthorDate: Sun Aug 23 11:20:28 2020 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 5 07:53:46 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4d74d2f |
7 |
|
8 |
app-emulation/libvirt: add apparmor rule for seavgabios |
9 |
|
10 |
Closes: https://bugs.gentoo.org/629718 |
11 |
Signed-off-by: Anton Smirnov <aporilel <AT> yandex.ru> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/15255 |
13 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
14 |
|
15 |
.../libvirt-6.5.0-fix-paths-for-apparmor.patch | 82 ++++++++++++++++++++++ |
16 |
...ibvirt-6.5.0.ebuild => libvirt-6.5.0-r1.ebuild} | 2 +- |
17 |
2 files changed, 83 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/app-emulation/libvirt/files/libvirt-6.5.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-6.5.0-fix-paths-for-apparmor.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..97e50cd357c |
22 |
--- /dev/null |
23 |
+++ b/app-emulation/libvirt/files/libvirt-6.5.0-fix-paths-for-apparmor.patch |
24 |
@@ -0,0 +1,82 @@ |
25 |
+diff --git a/src/Makefile.in b/src/Makefile.in |
26 |
+index 36bd280..07cebdf 100644 |
27 |
+--- a/src/Makefile.in |
28 |
++++ b/src/Makefile.in |
29 |
+@@ -4473,7 +4473,7 @@ SECURITY_DRIVER_APPARMOR_SOURCES = \ |
30 |
+ $(NULL) |
31 |
+ |
32 |
+ SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES_IN = \ |
33 |
+- security/apparmor/usr.lib.libvirt.virt-aa-helper.in \ |
34 |
++ security/apparmor/usr.libexec.virt-aa-helper.in \ |
35 |
+ security/apparmor/usr.sbin.libvirtd.in \ |
36 |
+ $(NULL) |
37 |
+ |
38 |
+@@ -13821,11 +13821,11 @@ security/apparmor/%: $(srcdir)/security/apparmor/%.in |
39 |
+ @WITH_APPARMOR_PROFILES_TRUE@install-apparmor-local: $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES) |
40 |
+ @WITH_APPARMOR_PROFILES_TRUE@ $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)" |
41 |
+ @WITH_APPARMOR_PROFILES_TRUE@ echo "# Site-specific additions and overrides for \ |
42 |
+-@WITH_APPARMOR_PROFILES_TRUE@ 'usr.lib.libvirt.virt-aa-helper'" \ |
43 |
+-@WITH_APPARMOR_PROFILES_TRUE@ >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" |
44 |
++@WITH_APPARMOR_PROFILES_TRUE@ 'usr.libexec.virt-aa-helper'" \ |
45 |
++@WITH_APPARMOR_PROFILES_TRUE@ >"$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" |
46 |
+ |
47 |
+ @WITH_APPARMOR_PROFILES_TRUE@uninstall-apparmor-local: |
48 |
+-@WITH_APPARMOR_PROFILES_TRUE@ rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" |
49 |
++@WITH_APPARMOR_PROFILES_TRUE@ rm -f "$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" |
50 |
+ @WITH_APPARMOR_PROFILES_TRUE@ rmdir "$(APPARMOR_LOCAL_DIR)" || : |
51 |
+ |
52 |
+ $(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ |
53 |
+diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am |
54 |
+index 5f2f4c8..d457cc6 100644 |
55 |
+--- a/src/security/Makefile.inc.am |
56 |
++++ b/src/security/Makefile.inc.am |
57 |
+@@ -31,7 +31,7 @@ SECURITY_DRIVER_APPARMOR_SOURCES = \ |
58 |
+ $(NULL) |
59 |
+ |
60 |
+ SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES_IN = \ |
61 |
+- security/apparmor/usr.lib.libvirt.virt-aa-helper.in \ |
62 |
++ security/apparmor/usr.libexec.virt-aa-helper.in \ |
63 |
+ security/apparmor/usr.sbin.libvirtd.in \ |
64 |
+ $(NULL) |
65 |
+ |
66 |
+@@ -130,11 +130,11 @@ APPARMOR_LOCAL_DIR = "$(DESTDIR)$(apparmordir)/local" |
67 |
+ install-apparmor-local: $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES) |
68 |
+ $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)" |
69 |
+ echo "# Site-specific additions and overrides for \ |
70 |
+- 'usr.lib.libvirt.virt-aa-helper'" \ |
71 |
+- >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" |
72 |
++ 'usr.libexec.virt-aa-helper'" \ |
73 |
++ >"$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" |
74 |
+ |
75 |
+ uninstall-apparmor-local: |
76 |
+- rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" |
77 |
++ rm -f "$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" |
78 |
+ rmdir "$(APPARMOR_LOCAL_DIR)" || : |
79 |
+ |
80 |
+ INSTALL_DATA_LOCAL += install-apparmor-local |
81 |
+diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu |
82 |
+index 80986ae..d550d8c 100644 |
83 |
+--- a/src/security/apparmor/libvirt-qemu |
84 |
++++ b/src/security/apparmor/libvirt-qemu |
85 |
+@@ -88,6 +88,7 @@ |
86 |
+ /usr/share/sgabios/** r, |
87 |
+ /usr/share/slof/** r, |
88 |
+ /usr/share/vgabios/** r, |
89 |
++ /usr/share/seavgabios/** r, |
90 |
+ |
91 |
+ # pki for libvirt-vnc and libvirt-spice (LP: #901272, #1690140) |
92 |
+ /etc/pki/CA/ r, |
93 |
+diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/security/apparmor/usr.libexec.virt-aa-helper.in |
94 |
+similarity index 97% |
95 |
+rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in |
96 |
+rename to src/security/apparmor/usr.libexec.virt-aa-helper.in |
97 |
+index dd18c8a..d06f9cb 100644 |
98 |
+--- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in |
99 |
++++ b/src/security/apparmor/usr.libexec.virt-aa-helper.in |
100 |
+@@ -69,5 +69,5 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper { |
101 |
+ /**.[iI][sS][oO] r, |
102 |
+ /**/disk{,.*} r, |
103 |
+ |
104 |
+- #include <local/usr.lib.libvirt.virt-aa-helper> |
105 |
++ #include <local/usr.libexec.virt-aa-helper> |
106 |
+ } |
107 |
|
108 |
diff --git a/app-emulation/libvirt/libvirt-6.5.0.ebuild b/app-emulation/libvirt/libvirt-6.5.0-r1.ebuild |
109 |
similarity index 99% |
110 |
rename from app-emulation/libvirt/libvirt-6.5.0.ebuild |
111 |
rename to app-emulation/libvirt/libvirt-6.5.0-r1.ebuild |
112 |
index f236af9bf3a..8f75ce01f35 100644 |
113 |
--- a/app-emulation/libvirt/libvirt-6.5.0.ebuild |
114 |
+++ b/app-emulation/libvirt/libvirt-6.5.0-r1.ebuild |
115 |
@@ -123,7 +123,7 @@ DEPEND="${RDEPEND} |
116 |
|
117 |
PATCHES=( |
118 |
"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch |
119 |
- "${FILESDIR}"/${PN}-6.1.0-fix-paths-for-apparmor.patch |
120 |
+ "${FILESDIR}"/${PN}-6.5.0-fix-paths-for-apparmor.patch |
121 |
"${FILESDIR}"/${PN}-6.5.0-do-not-use-sysconfig.patch |
122 |
) |