1 |
commit: 63a74aaa80159c39749f74edac9b9c77a766c98b |
2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 7 15:42:15 2020 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 7 15:42:15 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63a74aaa |
7 |
|
8 |
app-emulation/libvirt: drop vulnerable |
9 |
|
10 |
Bug: https://bugs.gentoo.org/739948 |
11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
12 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
13 |
|
14 |
app-emulation/libvirt/Manifest | 2 - |
15 |
.../files/libvirt-6.0.0-do-not-use-sysconf.patch | 150 --------- |
16 |
.../libvirt-6.1.0-fix-paths-for-apparmor.patch | 70 ---- |
17 |
.../files/libvirt-6.5.0-do-not-use-sysconfig.patch | 245 -------------- |
18 |
.../libvirt-6.5.0-fix-paths-for-apparmor.patch | 82 ----- |
19 |
app-emulation/libvirt/libvirt-6.2.0-r2.ebuild | 356 --------------------- |
20 |
app-emulation/libvirt/libvirt-6.5.0-r1.ebuild | 355 -------------------- |
21 |
7 files changed, 1260 deletions(-) |
22 |
|
23 |
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest |
24 |
index d0484121929..d865d595076 100644 |
25 |
--- a/app-emulation/libvirt/Manifest |
26 |
+++ b/app-emulation/libvirt/Manifest |
27 |
@@ -1,4 +1,2 @@ |
28 |
-DIST libvirt-6.2.0.tar.xz 8307248 BLAKE2B 9d449e041fc548a688f974d0801e625cf023ef0df49c40028e486e88fcf14181869e0dfd87f0eabcdd184df67dda5b5fbdc0c2375832f1534faff531779255dd SHA512 96bef701fd73aef93d1490f0bc331901a0ff6250a4f36a3e4844f76cc262dc0ae4cce8686a603c2a9c575ce489d8d5ed1521ebd22b92aff8301efdb74dee91e4 |
29 |
-DIST libvirt-6.5.0.tar.xz 9407160 BLAKE2B 592aace555a3b72311cb430784587180fa7dbf74f75509cd8373a046339b9c4c0707bf530dd2d06146d78a85f8af3dba5d0b146ecec180d3cc4d3bf78c19da61 SHA512 30a032270304b97945ff2c5087c72c2f5510634186f2eaf7c3d834a72cddcaec97bbe5ccc86802728a59f4c80b5bb54757400683df5f20175757cfe07ce67453 |
30 |
DIST libvirt-6.7.0.tar.xz 8362140 BLAKE2B d0afe33fcdaab3cc0f2ea8c552e7550bcece018b049a3b58e5c05ee85b39e2b3ebf42fa1b70ddb1d2a541d1114b6b49734f23a889b3589397a30a672f27a3a56 SHA512 cabfb6aa65a3a1412b0111654ad3a7d0a6dfc63399a892c540ca39ab4e56f87626a067037e4480bb55418a371d2b5e9ac74862c92a3cdea69822ec3d158d769f |
31 |
DIST libvirt-6.8.0.tar.xz 8412092 BLAKE2B c118ca6b263054bb6941c62f3d1415f7ed1a3f29a35294272d04bc726643247ee5691e0310a1bf013faeba856d7aadd00a90fe8dbdca6ff4c7eb480e94d92fa2 SHA512 9b69f3dcceb5e40470a78908654faf51b643f6793e556f3115daa4bfe08743af290882dd51f15eb27c38d589eb210d495de7c44a40b363420ab4f4d3a6393cc9 |
32 |
|
33 |
diff --git a/app-emulation/libvirt/files/libvirt-6.0.0-do-not-use-sysconf.patch b/app-emulation/libvirt/files/libvirt-6.0.0-do-not-use-sysconf.patch |
34 |
deleted file mode 100644 |
35 |
index 738799533c6..00000000000 |
36 |
--- a/app-emulation/libvirt/files/libvirt-6.0.0-do-not-use-sysconf.patch |
37 |
+++ /dev/null |
38 |
@@ -1,150 +0,0 @@ |
39 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
40 |
-index c9b5eeb..423a201 100644 |
41 |
---- a/src/Makefile.am |
42 |
-+++ b/src/Makefile.am |
43 |
-@@ -533,23 +533,6 @@ EXTRA_DIST += \ |
44 |
- $(SYSCONF_FILES) \ |
45 |
- $(OPENRC_CONF_FILES) |
46 |
- |
47 |
--install-sysconfig: |
48 |
-- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig |
49 |
-- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ |
50 |
-- do \ |
51 |
-- tgt=`basename $$f`; \ |
52 |
-- $(INSTALL_DATA) $(srcdir)/$$f.sysconf \ |
53 |
-- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ |
54 |
-- done |
55 |
-- |
56 |
--uninstall-sysconfig: |
57 |
-- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ |
58 |
-- do \ |
59 |
-- tgt=`basename $$f`; \ |
60 |
-- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ |
61 |
-- done |
62 |
-- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : |
63 |
-- |
64 |
- OPENRC_CONF_DIR = $(sysconfdir)/conf.d |
65 |
- |
66 |
- install-openrc-conf: |
67 |
-@@ -615,14 +598,14 @@ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system |
68 |
- BUILT_SOURCES += $(SYSTEMD_UNIT_FILES) |
69 |
- DISTCLEANFILES += $(SYSTEMD_UNIT_FILES) |
70 |
- |
71 |
--install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig |
72 |
-+install-systemd: $(SYSTEMD_UNIT_FILES) |
73 |
- $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) |
74 |
- for f in $(SYSTEMD_UNIT_FILES); \ |
75 |
- do \ |
76 |
- $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \ |
77 |
- done |
78 |
- |
79 |
--uninstall-systemd: uninstall-sysconfig |
80 |
-+uninstall-systemd: |
81 |
- rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) |
82 |
- rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : |
83 |
- |
84 |
-diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in |
85 |
-index e7f8057..2449b20 100644 |
86 |
---- a/src/locking/virtlockd.service.in |
87 |
-+++ b/src/locking/virtlockd.service.in |
88 |
-@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8) |
89 |
- Documentation=https://libvirt.org |
90 |
- |
91 |
- [Service] |
92 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtlockd |
93 |
--ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS |
94 |
-+ExecStart=@sbindir@/virtlockd |
95 |
- ExecReload=/bin/kill -USR1 $MAINPID |
96 |
- # Loosing the locks is a really bad thing that will |
97 |
- # cause the machine to be fenced (rebooted), so make |
98 |
-diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in |
99 |
-index daff48e..4373619 100644 |
100 |
---- a/src/logging/virtlogd.service.in |
101 |
-+++ b/src/logging/virtlogd.service.in |
102 |
-@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8) |
103 |
- Documentation=https://libvirt.org |
104 |
- |
105 |
- [Service] |
106 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtlogd |
107 |
--ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS |
108 |
-+ExecStart=@sbindir@/virtlogd |
109 |
- ExecReload=/bin/kill -USR1 $MAINPID |
110 |
- # Loosing the logs is a really bad thing that will |
111 |
- # cause the machine to be fenced (rebooted), so make |
112 |
-diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in |
113 |
-index 9c8c54a..a042280 100644 |
114 |
---- a/src/remote/libvirtd.service.in |
115 |
-+++ b/src/remote/libvirtd.service.in |
116 |
-@@ -25,8 +25,7 @@ Documentation=https://libvirt.org |
117 |
- |
118 |
- [Service] |
119 |
- Type=notify |
120 |
--EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd |
121 |
--ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS |
122 |
-+ExecStart=@sbindir@/libvirtd |
123 |
- ExecReload=/bin/kill -HUP $MAINPID |
124 |
- KillMode=process |
125 |
- Restart=on-failure |
126 |
-diff --git a/tools/Makefile.am b/tools/Makefile.am |
127 |
-index 426a6ba..a65c91a 100644 |
128 |
---- a/tools/Makefile.am |
129 |
-+++ b/tools/Makefile.am |
130 |
-@@ -297,15 +297,6 @@ install-data-local: install-systemd install-nss \ |
131 |
- uninstall-local: uninstall-systemd uninstall-nss \ |
132 |
- uninstall-bash-completion |
133 |
- |
134 |
--install-sysconfig: |
135 |
-- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig |
136 |
-- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \ |
137 |
-- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests |
138 |
-- |
139 |
--uninstall-sysconfig: |
140 |
-- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests |
141 |
-- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||: |
142 |
-- |
143 |
- EXTRA_DIST += libvirt-guests.sh.in |
144 |
- |
145 |
- libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status |
146 |
-@@ -325,12 +316,12 @@ EXTRA_DIST += libvirt-guests.service.in |
147 |
- SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system |
148 |
- |
149 |
- if LIBVIRT_INIT_SCRIPT_SYSTEMD |
150 |
--install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh |
151 |
-+install-systemd: libvirt-guests.service libvirt-guests.sh |
152 |
- $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) |
153 |
- $(INSTALL_DATA) libvirt-guests.service \ |
154 |
- $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service |
155 |
- |
156 |
--uninstall-systemd: uninstall-sysconfig |
157 |
-+uninstall-systemd: |
158 |
- rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service |
159 |
- rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: |
160 |
- |
161 |
-diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in |
162 |
-index 10c6640..f0f417b 100644 |
163 |
---- a/tools/libvirt-guests.service.in |
164 |
-+++ b/tools/libvirt-guests.service.in |
165 |
-@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8) |
166 |
- Documentation=https://libvirt.org |
167 |
- |
168 |
- [Service] |
169 |
--EnvironmentFile=-@sysconfdir@/sysconfig/libvirt-guests |
170 |
-+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf |
171 |
- # Hack just call traditional service until we factor |
172 |
- # out the code |
173 |
- ExecStart=@libexecdir@/libvirt-guests.sh start |
174 |
-diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf |
175 |
-index 669b046..45b0b9e 100644 |
176 |
---- a/tools/libvirt-guests.sysconf |
177 |
-+++ b/tools/libvirt-guests.sysconf |
178 |
-@@ -1,3 +1,10 @@ |
179 |
-+# |
180 |
-+# Warning: This configuration file is only sourced by the systemd |
181 |
-+# libvirt-guests.service unit. The coresponding openrc facility is in |
182 |
-+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd |
183 |
-+# |
184 |
-+ |
185 |
-+ |
186 |
- # URIs to check for running guests |
187 |
- # example: URIS='default xen:///system vbox+tcp://host/system lxc:///system' |
188 |
- #URIS=default |
189 |
|
190 |
diff --git a/app-emulation/libvirt/files/libvirt-6.1.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-6.1.0-fix-paths-for-apparmor.patch |
191 |
deleted file mode 100644 |
192 |
index 02592ea4a5c..00000000000 |
193 |
--- a/app-emulation/libvirt/files/libvirt-6.1.0-fix-paths-for-apparmor.patch |
194 |
+++ /dev/null |
195 |
@@ -1,70 +0,0 @@ |
196 |
-diff --git a/src/Makefile.in b/src/Makefile.in |
197 |
-index 36bd280..07cebdf 100644 |
198 |
---- a/src/Makefile.in |
199 |
-+++ b/src/Makefile.in |
200 |
-@@ -4473,7 +4473,7 @@ SECURITY_DRIVER_APPARMOR_SOURCES = \ |
201 |
- $(NULL) |
202 |
- |
203 |
- SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES_IN = \ |
204 |
-- security/apparmor/usr.lib.libvirt.virt-aa-helper.in \ |
205 |
-+ security/apparmor/usr.libexec.virt-aa-helper.in \ |
206 |
- security/apparmor/usr.sbin.libvirtd.in \ |
207 |
- $(NULL) |
208 |
- |
209 |
-@@ -13821,11 +13821,11 @@ security/apparmor/%: $(srcdir)/security/apparmor/%.in |
210 |
- @WITH_APPARMOR_PROFILES_TRUE@install-apparmor-local: $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES) |
211 |
- @WITH_APPARMOR_PROFILES_TRUE@ $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)" |
212 |
- @WITH_APPARMOR_PROFILES_TRUE@ echo "# Site-specific additions and overrides for \ |
213 |
--@WITH_APPARMOR_PROFILES_TRUE@ 'usr.lib.libvirt.virt-aa-helper'" \ |
214 |
--@WITH_APPARMOR_PROFILES_TRUE@ >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" |
215 |
-+@WITH_APPARMOR_PROFILES_TRUE@ 'usr.libexec.virt-aa-helper'" \ |
216 |
-+@WITH_APPARMOR_PROFILES_TRUE@ >"$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" |
217 |
- |
218 |
- @WITH_APPARMOR_PROFILES_TRUE@uninstall-apparmor-local: |
219 |
--@WITH_APPARMOR_PROFILES_TRUE@ rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" |
220 |
-+@WITH_APPARMOR_PROFILES_TRUE@ rm -f "$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" |
221 |
- @WITH_APPARMOR_PROFILES_TRUE@ rmdir "$(APPARMOR_LOCAL_DIR)" || : |
222 |
- |
223 |
- $(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ |
224 |
-diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am |
225 |
-index 5f2f4c8..d457cc6 100644 |
226 |
---- a/src/security/Makefile.inc.am |
227 |
-+++ b/src/security/Makefile.inc.am |
228 |
-@@ -31,7 +31,7 @@ SECURITY_DRIVER_APPARMOR_SOURCES = \ |
229 |
- $(NULL) |
230 |
- |
231 |
- SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES_IN = \ |
232 |
-- security/apparmor/usr.lib.libvirt.virt-aa-helper.in \ |
233 |
-+ security/apparmor/usr.libexec.virt-aa-helper.in \ |
234 |
- security/apparmor/usr.sbin.libvirtd.in \ |
235 |
- $(NULL) |
236 |
- |
237 |
-@@ -130,11 +130,11 @@ APPARMOR_LOCAL_DIR = "$(DESTDIR)$(apparmordir)/local" |
238 |
- install-apparmor-local: $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES) |
239 |
- $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)" |
240 |
- echo "# Site-specific additions and overrides for \ |
241 |
-- 'usr.lib.libvirt.virt-aa-helper'" \ |
242 |
-- >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" |
243 |
-+ 'usr.libexec.virt-aa-helper'" \ |
244 |
-+ >"$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" |
245 |
- |
246 |
- uninstall-apparmor-local: |
247 |
-- rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" |
248 |
-+ rm -f "$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" |
249 |
- rmdir "$(APPARMOR_LOCAL_DIR)" || : |
250 |
- |
251 |
- INSTALL_DATA_LOCAL += install-apparmor-local |
252 |
-diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/security/apparmor/usr.libexec.virt-aa-helper.in |
253 |
-similarity index 97% |
254 |
-rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in |
255 |
-rename to src/security/apparmor/usr.libexec.virt-aa-helper.in |
256 |
-index dd18c8a..d06f9cb 100644 |
257 |
---- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in |
258 |
-+++ b/src/security/apparmor/usr.libexec.virt-aa-helper.in |
259 |
-@@ -69,5 +69,5 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper { |
260 |
- /**.[iI][sS][oO] r, |
261 |
- /**/disk{,.*} r, |
262 |
- |
263 |
-- #include <local/usr.lib.libvirt.virt-aa-helper> |
264 |
-+ #include <local/usr.libexec.virt-aa-helper> |
265 |
- } |
266 |
|
267 |
diff --git a/app-emulation/libvirt/files/libvirt-6.5.0-do-not-use-sysconfig.patch b/app-emulation/libvirt/files/libvirt-6.5.0-do-not-use-sysconfig.patch |
268 |
deleted file mode 100644 |
269 |
index 74b5954a0cf..00000000000 |
270 |
--- a/app-emulation/libvirt/files/libvirt-6.5.0-do-not-use-sysconfig.patch |
271 |
+++ /dev/null |
272 |
@@ -1,245 +0,0 @@ |
273 |
---- a/src/Makefile.am |
274 |
-+++ b/src/Makefile.am |
275 |
-@@ -522,23 +522,6 @@ |
276 |
- $(SYSCONF_FILES) \ |
277 |
- $(OPENRC_CONF_FILES) |
278 |
- |
279 |
--install-sysconfig: |
280 |
-- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig |
281 |
-- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ |
282 |
-- do \ |
283 |
-- tgt=`basename $$f`; \ |
284 |
-- $(INSTALL_DATA) $(srcdir)/$$f.sysconf \ |
285 |
-- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ |
286 |
-- done |
287 |
-- |
288 |
--uninstall-sysconfig: |
289 |
-- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ |
290 |
-- do \ |
291 |
-- tgt=`basename $$f`; \ |
292 |
-- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ |
293 |
-- done |
294 |
-- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : |
295 |
-- |
296 |
- OPENRC_CONF_DIR = $(sysconfdir)/conf.d |
297 |
- |
298 |
- install-openrc-conf: |
299 |
-@@ -604,14 +587,14 @@ |
300 |
- BUILT_SOURCES += $(SYSTEMD_UNIT_FILES) |
301 |
- DISTCLEANFILES += $(SYSTEMD_UNIT_FILES) |
302 |
- |
303 |
--install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig |
304 |
-+install-systemd: $(SYSTEMD_UNIT_FILES) |
305 |
- $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) |
306 |
- for f in $(SYSTEMD_UNIT_FILES); \ |
307 |
- do \ |
308 |
- $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \ |
309 |
- done |
310 |
- |
311 |
--uninstall-systemd: uninstall-sysconfig |
312 |
-+uninstall-systemd: |
313 |
- rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) |
314 |
- rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : |
315 |
- |
316 |
---- a/src/interface/virtinterfaced.service.in |
317 |
-+++ b/src/interface/virtinterfaced.service.in |
318 |
-@@ -13,7 +13,6 @@ |
319 |
- |
320 |
- [Service] |
321 |
- Type=notify |
322 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtinterfaced |
323 |
- ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS |
324 |
- ExecReload=/bin/kill -HUP $MAINPID |
325 |
- Restart=on-failure |
326 |
---- a/src/libxl/virtxend.service.in |
327 |
-+++ b/src/libxl/virtxend.service.in |
328 |
-@@ -17,7 +17,6 @@ |
329 |
- |
330 |
- [Service] |
331 |
- Type=notify |
332 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtxend |
333 |
- ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS |
334 |
- ExecReload=/bin/kill -HUP $MAINPID |
335 |
- Restart=on-failure |
336 |
---- a/src/locking/virtlockd.service.in |
337 |
-+++ b/src/locking/virtlockd.service.in |
338 |
-@@ -7,8 +7,7 @@ |
339 |
- Documentation=https://libvirt.org |
340 |
- |
341 |
- [Service] |
342 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtlockd |
343 |
--ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS |
344 |
-+ExecStart=@sbindir@/virtlockd |
345 |
- ExecReload=/bin/kill -USR1 $MAINPID |
346 |
- # Loosing the locks is a really bad thing that will |
347 |
- # cause the machine to be fenced (rebooted), so make |
348 |
---- a/src/logging/virtlogd.service.in |
349 |
-+++ b/src/logging/virtlogd.service.in |
350 |
-@@ -7,8 +7,7 @@ |
351 |
- Documentation=https://libvirt.org |
352 |
- |
353 |
- [Service] |
354 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtlogd |
355 |
--ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS |
356 |
-+ExecStart=@sbindir@/virtlogd |
357 |
- ExecReload=/bin/kill -USR1 $MAINPID |
358 |
- # Loosing the logs is a really bad thing that will |
359 |
- # cause the machine to be fenced (rebooted), so make |
360 |
---- a/src/lxc/virtlxcd.service.in |
361 |
-+++ b/src/lxc/virtlxcd.service.in |
362 |
-@@ -18,7 +18,6 @@ |
363 |
- |
364 |
- [Service] |
365 |
- Type=notify |
366 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtlxcd |
367 |
- ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS |
368 |
- ExecReload=/bin/kill -HUP $MAINPID |
369 |
- KillMode=process |
370 |
---- a/src/network/virtnetworkd.service.in |
371 |
-+++ b/src/network/virtnetworkd.service.in |
372 |
-@@ -16,7 +16,6 @@ |
373 |
- |
374 |
- [Service] |
375 |
- Type=notify |
376 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtnetworkd |
377 |
- ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS |
378 |
- ExecReload=/bin/kill -HUP $MAINPID |
379 |
- Restart=on-failure |
380 |
---- a/src/node_device/virtnodedevd.service.in |
381 |
-+++ b/src/node_device/virtnodedevd.service.in |
382 |
-@@ -13,7 +13,6 @@ |
383 |
- |
384 |
- [Service] |
385 |
- Type=notify |
386 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtnodedevd |
387 |
- ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS |
388 |
- ExecReload=/bin/kill -HUP $MAINPID |
389 |
- Restart=on-failure |
390 |
---- a/src/nwfilter/virtnwfilterd.service.in |
391 |
-+++ b/src/nwfilter/virtnwfilterd.service.in |
392 |
-@@ -13,7 +13,6 @@ |
393 |
- |
394 |
- [Service] |
395 |
- Type=notify |
396 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtnwfilterd |
397 |
- ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS |
398 |
- ExecReload=/bin/kill -HUP $MAINPID |
399 |
- Restart=on-failure |
400 |
---- a/src/qemu/virtqemud.service.in |
401 |
-+++ b/src/qemu/virtqemud.service.in |
402 |
-@@ -18,7 +18,6 @@ |
403 |
- |
404 |
- [Service] |
405 |
- Type=notify |
406 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtqemud |
407 |
- ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS |
408 |
- ExecReload=/bin/kill -HUP $MAINPID |
409 |
- KillMode=process |
410 |
---- a/src/remote/libvirtd.service.in |
411 |
-+++ b/src/remote/libvirtd.service.in |
412 |
-@@ -28,8 +28,7 @@ |
413 |
- |
414 |
- [Service] |
415 |
- Type=notify |
416 |
--EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd |
417 |
--ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS |
418 |
-+ExecStart=@sbindir@/libvirtd |
419 |
- ExecReload=/bin/kill -HUP $MAINPID |
420 |
- KillMode=process |
421 |
- Restart=on-failure |
422 |
---- a/src/remote/virtproxyd.service.in |
423 |
-+++ b/src/remote/virtproxyd.service.in |
424 |
-@@ -13,7 +13,6 @@ |
425 |
- |
426 |
- [Service] |
427 |
- Type=notify |
428 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtproxyd |
429 |
- ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS |
430 |
- ExecReload=/bin/kill -HUP $MAINPID |
431 |
- Restart=on-failure |
432 |
---- a/src/secret/virtsecretd.service.in |
433 |
-+++ b/src/secret/virtsecretd.service.in |
434 |
-@@ -13,7 +13,6 @@ |
435 |
- |
436 |
- [Service] |
437 |
- Type=notify |
438 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtsecretd |
439 |
- ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS |
440 |
- ExecReload=/bin/kill -HUP $MAINPID |
441 |
- Restart=on-failure |
442 |
---- a/src/storage/virtstoraged.service.in |
443 |
-+++ b/src/storage/virtstoraged.service.in |
444 |
-@@ -15,7 +15,6 @@ |
445 |
- |
446 |
- [Service] |
447 |
- Type=notify |
448 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtstoraged |
449 |
- ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS |
450 |
- ExecReload=/bin/kill -HUP $MAINPID |
451 |
- Restart=on-failure |
452 |
---- a/src/vbox/virtvboxd.service.in |
453 |
-+++ b/src/vbox/virtvboxd.service.in |
454 |
-@@ -14,7 +14,6 @@ |
455 |
- |
456 |
- [Service] |
457 |
- Type=notify |
458 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtvboxd |
459 |
- ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS |
460 |
- ExecReload=/bin/kill -HUP $MAINPID |
461 |
- Restart=on-failure |
462 |
---- a/tools/Makefile.am |
463 |
-+++ b/tools/Makefile.am |
464 |
-@@ -294,15 +294,6 @@ |
465 |
- uninstall-local: uninstall-systemd uninstall-nss \ |
466 |
- uninstall-bash-completion |
467 |
- |
468 |
--install-sysconfig: |
469 |
-- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig |
470 |
-- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \ |
471 |
-- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests |
472 |
-- |
473 |
--uninstall-sysconfig: |
474 |
-- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests |
475 |
-- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||: |
476 |
-- |
477 |
- EXTRA_DIST += libvirt-guests.sh.in |
478 |
- |
479 |
- libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status |
480 |
-@@ -322,12 +313,12 @@ |
481 |
- SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system |
482 |
- |
483 |
- if LIBVIRT_INIT_SCRIPT_SYSTEMD |
484 |
--install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh |
485 |
-+install-systemd: libvirt-guests.service libvirt-guests.sh |
486 |
- $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) |
487 |
- $(INSTALL_DATA) libvirt-guests.service \ |
488 |
- $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service |
489 |
- |
490 |
--uninstall-systemd: uninstall-sysconfig |
491 |
-+uninstall-systemd: |
492 |
- rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service |
493 |
- rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: |
494 |
- |
495 |
---- a/tools/libvirt-guests.service.in |
496 |
-+++ b/tools/libvirt-guests.service.in |
497 |
-@@ -10,7 +10,7 @@ |
498 |
- Documentation=https://libvirt.org |
499 |
- |
500 |
- [Service] |
501 |
--EnvironmentFile=-@sysconfdir@/sysconfig/libvirt-guests |
502 |
-+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf |
503 |
- # Hack just call traditional service until we factor |
504 |
- # out the code |
505 |
- ExecStart=@libexecdir@/libvirt-guests.sh start |
506 |
---- a/tools/libvirt-guests.sysconf |
507 |
-+++ b/tools/libvirt-guests.sysconf |
508 |
-@@ -1,3 +1,9 @@ |
509 |
-+# |
510 |
-+# Warning: This configuration file is only sourced by the systemd |
511 |
-+# libvirt-guests.service unit. The coresponding openrc facility is in |
512 |
-+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd |
513 |
-+# |
514 |
-+ |
515 |
- # Customizations for the libvirt-guests.service systemd unit |
516 |
- |
517 |
- # URIs to check for running guests |
518 |
|
519 |
diff --git a/app-emulation/libvirt/files/libvirt-6.5.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-6.5.0-fix-paths-for-apparmor.patch |
520 |
deleted file mode 100644 |
521 |
index 97e50cd357c..00000000000 |
522 |
--- a/app-emulation/libvirt/files/libvirt-6.5.0-fix-paths-for-apparmor.patch |
523 |
+++ /dev/null |
524 |
@@ -1,82 +0,0 @@ |
525 |
-diff --git a/src/Makefile.in b/src/Makefile.in |
526 |
-index 36bd280..07cebdf 100644 |
527 |
---- a/src/Makefile.in |
528 |
-+++ b/src/Makefile.in |
529 |
-@@ -4473,7 +4473,7 @@ SECURITY_DRIVER_APPARMOR_SOURCES = \ |
530 |
- $(NULL) |
531 |
- |
532 |
- SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES_IN = \ |
533 |
-- security/apparmor/usr.lib.libvirt.virt-aa-helper.in \ |
534 |
-+ security/apparmor/usr.libexec.virt-aa-helper.in \ |
535 |
- security/apparmor/usr.sbin.libvirtd.in \ |
536 |
- $(NULL) |
537 |
- |
538 |
-@@ -13821,11 +13821,11 @@ security/apparmor/%: $(srcdir)/security/apparmor/%.in |
539 |
- @WITH_APPARMOR_PROFILES_TRUE@install-apparmor-local: $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES) |
540 |
- @WITH_APPARMOR_PROFILES_TRUE@ $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)" |
541 |
- @WITH_APPARMOR_PROFILES_TRUE@ echo "# Site-specific additions and overrides for \ |
542 |
--@WITH_APPARMOR_PROFILES_TRUE@ 'usr.lib.libvirt.virt-aa-helper'" \ |
543 |
--@WITH_APPARMOR_PROFILES_TRUE@ >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" |
544 |
-+@WITH_APPARMOR_PROFILES_TRUE@ 'usr.libexec.virt-aa-helper'" \ |
545 |
-+@WITH_APPARMOR_PROFILES_TRUE@ >"$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" |
546 |
- |
547 |
- @WITH_APPARMOR_PROFILES_TRUE@uninstall-apparmor-local: |
548 |
--@WITH_APPARMOR_PROFILES_TRUE@ rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" |
549 |
-+@WITH_APPARMOR_PROFILES_TRUE@ rm -f "$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" |
550 |
- @WITH_APPARMOR_PROFILES_TRUE@ rmdir "$(APPARMOR_LOCAL_DIR)" || : |
551 |
- |
552 |
- $(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ |
553 |
-diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am |
554 |
-index 5f2f4c8..d457cc6 100644 |
555 |
---- a/src/security/Makefile.inc.am |
556 |
-+++ b/src/security/Makefile.inc.am |
557 |
-@@ -31,7 +31,7 @@ SECURITY_DRIVER_APPARMOR_SOURCES = \ |
558 |
- $(NULL) |
559 |
- |
560 |
- SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES_IN = \ |
561 |
-- security/apparmor/usr.lib.libvirt.virt-aa-helper.in \ |
562 |
-+ security/apparmor/usr.libexec.virt-aa-helper.in \ |
563 |
- security/apparmor/usr.sbin.libvirtd.in \ |
564 |
- $(NULL) |
565 |
- |
566 |
-@@ -130,11 +130,11 @@ APPARMOR_LOCAL_DIR = "$(DESTDIR)$(apparmordir)/local" |
567 |
- install-apparmor-local: $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES) |
568 |
- $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)" |
569 |
- echo "# Site-specific additions and overrides for \ |
570 |
-- 'usr.lib.libvirt.virt-aa-helper'" \ |
571 |
-- >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" |
572 |
-+ 'usr.libexec.virt-aa-helper'" \ |
573 |
-+ >"$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" |
574 |
- |
575 |
- uninstall-apparmor-local: |
576 |
-- rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" |
577 |
-+ rm -f "$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" |
578 |
- rmdir "$(APPARMOR_LOCAL_DIR)" || : |
579 |
- |
580 |
- INSTALL_DATA_LOCAL += install-apparmor-local |
581 |
-diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu |
582 |
-index 80986ae..d550d8c 100644 |
583 |
---- a/src/security/apparmor/libvirt-qemu |
584 |
-+++ b/src/security/apparmor/libvirt-qemu |
585 |
-@@ -88,6 +88,7 @@ |
586 |
- /usr/share/sgabios/** r, |
587 |
- /usr/share/slof/** r, |
588 |
- /usr/share/vgabios/** r, |
589 |
-+ /usr/share/seavgabios/** r, |
590 |
- |
591 |
- # pki for libvirt-vnc and libvirt-spice (LP: #901272, #1690140) |
592 |
- /etc/pki/CA/ r, |
593 |
-diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/security/apparmor/usr.libexec.virt-aa-helper.in |
594 |
-similarity index 97% |
595 |
-rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in |
596 |
-rename to src/security/apparmor/usr.libexec.virt-aa-helper.in |
597 |
-index dd18c8a..d06f9cb 100644 |
598 |
---- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in |
599 |
-+++ b/src/security/apparmor/usr.libexec.virt-aa-helper.in |
600 |
-@@ -69,5 +69,5 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper { |
601 |
- /**.[iI][sS][oO] r, |
602 |
- /**/disk{,.*} r, |
603 |
- |
604 |
-- #include <local/usr.lib.libvirt.virt-aa-helper> |
605 |
-+ #include <local/usr.libexec.virt-aa-helper> |
606 |
- } |
607 |
|
608 |
diff --git a/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild |
609 |
deleted file mode 100644 |
610 |
index f1d0b7f8456..00000000000 |
611 |
--- a/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild |
612 |
+++ /dev/null |
613 |
@@ -1,356 +0,0 @@ |
614 |
-# Copyright 1999-2020 Gentoo Authors |
615 |
-# Distributed under the terms of the GNU General Public License v2 |
616 |
- |
617 |
-EAPI=7 |
618 |
- |
619 |
-PYTHON_COMPAT=( python3_{6,7,8,9} ) |
620 |
- |
621 |
-inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd |
622 |
- |
623 |
-if [[ ${PV} = *9999* ]]; then |
624 |
- inherit git-r3 |
625 |
- EGIT_REPO_URI="https://libvirt.org/git/libvirt.git" |
626 |
- SRC_URI="" |
627 |
- SLOT="0" |
628 |
-else |
629 |
- SRC_URI="https://libvirt.org/sources/${P}.tar.xz" |
630 |
- KEYWORDS="amd64 ~arm64 ~ppc64 x86" |
631 |
- SLOT="0/${PV}" |
632 |
-fi |
633 |
- |
634 |
-DESCRIPTION="C toolkit to manipulate virtual machines" |
635 |
-HOMEPAGE="http://www.libvirt.org/" |
636 |
-LICENSE="LGPL-2.1" |
637 |
-IUSE=" |
638 |
- apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi |
639 |
- iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz |
640 |
- parted pcap policykit +qemu rbd sasl selinux +udev +vepa |
641 |
- virtualbox virt-network wireshark-plugins xen zfs |
642 |
-" |
643 |
- |
644 |
-REQUIRED_USE=" |
645 |
- firewalld? ( virt-network ) |
646 |
- libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) |
647 |
- lxc? ( caps libvirtd ) |
648 |
- openvz? ( libvirtd ) |
649 |
- policykit? ( dbus ) |
650 |
- qemu? ( libvirtd ) |
651 |
- vepa? ( macvtap ) |
652 |
- virt-network? ( libvirtd ) |
653 |
- virtualbox? ( libvirtd ) |
654 |
- xen? ( libvirtd )" |
655 |
- |
656 |
-# gettext.sh command is used by the libvirt command wrappers, and it's |
657 |
-# non-optional, so put it into RDEPEND. |
658 |
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the |
659 |
-# package will use 3 by default. Since we don't have slot pinning in an API, |
660 |
-# we must go with the most recent |
661 |
-RDEPEND=" |
662 |
- acct-user/qemu |
663 |
- policykit? ( acct-group/libvirt ) |
664 |
- app-misc/scrub |
665 |
- >=dev-libs/glib-2.48.0 |
666 |
- dev-libs/libgcrypt:0 |
667 |
- dev-libs/libnl:3 |
668 |
- >=dev-libs/libxml2-2.7.6 |
669 |
- >=net-analyzer/openbsd-netcat-1.105-r1 |
670 |
- >=net-libs/gnutls-1.0.25:0= |
671 |
- net-libs/libssh2 |
672 |
- net-libs/libtirpc |
673 |
- net-libs/rpcsvc-proto |
674 |
- >=net-misc/curl-7.18.0 |
675 |
- sys-apps/dmidecode |
676 |
- >=sys-apps/util-linux-2.17 |
677 |
- sys-devel/gettext |
678 |
- sys-libs/ncurses:0= |
679 |
- sys-libs/readline:= |
680 |
- apparmor? ( sys-libs/libapparmor ) |
681 |
- audit? ( sys-process/audit ) |
682 |
- caps? ( sys-libs/libcap-ng ) |
683 |
- dbus? ( sys-apps/dbus ) |
684 |
- dtrace? ( dev-util/systemtap ) |
685 |
- firewalld? ( >=net-firewall/firewalld-0.6.3 ) |
686 |
- fuse? ( sys-fs/fuse:0= ) |
687 |
- glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) |
688 |
- iscsi? ( sys-block/open-iscsi ) |
689 |
- iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) |
690 |
- libssh? ( net-libs/libssh ) |
691 |
- lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) |
692 |
- nfs? ( net-fs/nfs-utils ) |
693 |
- numa? ( |
694 |
- >sys-process/numactl-2.0.2 |
695 |
- sys-process/numad |
696 |
- ) |
697 |
- parted? ( |
698 |
- >=sys-block/parted-1.8[device-mapper] |
699 |
- sys-fs/lvm2[-device-mapper-only(-)] |
700 |
- ) |
701 |
- pcap? ( >=net-libs/libpcap-1.0.0 ) |
702 |
- policykit? ( >=sys-auth/polkit-0.9 ) |
703 |
- qemu? ( |
704 |
- >=app-emulation/qemu-1.5.0 |
705 |
- dev-libs/yajl |
706 |
- ) |
707 |
- rbd? ( sys-cluster/ceph ) |
708 |
- sasl? ( dev-libs/cyrus-sasl ) |
709 |
- selinux? ( >=sys-libs/libselinux-2.0.85 ) |
710 |
- virt-network? ( |
711 |
- net-dns/dnsmasq[script] |
712 |
- net-firewall/ebtables |
713 |
- >=net-firewall/iptables-1.4.10[ipv6] |
714 |
- net-misc/radvd |
715 |
- sys-apps/iproute2[-minimal] |
716 |
- ) |
717 |
- virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) |
718 |
- wireshark-plugins? ( net-analyzer/wireshark:= ) |
719 |
- xen? ( |
720 |
- >=app-emulation/xen-4.6.0 |
721 |
- app-emulation/xen-tools:= |
722 |
- ) |
723 |
- udev? ( |
724 |
- virtual/udev |
725 |
- >=x11-libs/libpciaccess-0.10.9 |
726 |
- ) |
727 |
- zfs? ( sys-fs/zfs )" |
728 |
- |
729 |
-DEPEND="${RDEPEND} |
730 |
- ${PYTHON_DEPS} |
731 |
- app-text/xhtml1 |
732 |
- dev-lang/perl |
733 |
- dev-libs/libxslt |
734 |
- dev-perl/XML-XPath |
735 |
- dev-python/docutils |
736 |
- virtual/pkgconfig" |
737 |
- |
738 |
-PATCHES=( |
739 |
- "${FILESDIR}"/${PN}-6.0.0-do-not-use-sysconf.patch |
740 |
- "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch |
741 |
- "${FILESDIR}"/${PN}-6.1.0-fix-paths-for-apparmor.patch |
742 |
-) |
743 |
- |
744 |
-pkg_setup() { |
745 |
- # Check kernel configuration: |
746 |
- CONFIG_CHECK="" |
747 |
- use fuse && CONFIG_CHECK+=" |
748 |
- ~FUSE_FS" |
749 |
- |
750 |
- use lvm && CONFIG_CHECK+=" |
751 |
- ~BLK_DEV_DM |
752 |
- ~DM_MULTIPATH |
753 |
- ~DM_SNAPSHOT" |
754 |
- |
755 |
- use lxc && CONFIG_CHECK+=" |
756 |
- ~BLK_CGROUP |
757 |
- ~CGROUP_CPUACCT |
758 |
- ~CGROUP_DEVICE |
759 |
- ~CGROUP_FREEZER |
760 |
- ~CGROUP_NET_PRIO |
761 |
- ~CGROUP_PERF |
762 |
- ~CGROUPS |
763 |
- ~CGROUP_SCHED |
764 |
- ~CPUSETS |
765 |
- ~IPC_NS |
766 |
- ~MACVLAN |
767 |
- ~NAMESPACES |
768 |
- ~NET_CLS_CGROUP |
769 |
- ~NET_NS |
770 |
- ~PID_NS |
771 |
- ~POSIX_MQUEUE |
772 |
- ~SECURITYFS |
773 |
- ~USER_NS |
774 |
- ~UTS_NS |
775 |
- ~VETH |
776 |
- ~!GRKERNSEC_CHROOT_MOUNT |
777 |
- ~!GRKERNSEC_CHROOT_DOUBLE |
778 |
- ~!GRKERNSEC_CHROOT_PIVOT |
779 |
- ~!GRKERNSEC_CHROOT_CHMOD |
780 |
- ~!GRKERNSEC_CHROOT_CAPS" |
781 |
- |
782 |
- kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" |
783 |
- ~DEVPTS_MULTIPLE_INSTANCES" |
784 |
- |
785 |
- use macvtap && CONFIG_CHECK+=" |
786 |
- ~MACVTAP" |
787 |
- |
788 |
- use virt-network && CONFIG_CHECK+=" |
789 |
- ~BRIDGE_EBT_MARK_T |
790 |
- ~BRIDGE_NF_EBTABLES |
791 |
- ~NETFILTER_ADVANCED |
792 |
- ~NETFILTER_XT_CONNMARK |
793 |
- ~NETFILTER_XT_MARK |
794 |
- ~NETFILTER_XT_TARGET_CHECKSUM |
795 |
- ~IP_NF_FILTER |
796 |
- ~IP_NF_MANGLE |
797 |
- ~IP_NF_NAT |
798 |
- ~IP_NF_TARGET_MASQUERADE |
799 |
- ~IP6_NF_FILTER |
800 |
- ~IP6_NF_MANGLE |
801 |
- ~IP6_NF_NAT" |
802 |
- # Bandwidth Limiting Support |
803 |
- use virt-network && CONFIG_CHECK+=" |
804 |
- ~BRIDGE_EBT_T_NAT |
805 |
- ~IP_NF_TARGET_REJECT |
806 |
- ~NET_ACT_POLICE |
807 |
- ~NET_CLS_FW |
808 |
- ~NET_CLS_U32 |
809 |
- ~NET_SCH_HTB |
810 |
- ~NET_SCH_INGRESS |
811 |
- ~NET_SCH_SFQ" |
812 |
- |
813 |
- # Handle specific kernel versions for different features |
814 |
- kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" |
815 |
- if kernel_is ge 3 6; then |
816 |
- CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " |
817 |
- kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM " |
818 |
- fi |
819 |
- |
820 |
- ERROR_USER_NS="Optional depending on LXC configuration." |
821 |
- |
822 |
- if [[ -n ${CONFIG_CHECK} ]]; then |
823 |
- linux-info_pkg_setup |
824 |
- fi |
825 |
-} |
826 |
- |
827 |
-src_prepare() { |
828 |
- touch "${S}/.mailmap" |
829 |
- |
830 |
- default |
831 |
- |
832 |
- # Tweak the init script: |
833 |
- cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die |
834 |
- sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ |
835 |
- -i "${S}/libvirtd.init" || die "sed failed" |
836 |
- |
837 |
- eautoreconf |
838 |
-} |
839 |
- |
840 |
-my_src_configure() { |
841 |
- local myeconfargs=( |
842 |
- $(use_with apparmor) |
843 |
- $(use_with apparmor apparmor-profiles) |
844 |
- $(use_with audit) |
845 |
- $(use_with caps capng) |
846 |
- $(use_with dbus) |
847 |
- $(use_with dtrace) |
848 |
- $(use_with firewalld) |
849 |
- $(use_with fuse) |
850 |
- $(use_with glusterfs) |
851 |
- $(use_with glusterfs storage-gluster) |
852 |
- $(use_with iscsi storage-iscsi) |
853 |
- $(use_with iscsi-direct storage-iscsi-direct) |
854 |
- $(use_with libvirtd) |
855 |
- $(use_with libssh) |
856 |
- $(use_with lvm storage-lvm) |
857 |
- $(use_with lvm storage-mpath) |
858 |
- $(use_with lxc) |
859 |
- $(use_with macvtap) |
860 |
- $(use_enable nls) |
861 |
- $(use_with numa numactl) |
862 |
- $(use_with numa numad) |
863 |
- $(use_with openvz) |
864 |
- $(use_with parted storage-disk) |
865 |
- $(use_with pcap libpcap) |
866 |
- $(use_with policykit polkit) |
867 |
- $(use_with qemu) |
868 |
- $(use_with qemu yajl) |
869 |
- $(use_with rbd storage-rbd) |
870 |
- $(use_with sasl) |
871 |
- $(use_with selinux) |
872 |
- $(use_with udev) |
873 |
- $(use_with vepa virtualport) |
874 |
- $(use_with virt-network network) |
875 |
- $(use_with wireshark-plugins wireshark-dissector) |
876 |
- $(use_with xen libxl) |
877 |
- $(use_with zfs storage-zfs) |
878 |
- |
879 |
- --without-hal |
880 |
- --without-netcf |
881 |
- --without-sanlock |
882 |
- |
883 |
- --with-esx |
884 |
- --with-init-script=systemd |
885 |
- --with-qemu-group=$(usex caps qemu root) |
886 |
- --with-qemu-user=$(usex caps qemu root) |
887 |
- --with-remote |
888 |
- --with-storage-fs |
889 |
- --with-vmware |
890 |
- |
891 |
- --disable-static |
892 |
- --disable-werror |
893 |
- |
894 |
- --localstatedir=/var |
895 |
- --with-runstatedir=/run |
896 |
- --enable-dependency-tracking |
897 |
- ) |
898 |
- |
899 |
- if use virtualbox && has_version app-emulation/virtualbox-ose; then |
900 |
- myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ ) |
901 |
- else |
902 |
- myeconfargs+=( $(use_with virtualbox vbox) ) |
903 |
- fi |
904 |
- |
905 |
- econf "${myeconfargs[@]}" |
906 |
-} |
907 |
- |
908 |
-my_src_test() { |
909 |
- # remove problematic tests, bug #591416, bug #591418 |
910 |
- sed -i -e 's#commandtest$(EXEEXT) # #' \ |
911 |
- -e 's#virfirewalltest$(EXEEXT) # #' \ |
912 |
- -e 's#nwfilterebiptablestest$(EXEEXT) # #' \ |
913 |
- -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \ |
914 |
- tests/Makefile |
915 |
- |
916 |
- export VIR_TEST_DEBUG=1 |
917 |
- HOME="${T}" emake check |
918 |
-} |
919 |
- |
920 |
-my_src_install() { |
921 |
- emake DESTDIR="${D}" \ |
922 |
- SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install |
923 |
- |
924 |
- find "${D}" -name '*.la' -delete || die |
925 |
- |
926 |
- # Remove bogus, empty directories. They are either not used, or |
927 |
- # libvirtd is able to create them on demand |
928 |
- rm -rf "${D}"/etc/sysconfig |
929 |
- rm -rf "${D}"/var |
930 |
- rm -rf "${D}"/run |
931 |
- |
932 |
- newbashcomp "${S}/tools/bash-completion/vsh" virsh |
933 |
- bashcomp_alias virsh virt-admin |
934 |
- |
935 |
- use libvirtd || return 0 |
936 |
- # From here, only libvirtd-related instructions, be warned! |
937 |
- |
938 |
- systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf |
939 |
- |
940 |
- newinitd "${S}/libvirtd.init" libvirtd |
941 |
- newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests |
942 |
- newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd |
943 |
- newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd |
944 |
- |
945 |
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd |
946 |
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests |
947 |
- |
948 |
- DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") |
949 |
- DISABLE_AUTOFORMATTING=true |
950 |
- readme.gentoo_create_doc |
951 |
-} |
952 |
- |
953 |
-pkg_preinst() { |
954 |
- # we only ever want to generate this once |
955 |
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then |
956 |
- rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml |
957 |
- fi |
958 |
-} |
959 |
- |
960 |
-pkg_postinst() { |
961 |
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then |
962 |
- touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml |
963 |
- fi |
964 |
- |
965 |
- use libvirtd || return 0 |
966 |
- # From here, only libvirtd-related instructions, be warned! |
967 |
- |
968 |
- readme.gentoo_print_elog |
969 |
-} |
970 |
|
971 |
diff --git a/app-emulation/libvirt/libvirt-6.5.0-r1.ebuild b/app-emulation/libvirt/libvirt-6.5.0-r1.ebuild |
972 |
deleted file mode 100644 |
973 |
index 182ff248923..00000000000 |
974 |
--- a/app-emulation/libvirt/libvirt-6.5.0-r1.ebuild |
975 |
+++ /dev/null |
976 |
@@ -1,355 +0,0 @@ |
977 |
-# Copyright 1999-2020 Gentoo Authors |
978 |
-# Distributed under the terms of the GNU General Public License v2 |
979 |
- |
980 |
-EAPI=7 |
981 |
- |
982 |
-PYTHON_COMPAT=( python3_{6,7,8,9} ) |
983 |
- |
984 |
-inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd |
985 |
- |
986 |
-if [[ ${PV} = *9999* ]]; then |
987 |
- inherit git-r3 |
988 |
- EGIT_REPO_URI="https://libvirt.org/git/libvirt.git" |
989 |
- SLOT="0" |
990 |
-else |
991 |
- SRC_URI="https://libvirt.org/sources/${P}.tar.xz" |
992 |
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" |
993 |
- SLOT="0/${PV}" |
994 |
-fi |
995 |
- |
996 |
-DESCRIPTION="C toolkit to manipulate virtual machines" |
997 |
-HOMEPAGE="https://www.libvirt.org/" |
998 |
-LICENSE="LGPL-2.1" |
999 |
-IUSE=" |
1000 |
- apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi |
1001 |
- iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz |
1002 |
- parted pcap policykit +qemu rbd sasl selinux +udev +vepa |
1003 |
- virtualbox virt-network wireshark-plugins xen zfs |
1004 |
-" |
1005 |
- |
1006 |
-REQUIRED_USE=" |
1007 |
- firewalld? ( virt-network ) |
1008 |
- libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) |
1009 |
- lxc? ( caps libvirtd ) |
1010 |
- openvz? ( libvirtd ) |
1011 |
- policykit? ( dbus ) |
1012 |
- qemu? ( libvirtd ) |
1013 |
- vepa? ( macvtap ) |
1014 |
- virt-network? ( libvirtd ) |
1015 |
- virtualbox? ( libvirtd ) |
1016 |
- xen? ( libvirtd )" |
1017 |
- |
1018 |
-# gettext.sh command is used by the libvirt command wrappers, and it's |
1019 |
-# non-optional, so put it into RDEPEND. |
1020 |
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the |
1021 |
-# package will use 3 by default. Since we don't have slot pinning in an API, |
1022 |
-# we must go with the most recent |
1023 |
-RDEPEND=" |
1024 |
- acct-user/qemu |
1025 |
- policykit? ( acct-group/libvirt ) |
1026 |
- app-misc/scrub |
1027 |
- >=dev-libs/glib-2.48.0 |
1028 |
- dev-libs/libgcrypt:0 |
1029 |
- dev-libs/libnl:3 |
1030 |
- >=dev-libs/libxml2-2.7.6 |
1031 |
- >=net-analyzer/openbsd-netcat-1.105-r1 |
1032 |
- >=net-libs/gnutls-1.0.25:0= |
1033 |
- net-libs/libssh2 |
1034 |
- net-libs/libtirpc |
1035 |
- net-libs/rpcsvc-proto |
1036 |
- >=net-misc/curl-7.18.0 |
1037 |
- sys-apps/dmidecode |
1038 |
- >=sys-apps/util-linux-2.17 |
1039 |
- sys-devel/gettext |
1040 |
- sys-libs/ncurses:0= |
1041 |
- sys-libs/readline:= |
1042 |
- apparmor? ( sys-libs/libapparmor ) |
1043 |
- audit? ( sys-process/audit ) |
1044 |
- caps? ( sys-libs/libcap-ng ) |
1045 |
- dbus? ( sys-apps/dbus ) |
1046 |
- dtrace? ( dev-util/systemtap ) |
1047 |
- firewalld? ( >=net-firewall/firewalld-0.6.3 ) |
1048 |
- fuse? ( sys-fs/fuse:0= ) |
1049 |
- glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) |
1050 |
- iscsi? ( sys-block/open-iscsi ) |
1051 |
- iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) |
1052 |
- libssh? ( net-libs/libssh ) |
1053 |
- lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) |
1054 |
- nfs? ( net-fs/nfs-utils ) |
1055 |
- numa? ( |
1056 |
- >sys-process/numactl-2.0.2 |
1057 |
- sys-process/numad |
1058 |
- ) |
1059 |
- parted? ( |
1060 |
- >=sys-block/parted-1.8[device-mapper] |
1061 |
- sys-fs/lvm2[-device-mapper-only(-)] |
1062 |
- ) |
1063 |
- pcap? ( >=net-libs/libpcap-1.0.0 ) |
1064 |
- policykit? ( >=sys-auth/polkit-0.9 ) |
1065 |
- qemu? ( |
1066 |
- >=app-emulation/qemu-1.5.0 |
1067 |
- dev-libs/yajl |
1068 |
- ) |
1069 |
- rbd? ( sys-cluster/ceph ) |
1070 |
- sasl? ( dev-libs/cyrus-sasl ) |
1071 |
- selinux? ( >=sys-libs/libselinux-2.0.85 ) |
1072 |
- virt-network? ( |
1073 |
- net-dns/dnsmasq[script] |
1074 |
- net-firewall/ebtables |
1075 |
- >=net-firewall/iptables-1.4.10[ipv6] |
1076 |
- net-misc/radvd |
1077 |
- sys-apps/iproute2[-minimal] |
1078 |
- ) |
1079 |
- virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) |
1080 |
- wireshark-plugins? ( net-analyzer/wireshark:= ) |
1081 |
- xen? ( |
1082 |
- >=app-emulation/xen-4.6.0 |
1083 |
- app-emulation/xen-tools:= |
1084 |
- ) |
1085 |
- udev? ( |
1086 |
- virtual/udev |
1087 |
- >=x11-libs/libpciaccess-0.10.9 |
1088 |
- ) |
1089 |
- zfs? ( sys-fs/zfs )" |
1090 |
- |
1091 |
-DEPEND="${RDEPEND} |
1092 |
- ${PYTHON_DEPS} |
1093 |
- app-text/xhtml1 |
1094 |
- dev-lang/perl |
1095 |
- dev-libs/libxslt |
1096 |
- dev-perl/XML-XPath |
1097 |
- dev-python/docutils |
1098 |
- virtual/pkgconfig" |
1099 |
- |
1100 |
-PATCHES=( |
1101 |
- "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch |
1102 |
- "${FILESDIR}"/${PN}-6.5.0-fix-paths-for-apparmor.patch |
1103 |
- "${FILESDIR}"/${PN}-6.5.0-do-not-use-sysconfig.patch |
1104 |
-) |
1105 |
- |
1106 |
-pkg_setup() { |
1107 |
- # Check kernel configuration: |
1108 |
- CONFIG_CHECK="" |
1109 |
- use fuse && CONFIG_CHECK+=" |
1110 |
- ~FUSE_FS" |
1111 |
- |
1112 |
- use lvm && CONFIG_CHECK+=" |
1113 |
- ~BLK_DEV_DM |
1114 |
- ~DM_MULTIPATH |
1115 |
- ~DM_SNAPSHOT" |
1116 |
- |
1117 |
- use lxc && CONFIG_CHECK+=" |
1118 |
- ~BLK_CGROUP |
1119 |
- ~CGROUP_CPUACCT |
1120 |
- ~CGROUP_DEVICE |
1121 |
- ~CGROUP_FREEZER |
1122 |
- ~CGROUP_NET_PRIO |
1123 |
- ~CGROUP_PERF |
1124 |
- ~CGROUPS |
1125 |
- ~CGROUP_SCHED |
1126 |
- ~CPUSETS |
1127 |
- ~IPC_NS |
1128 |
- ~MACVLAN |
1129 |
- ~NAMESPACES |
1130 |
- ~NET_CLS_CGROUP |
1131 |
- ~NET_NS |
1132 |
- ~PID_NS |
1133 |
- ~POSIX_MQUEUE |
1134 |
- ~SECURITYFS |
1135 |
- ~USER_NS |
1136 |
- ~UTS_NS |
1137 |
- ~VETH |
1138 |
- ~!GRKERNSEC_CHROOT_MOUNT |
1139 |
- ~!GRKERNSEC_CHROOT_DOUBLE |
1140 |
- ~!GRKERNSEC_CHROOT_PIVOT |
1141 |
- ~!GRKERNSEC_CHROOT_CHMOD |
1142 |
- ~!GRKERNSEC_CHROOT_CAPS" |
1143 |
- |
1144 |
- kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" |
1145 |
- ~DEVPTS_MULTIPLE_INSTANCES" |
1146 |
- |
1147 |
- use macvtap && CONFIG_CHECK+=" |
1148 |
- ~MACVTAP" |
1149 |
- |
1150 |
- use virt-network && CONFIG_CHECK+=" |
1151 |
- ~BRIDGE_EBT_MARK_T |
1152 |
- ~BRIDGE_NF_EBTABLES |
1153 |
- ~NETFILTER_ADVANCED |
1154 |
- ~NETFILTER_XT_CONNMARK |
1155 |
- ~NETFILTER_XT_MARK |
1156 |
- ~NETFILTER_XT_TARGET_CHECKSUM |
1157 |
- ~IP_NF_FILTER |
1158 |
- ~IP_NF_MANGLE |
1159 |
- ~IP_NF_NAT |
1160 |
- ~IP_NF_TARGET_MASQUERADE |
1161 |
- ~IP6_NF_FILTER |
1162 |
- ~IP6_NF_MANGLE |
1163 |
- ~IP6_NF_NAT" |
1164 |
- # Bandwidth Limiting Support |
1165 |
- use virt-network && CONFIG_CHECK+=" |
1166 |
- ~BRIDGE_EBT_T_NAT |
1167 |
- ~IP_NF_TARGET_REJECT |
1168 |
- ~NET_ACT_POLICE |
1169 |
- ~NET_CLS_FW |
1170 |
- ~NET_CLS_U32 |
1171 |
- ~NET_SCH_HTB |
1172 |
- ~NET_SCH_INGRESS |
1173 |
- ~NET_SCH_SFQ" |
1174 |
- |
1175 |
- # Handle specific kernel versions for different features |
1176 |
- kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" |
1177 |
- if kernel_is ge 3 6; then |
1178 |
- CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " |
1179 |
- kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM " |
1180 |
- fi |
1181 |
- |
1182 |
- ERROR_USER_NS="Optional depending on LXC configuration." |
1183 |
- |
1184 |
- if [[ -n ${CONFIG_CHECK} ]]; then |
1185 |
- linux-info_pkg_setup |
1186 |
- fi |
1187 |
-} |
1188 |
- |
1189 |
-src_prepare() { |
1190 |
- touch "${S}/.mailmap" |
1191 |
- |
1192 |
- default |
1193 |
- |
1194 |
- # Tweak the init script: |
1195 |
- cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die |
1196 |
- sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ |
1197 |
- -i "${S}/libvirtd.init" || die "sed failed" |
1198 |
- |
1199 |
- eautoreconf |
1200 |
-} |
1201 |
- |
1202 |
-my_src_configure() { |
1203 |
- local myeconfargs=( |
1204 |
- $(use_with apparmor) |
1205 |
- $(use_with apparmor apparmor-profiles) |
1206 |
- $(use_with audit) |
1207 |
- $(use_with caps capng) |
1208 |
- $(use_with dbus) |
1209 |
- $(use_with dtrace) |
1210 |
- $(use_with firewalld) |
1211 |
- $(use_with fuse) |
1212 |
- $(use_with glusterfs) |
1213 |
- $(use_with glusterfs storage-gluster) |
1214 |
- $(use_with iscsi storage-iscsi) |
1215 |
- $(use_with iscsi-direct storage-iscsi-direct) |
1216 |
- $(use_with libvirtd) |
1217 |
- $(use_with libssh) |
1218 |
- $(use_with lvm storage-lvm) |
1219 |
- $(use_with lvm storage-mpath) |
1220 |
- $(use_with lxc) |
1221 |
- $(use_with macvtap) |
1222 |
- $(use_enable nls) |
1223 |
- $(use_with numa numactl) |
1224 |
- $(use_with numa numad) |
1225 |
- $(use_with openvz) |
1226 |
- $(use_with parted storage-disk) |
1227 |
- $(use_with pcap libpcap) |
1228 |
- $(use_with policykit polkit) |
1229 |
- $(use_with qemu) |
1230 |
- $(use_with qemu yajl) |
1231 |
- $(use_with rbd storage-rbd) |
1232 |
- $(use_with sasl) |
1233 |
- $(use_with selinux) |
1234 |
- $(use_with udev) |
1235 |
- $(use_with vepa virtualport) |
1236 |
- $(use_with virt-network network) |
1237 |
- $(use_with wireshark-plugins wireshark-dissector) |
1238 |
- $(use_with xen libxl) |
1239 |
- $(use_with zfs storage-zfs) |
1240 |
- |
1241 |
- --without-hal |
1242 |
- --without-netcf |
1243 |
- --without-sanlock |
1244 |
- |
1245 |
- --with-esx |
1246 |
- --with-init-script=systemd |
1247 |
- --with-qemu-group=$(usex caps qemu root) |
1248 |
- --with-qemu-user=$(usex caps qemu root) |
1249 |
- --with-remote |
1250 |
- --with-storage-fs |
1251 |
- --with-vmware |
1252 |
- |
1253 |
- --disable-static |
1254 |
- --disable-werror |
1255 |
- |
1256 |
- --localstatedir=/var |
1257 |
- --with-runstatedir=/run |
1258 |
- --enable-dependency-tracking |
1259 |
- ) |
1260 |
- |
1261 |
- if use virtualbox && has_version app-emulation/virtualbox-ose; then |
1262 |
- myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ ) |
1263 |
- else |
1264 |
- myeconfargs+=( $(use_with virtualbox vbox) ) |
1265 |
- fi |
1266 |
- |
1267 |
- econf "${myeconfargs[@]}" |
1268 |
-} |
1269 |
- |
1270 |
-my_src_test() { |
1271 |
- # remove problematic tests, bug #591416, bug #591418 |
1272 |
- sed -i -e 's#commandtest$(EXEEXT) # #' \ |
1273 |
- -e 's#virfirewalltest$(EXEEXT) # #' \ |
1274 |
- -e 's#nwfilterebiptablestest$(EXEEXT) # #' \ |
1275 |
- -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \ |
1276 |
- tests/Makefile |
1277 |
- |
1278 |
- export VIR_TEST_DEBUG=1 |
1279 |
- HOME="${T}" emake check |
1280 |
-} |
1281 |
- |
1282 |
-my_src_install() { |
1283 |
- emake DESTDIR="${D}" \ |
1284 |
- SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install |
1285 |
- |
1286 |
- find "${D}" -name '*.la' -delete || die |
1287 |
- |
1288 |
- # Remove bogus, empty directories. They are either not used, or |
1289 |
- # libvirtd is able to create them on demand |
1290 |
- rm -rf "${D}"/etc/sysconfig |
1291 |
- rm -rf "${D}"/var |
1292 |
- rm -rf "${D}"/run |
1293 |
- |
1294 |
- newbashcomp "${S}/tools/bash-completion/vsh" virsh |
1295 |
- bashcomp_alias virsh virt-admin |
1296 |
- |
1297 |
- use libvirtd || return 0 |
1298 |
- # From here, only libvirtd-related instructions, be warned! |
1299 |
- |
1300 |
- systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf |
1301 |
- |
1302 |
- newinitd "${S}/libvirtd.init" libvirtd |
1303 |
- newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests |
1304 |
- newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd |
1305 |
- newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd |
1306 |
- |
1307 |
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd |
1308 |
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests |
1309 |
- |
1310 |
- DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") |
1311 |
- DISABLE_AUTOFORMATTING=true |
1312 |
- readme.gentoo_create_doc |
1313 |
-} |
1314 |
- |
1315 |
-pkg_preinst() { |
1316 |
- # we only ever want to generate this once |
1317 |
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then |
1318 |
- rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml |
1319 |
- fi |
1320 |
-} |
1321 |
- |
1322 |
-pkg_postinst() { |
1323 |
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then |
1324 |
- touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml |
1325 |
- fi |
1326 |
- |
1327 |
- use libvirtd || return 0 |
1328 |
- # From here, only libvirtd-related instructions, be warned! |
1329 |
- |
1330 |
- readme.gentoo_print_elog |
1331 |
-} |