summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai-Chun Ning <kaichun.ning@gmail.com>2023-06-22 17:38:27 +0200
committerSam James <sam@gentoo.org>2023-06-24 02:42:09 +0100
commit9170e00db4ac439fe8e444af14ec53bfa329f639 (patch)
tree7dc012bc62642895863aae9090d424003c163f82 /app-emulation/libvirt/files/libvirt-9.4.0-fix-paths-for-apparmor.patch
parentsys-block/zram-init: forward ~arm (diff)
downloadgentoo-9170e00db4ac439fe8e444af14ec53bfa329f639.tar.gz
gentoo-9170e00db4ac439fe8e444af14ec53bfa329f639.tar.bz2
gentoo-9170e00db4ac439fe8e444af14ec53bfa329f639.zip
app-emulation/libvirt: fix apparmor path in 9.4.0-r3
Bug: https://bugs.gentoo.org/908805 Signed-off-by: Kai-Chun Ning <kaichun.ning@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/31575 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-emulation/libvirt/files/libvirt-9.4.0-fix-paths-for-apparmor.patch')
-rw-r--r--app-emulation/libvirt/files/libvirt-9.4.0-fix-paths-for-apparmor.patch17
1 files changed, 9 insertions, 8 deletions
diff --git a/app-emulation/libvirt/files/libvirt-9.4.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-9.4.0-fix-paths-for-apparmor.patch
index dd2562f395fb..b043825bbe08 100644
--- a/app-emulation/libvirt/files/libvirt-9.4.0-fix-paths-for-apparmor.patch
+++ b/app-emulation/libvirt/files/libvirt-9.4.0-fix-paths-for-apparmor.patch
@@ -6,12 +6,12 @@ Subject: [PATCH] libvirt-9.5.0-fix-paths-for-apparmor.patch
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
- src/security/apparmor/libvirt-qemu | 1 +
- src/security/apparmor/meson.build | 4 ++--
- src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local | 1 -
- ...irt-aa-helper.in => usr.libexec.libvirt.virt-aa-helper.in} | 4 ++--
- .../apparmor/usr.libexec.libvirt.virt-aa-helper.local | 1 +
- 5 files changed, 6 insertions(+), 5 deletions(-)
+ src/security/apparmor/libvirt-qemu | 1 +
+ src/security/apparmor/meson.build | 6 +++---
+ src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local | 1 -
+ ...t-aa-helper.in => usr.libexec.libvirt.virt-aa-helper.in} | 4 ++--
+ .../apparmor/usr.libexec.libvirt.virt-aa-helper.local | 1 +
+ 5 files changed, 7 insertions(+), 6 deletions(-)
delete mode 100644 src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local
rename src/security/apparmor/{usr.lib.libvirt.virt-aa-helper.in => usr.libexec.libvirt.virt-aa-helper.in} (94%)
create mode 100644 src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local
@@ -29,7 +29,7 @@ index 44056b5f14..1f0db2cda2 100644
# 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..6f4ebb7fa9 100644
+index 58b4024b85..c77b32665d 100644
--- a/src/security/apparmor/meson.build
+++ b/src/security/apparmor/meson.build
@@ -1,5 +1,5 @@
@@ -46,7 +46,8 @@ index 58b4024b85..6f4ebb7fa9 100644
- '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.lib.libvirt.virt-aa-helper',
++ rename: 'usr.libexec.libvirt.virt-aa-helper',
)
diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local
deleted file mode 100644