commit: d4cb1a4919f65fd7f6d27874fc10db5bd34cad13 Author: Michal Privoznik <michal.privoznik <AT> gmail <DOT> com> AuthorDate: Sat Apr 5 14:37:08 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Apr 8 09:46:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4cb1a49
app-emulation/libvirt: Rebase patches for live ebuild Signed-off-by: Michal Privoznik <michal.privoznik <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/41483 Signed-off-by: Sam James <sam <AT> gentoo.org> .../libvirt-11.3.0-do-not-use-sysconfig.patch | 81 ++++++++++++++++++++++ .../libvirt-11.3.0-fix-paths-for-apparmor.patch | 74 ++++++++++++++++++++ app-emulation/libvirt/libvirt-9999.ebuild | 4 +- 3 files changed, 157 insertions(+), 2 deletions(-) diff --git a/app-emulation/libvirt/files/libvirt-11.3.0-do-not-use-sysconfig.patch b/app-emulation/libvirt/files/libvirt-11.3.0-do-not-use-sysconfig.patch new file mode 100644 index 000000000000..16e61c61b7c9 --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-11.3.0-do-not-use-sysconfig.patch @@ -0,0 +1,81 @@ +From ae24d3d483ef01f6cccffbd114571ffecc4fe80f Mon Sep 17 00:00:00 2001 +Message-ID: <ae24d3d483ef01f6cccffbd114571ffecc4fe80f.1743863726.git.mpriv...@redhat.com> +From: Michal Privoznik <[email protected]> +Date: Wed, 2 Mar 2022 10:01:04 +0100 +Subject: [PATCH] libvirt-11.3.0-do-not-use-sysconfig.patch + +From: Michal Privoznik <[email protected]> + +Signed-off-by: Michal Privoznik <[email protected]> +--- + src/locking/virtlockd.service.in | 1 - + src/logging/virtlogd.service.in | 1 - + src/remote/libvirtd.service.in | 1 - + src/virtd.service.in | 1 - + tools/libvirt-guests.service.in | 2 +- + 5 files changed, 1 insertion(+), 5 deletions(-) + +diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in +index cd6c77c6af..1746f0e8c9 100644 +--- a/src/locking/virtlockd.service.in ++++ b/src/locking/virtlockd.service.in +@@ -10,7 +10,6 @@ After=virtlockd-admin.socket + [Service] + Type=notify + Environment=VIRTLOCKD_ARGS= +-EnvironmentFile=-@initconfdir@/virtlockd + ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS + ExecReload=/bin/kill -USR1 $MAINPID + +diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in +index bcc356f9d1..94d3be9dee 100644 +--- a/src/logging/virtlogd.service.in ++++ b/src/logging/virtlogd.service.in +@@ -10,7 +10,6 @@ After=virtlogd-admin.socket + [Service] + Type=notify + Environment=VIRTLOGD_ARGS= +-EnvironmentFile=-@initconfdir@/virtlogd + ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS + ExecReload=/bin/kill -USR1 $MAINPID + +diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in +index b0a062e885..39a7a91a75 100644 +--- a/src/remote/libvirtd.service.in ++++ b/src/remote/libvirtd.service.in +@@ -28,7 +28,6 @@ Conflicts=xendomains.service + [Service] + Type=notify-reload + Environment=LIBVIRTD_ARGS="--timeout 120" +-EnvironmentFile=-@initconfdir@/libvirtd + ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS + ExecReload=/bin/kill -HUP $MAINPID + KillMode=process +diff --git a/src/virtd.service.in b/src/virtd.service.in +index 7ffb77e339..92a48da90c 100644 +--- a/src/virtd.service.in ++++ b/src/virtd.service.in +@@ -17,7 +17,6 @@ After=apparmor.service + [Service] + Type=notify-reload + Environment=@SERVICE@_ARGS="--timeout 120" +-EnvironmentFile=-@initconfdir@/@service@ + ExecStart=@sbindir@/@service@ $@SERVICE@_ARGS + ExecReload=/bin/kill -HUP $MAINPID + Restart=on-failure +diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in +index b044444298..24cfcf468c 100644 +--- a/tools/libvirt-guests.service.in ++++ b/tools/libvirt-guests.service.in +@@ -14,7 +14,7 @@ After=virtxend.socket + After=virt-guest-shutdown.target + + [Service] +-EnvironmentFile=-@initconfdir@/libvirt-guests ++EnvironmentFile=-/etc/libvirt/libvirt-guests.conf + # Hack just call traditional service until we factor + # out the code + ExecStart=@libexecdir@/libvirt-guests.sh start +-- +2.49.0 + diff --git a/app-emulation/libvirt/files/libvirt-11.3.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-11.3.0-fix-paths-for-apparmor.patch new file mode 100644 index 000000000000..36dde03524ea --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-11.3.0-fix-paths-for-apparmor.patch @@ -0,0 +1,74 @@ +From dd0a7e07f253248de4f0a5da5547e0534438f569 Mon Sep 17 00:00:00 2001 +Message-ID: <dd0a7e07f253248de4f0a5da5547e0534438f569.1743862811.git.mpriv...@redhat.com> +From: Michal Privoznik <[email protected]> +Date: Tue, 15 Mar 2022 05:23:29 +0100 +Subject: [PATCH] libvirt-11.3.0-fix-paths-for-apparmor.patch + +From: Michal Privoznik <[email protected]> + +Signed-off-by: Michal Privoznik <[email protected]> +--- + src/security/apparmor/libvirt-qemu | 1 + + src/security/apparmor/meson.build | 2 +- + src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local | 1 - + ....virt-aa-helper.in => usr.libexec.libvirt.virt-aa-helper.in} | 2 +- + src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local | 1 + + 5 files changed, 4 insertions(+), 3 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} (96%) + create mode 100644 src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local + +diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu +index e4aceacd70..6ac5149baf 100644 +--- a/src/security/apparmor/libvirt-qemu ++++ b/src/security/apparmor/libvirt-qemu +@@ -97,6 +97,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 09d9fac02c..d4b168aaed 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', +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 +index c0990e51d0..0000000000 +--- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local ++++ /dev/null +@@ -1 +0,0 @@ +-# Site-specific additions and overrides for 'usr.lib.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 96% +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 e209a8bff7..cf129dde31 100644 +--- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in ++++ b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in +@@ -74,5 +74,5 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper { + /**.[iI][sS][oO] r, + /**/disk{,.*} r, + +- include if exists <local/usr.lib.libvirt.virt-aa-helper> ++ include if exists <local/usr.libexec.libvirt.virt-aa-helper> + } +diff --git a/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local +new file mode 100644 +index 0000000000..974653d797 +--- /dev/null ++++ b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local +@@ -0,0 +1 @@ ++# Site-specific additions and overrides for 'usr.libexec.libvirt.virt-aa-helper' +-- +2.49.0 + diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 78840580fa60..f0174762889a 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -157,8 +157,8 @@ PDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-11.0.0-Fix-paths-in-libvirt-guests.sh.in.patch - "${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch - "${FILESDIR}"/${PN}-10.7.0-fix-paths-for-apparmor.patch + "${FILESDIR}"/${PN}-11.3.0-do-not-use-sysconfig.patch + "${FILESDIR}"/${PN}-11.3.0-fix-paths-for-apparmor.patch ) python_check_deps() {
