69 lines
2.7 KiB
Diff
69 lines
2.7 KiB
Diff
From 52ecc3247d72e2a5ffc390093d803f59e20087f6 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <52ecc3247d72e2a5ffc390093d803f59e20087f6.1647318231.git.mprivozn@redhat.com>
|
|
From: Michal Privoznik <mprivozn@redhat.com>
|
|
Date: Tue, 15 Mar 2022 05:23:29 +0100
|
|
Subject: [PATCH] libvirt-8.2.0-fix-paths-for-apparmor.patch
|
|
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
---
|
|
diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu
|
|
index 44056b5f14..1f0db2cda2 100644
|
|
--- a/src/security/apparmor/libvirt-qemu
|
|
+++ b/src/security/apparmor/libvirt-qemu
|
|
@@ -96,6 +96,7 @@
|
|
/usr/share/sgabios/** r,
|
|
/usr/share/slof/** r,
|
|
/usr/share/vgabios/** r,
|
|
+ /usr/share/seavgabios/** r,
|
|
|
|
# pki for libvirt-vnc and libvirt-spice (LP: #901272, #1690140)
|
|
/etc/pki/CA/ r,
|
|
diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build
|
|
index 58b4024b85..c77b32665d 100644
|
|
--- a/src/security/apparmor/meson.build
|
|
+++ b/src/security/apparmor/meson.build
|
|
@@ -1,5 +1,5 @@
|
|
apparmor_gen_profiles = [
|
|
- 'usr.lib.libvirt.virt-aa-helper',
|
|
+ 'usr.libexec.libvirt.virt-aa-helper',
|
|
'usr.sbin.libvirtd',
|
|
'usr.sbin.virtqemud',
|
|
'usr.sbin.virtxend',
|
|
@@ -35,7 +35,7 @@ install_data(
|
|
)
|
|
|
|
install_data(
|
|
- 'usr.lib.libvirt.virt-aa-helper.local',
|
|
+ 'usr.libexec.libvirt.virt-aa-helper.local',
|
|
install_dir: apparmor_dir / 'local',
|
|
- rename: 'usr.lib.libvirt.virt-aa-helper',
|
|
+ rename: 'usr.libexec.libvirt.virt-aa-helper',
|
|
)
|
|
diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in
|
|
similarity index 94%
|
|
rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
|
|
rename to src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in
|
|
index ff1d46bebe..6beedde1b1 100644
|
|
--- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
|
|
+++ b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in
|
|
@@ -41,7 +41,7 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper {
|
|
deny /dev/mapper/* r,
|
|
|
|
@libexecdir@/virt-aa-helper mr,
|
|
- /{usr/,}sbin/apparmor_parser Ux,
|
|
+ /{usr/,}{s,}bin/apparmor_parser Ux,
|
|
|
|
@sysconfdir@/apparmor.d/libvirt/* r,
|
|
@sysconfdir@/apparmor.d/libvirt/libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]* rw,
|
|
@@ -71,5 +71,5 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper {
|
|
/**.[iI][sS][oO] r,
|
|
/**/disk{,.*} r,
|
|
|
|
- #include <local/usr.lib.libvirt.virt-aa-helper>
|
|
+ #include <local/usr.libexec.libvirt.virt-aa-helper>
|
|
}
|
|
diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local
|
|
similarity index 100%
|
|
rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local
|
|
rename to src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local
|