summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Maier <tamiko@gentoo.org>2021-06-10 09:41:13 -0500
committerMatthias Maier <tamiko@gentoo.org>2021-06-10 09:41:13 -0500
commit5f402fb9ae52e5f66a4aa845b878f15d3be2100d (patch)
tree50c4511d609e9af612983958415997e1f8daec32 /app-emulation/libvirt
parentdev-python/flask: keyword ~riscv (diff)
downloadgentoo-5f402fb9ae52e5f66a4aa845b878f15d3be2100d.tar.gz
gentoo-5f402fb9ae52e5f66a4aa845b878f15d3be2100d.tar.bz2
gentoo-5f402fb9ae52e5f66a4aa845b878f15d3be2100d.zip
app-emulation/libvirt: fix systemd unit file for libvirt 7.0.0
Closes: https://bugs.gentoo.org/792228 Package-Manager: Portage-3.0.19, Repoman-3.0.3 RepoMan-Options: --force Signed-off-by: Matthias Maier <tamiko@gentoo.org>
Diffstat (limited to 'app-emulation/libvirt')
-rw-r--r--app-emulation/libvirt/files/libvirt-7.0.0-fix_virtproxyd_unit_file.patch18
-rw-r--r--app-emulation/libvirt/libvirt-7.0.0-r3.ebuild (renamed from app-emulation/libvirt/libvirt-7.0.0-r2.ebuild)1
2 files changed, 19 insertions, 0 deletions
diff --git a/app-emulation/libvirt/files/libvirt-7.0.0-fix_virtproxyd_unit_file.patch b/app-emulation/libvirt/files/libvirt-7.0.0-fix_virtproxyd_unit_file.patch
new file mode 100644
index 000000000000..a8ee5dcee3fe
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-7.0.0-fix_virtproxyd_unit_file.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/792228
+https://gitlab.com/libvirt/libvirt/-/commit/e3d60f7
+
+--
+diff --git a/src/remote/meson.build b/src/remote/meson.build
+index 9ad2f6ab1c268012a263ab4ede6410fb80e14a12..0a188268b58b7af41645799aac3ef3f156fd48ad 100644
+--- a/src/remote/meson.build
++++ b/src/remote/meson.build
+@@ -230,7 +230,7 @@ if conf.has('WITH_REMOTE')
+ 'name': 'Libvirt proxy',
+ 'sockprefix': 'libvirt',
+ 'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ],
+- 'deps': libvirtd_socket_conflicts,
++ 'deps': 'Conflicts=' + libvirtd_socket_conflicts,
+ }
+
+ openrc_init_files += {
+
diff --git a/app-emulation/libvirt/libvirt-7.0.0-r2.ebuild b/app-emulation/libvirt/libvirt-7.0.0-r3.ebuild
index 745429541ce0..c5547bdafed1 100644
--- a/app-emulation/libvirt/libvirt-7.0.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-7.0.0-r3.ebuild
@@ -134,6 +134,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.7.0-doc-path.patch
"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
"${FILESDIR}"/${PN}-7.3.0-vircgroup-Fix-virCgroupKillRecursive-wrt-nested-cont.patch
+ "${FILESDIR}"/${PN}-7.0.0-fix_virtproxyd_unit_file.patch
)
pkg_setup() {