commit: 8d28dfb4c16328972cace5bcc3582ec6526773ad Author: Michal Privoznik <michal.privoznik <AT> gmail <DOT> com> AuthorDate: Tue Feb 17 14:19:33 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Feb 21 08:54:53 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d28dfb4
app-emulation/libvirt: Rebase libvirt-11.3.0-do-not-use-sysconfig.patch Due to upstream commit of [1] the libvirt-11.3.0-do-not-use-sysconfig.patch no longer applies cleanly (because of context). Rebase it. 1: https://gitlab.com/libvirt/libvirt/-/commit/97758bc9a0b1fccf8c0009308658f1204b113b89 Signed-off-by: Michal Privoznik <michal.privoznik <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/45836 Closes: https://github.com/gentoo/gentoo/pull/45836 Signed-off-by: Sam James <sam <AT> gentoo.org> .../libvirt-12.1.0-do-not-use-sysconfig.patch | 81 ++++++++++++++++++++++ app-emulation/libvirt/libvirt-9999.ebuild | 2 +- 2 files changed, 82 insertions(+), 1 deletion(-) diff --git a/app-emulation/libvirt/files/libvirt-12.1.0-do-not-use-sysconfig.patch b/app-emulation/libvirt/files/libvirt-12.1.0-do-not-use-sysconfig.patch new file mode 100644 index 000000000000..cbe2ecd08630 --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-12.1.0-do-not-use-sysconfig.patch @@ -0,0 +1,81 @@ +From 797c16b42aa6cd73ef5e8624de1945893aee2366 Mon Sep 17 00:00:00 2001 +Message-ID: <797c16b42aa6cd73ef5e8624de1945893aee2366.1771336459.git.mpriv...@redhat.com> +From: Michal Privoznik <[email protected]> +Date: Wed, 2 Mar 2022 10:01:04 +0100 +Subject: [PATCH] libvirt-12.1.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 7965010a0a..031199b76d 100644 +--- a/src/remote/libvirtd.service.in ++++ b/src/remote/libvirtd.service.in +@@ -30,7 +30,6 @@ Conflicts=xendomains.service + [Service] + Type=notify-reload + Environment=LIBVIRTD_ARGS="--timeout 120" +-EnvironmentFile=-@initconfdir@/libvirtd + Environment=SECRETS_ENCRYPTION_KEY=%d/secrets-encryption-key + LoadCredentialEncrypted=secrets-encryption-key:@localstatedir@/lib/libvirt/secrets/secrets-encryption-key + ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS +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 c8e4d3d749..28f26e31ba 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.52.0 + diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index d5dc3f6ed1fb..6b11eb892a17 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}-11.3.0-do-not-use-sysconfig.patch "${FILESDIR}"/${PN}-11.3.0-fix-paths-for-apparmor.patch + "${FILESDIR}"/${PN}-12.1.0-do-not-use-sysconfig.patch ) python_check_deps() {
