1 |
commit: 5f402fb9ae52e5f66a4aa845b878f15d3be2100d |
2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 10 14:41:13 2021 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 10 14:41:13 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f402fb9 |
7 |
|
8 |
app-emulation/libvirt: fix systemd unit file for libvirt 7.0.0 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/792228 |
11 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
12 |
RepoMan-Options: --force |
13 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
14 |
|
15 |
.../files/libvirt-7.0.0-fix_virtproxyd_unit_file.patch | 18 ++++++++++++++++++ |
16 |
...libvirt-7.0.0-r2.ebuild => libvirt-7.0.0-r3.ebuild} | 1 + |
17 |
2 files changed, 19 insertions(+) |
18 |
|
19 |
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 |
20 |
new file mode 100644 |
21 |
index 00000000000..a8ee5dcee3f |
22 |
--- /dev/null |
23 |
+++ b/app-emulation/libvirt/files/libvirt-7.0.0-fix_virtproxyd_unit_file.patch |
24 |
@@ -0,0 +1,18 @@ |
25 |
+https://bugs.gentoo.org/792228 |
26 |
+https://gitlab.com/libvirt/libvirt/-/commit/e3d60f7 |
27 |
+ |
28 |
+-- |
29 |
+diff --git a/src/remote/meson.build b/src/remote/meson.build |
30 |
+index 9ad2f6ab1c268012a263ab4ede6410fb80e14a12..0a188268b58b7af41645799aac3ef3f156fd48ad 100644 |
31 |
+--- a/src/remote/meson.build |
32 |
++++ b/src/remote/meson.build |
33 |
+@@ -230,7 +230,7 @@ if conf.has('WITH_REMOTE') |
34 |
+ 'name': 'Libvirt proxy', |
35 |
+ 'sockprefix': 'libvirt', |
36 |
+ 'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ], |
37 |
+- 'deps': libvirtd_socket_conflicts, |
38 |
++ 'deps': 'Conflicts=' + libvirtd_socket_conflicts, |
39 |
+ } |
40 |
+ |
41 |
+ openrc_init_files += { |
42 |
+ |
43 |
|
44 |
diff --git a/app-emulation/libvirt/libvirt-7.0.0-r2.ebuild b/app-emulation/libvirt/libvirt-7.0.0-r3.ebuild |
45 |
similarity index 99% |
46 |
rename from app-emulation/libvirt/libvirt-7.0.0-r2.ebuild |
47 |
rename to app-emulation/libvirt/libvirt-7.0.0-r3.ebuild |
48 |
index 745429541ce..c5547bdafed 100644 |
49 |
--- a/app-emulation/libvirt/libvirt-7.0.0-r2.ebuild |
50 |
+++ b/app-emulation/libvirt/libvirt-7.0.0-r3.ebuild |
51 |
@@ -134,6 +134,7 @@ PATCHES=( |
52 |
"${FILESDIR}"/${PN}-6.7.0-doc-path.patch |
53 |
"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch |
54 |
"${FILESDIR}"/${PN}-7.3.0-vircgroup-Fix-virCgroupKillRecursive-wrt-nested-cont.patch |
55 |
+ "${FILESDIR}"/${PN}-7.0.0-fix_virtproxyd_unit_file.patch |
56 |
) |
57 |
|
58 |
pkg_setup() { |