commit: 9170e00db4ac439fe8e444af14ec53bfa329f639 Author: Kai-Chun Ning <kaichun.ning <AT> gmail <DOT> com> AuthorDate: Thu Jun 22 15:38:27 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jun 24 01:42:09 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9170e00d
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 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/31575 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/libvirt-9.4.0-fix-paths-for-apparmor.patch | 17 +++++++++-------- ...{libvirt-9.4.0-r2.ebuild => libvirt-9.4.0-r3.ebuild} | 0 2 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 <mpriv...@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 diff --git a/app-emulation/libvirt/libvirt-9.4.0-r2.ebuild b/app-emulation/libvirt/libvirt-9.4.0-r3.ebuild similarity index 100% rename from app-emulation/libvirt/libvirt-9.4.0-r2.ebuild rename to app-emulation/libvirt/libvirt-9.4.0-r3.ebuild
