1 |
commit: 0d514e5fa4b2ce70ed2ed0f156138f042ae9f646 |
2 |
Author: Michal Prívozník <michal.privoznik <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Mar 23 13:48:18 2018 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 23 14:15:52 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d514e5f |
7 |
|
8 |
app-emulation/libvirt: Update live ebuild, ebuild maintenance |
9 |
|
10 |
Fixes: https://bugs.gentoo.org/648868 |
11 |
|
12 |
Signed-off-by: Michal Privoznik <michal.privoznik <AT> gmail.com> |
13 |
Signed-off-by: Michal Privoznik <mprivozn <AT> redhat.com> |
14 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
15 |
|
16 |
.../files/libvirt-4.2.0-do_not_use_sysconf.patch | 196 +++++++++++++++++++++ |
17 |
app-emulation/libvirt/libvirt-9999.ebuild | 2 +- |
18 |
2 files changed, 197 insertions(+), 1 deletion(-) |
19 |
|
20 |
diff --git a/app-emulation/libvirt/files/libvirt-4.2.0-do_not_use_sysconf.patch b/app-emulation/libvirt/files/libvirt-4.2.0-do_not_use_sysconf.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..796e8600096 |
23 |
--- /dev/null |
24 |
+++ b/app-emulation/libvirt/files/libvirt-4.2.0-do_not_use_sysconf.patch |
25 |
@@ -0,0 +1,196 @@ |
26 |
+diff --git i/src/Makefile.am w/src/Makefile.am |
27 |
+index 8b1e4c8a4e..3cfee8589b 100644 |
28 |
+--- i/src/Makefile.am |
29 |
++++ w/src/Makefile.am |
30 |
+@@ -756,23 +756,6 @@ endif WITH_SETUID_RPC_CLIENT |
31 |
+ |
32 |
+ EXTRA_DIST += $(SYSCONF_FILES) |
33 |
+ |
34 |
+-install-sysconfig: |
35 |
+- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig |
36 |
+- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ |
37 |
+- do \ |
38 |
+- tgt=`basename $$f`; \ |
39 |
+- $(INSTALL_SCRIPT) $(srcdir)/$$f.sysconf \ |
40 |
+- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ |
41 |
+- done |
42 |
+- |
43 |
+-uninstall-sysconfig: |
44 |
+- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ |
45 |
+- do \ |
46 |
+- tgt=`basename $$f`; \ |
47 |
+- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ |
48 |
+- done |
49 |
+- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : |
50 |
+- |
51 |
+ SYSVINIT_FILES_IN += \ |
52 |
+ locking/virtlockd.init.in \ |
53 |
+ $(NULL) |
54 |
+@@ -813,14 +796,14 @@ uninstall-logrotate: |
55 |
+ endif ! WITH_LIBVIRTD |
56 |
+ |
57 |
+ if LIBVIRT_INIT_SCRIPT_RED_HAT |
58 |
+-install-init:: $(SYSVINIT_FILES) install-sysconfig |
59 |
++install-init:: $(SYSVINIT_FILES) |
60 |
+ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d |
61 |
+ for f in $(SYSVINIT_FILES:%.init=%) ; \ |
62 |
+ do \ |
63 |
+ $(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/$$f; \ |
64 |
+ done |
65 |
+ |
66 |
+-uninstall-init:: uninstall-sysconfig |
67 |
++uninstall-init:: |
68 |
+ rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(sysconfdir)/rc.d/init.d/%) |
69 |
+ rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || : |
70 |
+ |
71 |
+@@ -858,14 +841,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%)) |
72 |
+ BUILT_SOURCES += $(SYSTEMD_UNIT_FILES) |
73 |
+ DISTCLEANFILES += $(SYSTEMD_UNIT_FILES) |
74 |
+ |
75 |
+-install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig |
76 |
++install-systemd: $(SYSTEMD_UNIT_FILES) |
77 |
+ $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) |
78 |
+ for f in $(SYSTEMD_UNIT_FILES); \ |
79 |
+ do \ |
80 |
+ $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \ |
81 |
+ done |
82 |
+ |
83 |
+-uninstall-systemd: uninstall-sysconfig |
84 |
++uninstall-systemd: |
85 |
+ rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) |
86 |
+ rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : |
87 |
+ else ! LIBVIRT_INIT_SCRIPT_SYSTEMD |
88 |
+@@ -883,7 +866,7 @@ EXTRA_DIST += $(UPSTART_FILES) |
89 |
+ if WITH_LIBVIRTD |
90 |
+ if LIBVIRT_INIT_SCRIPT_UPSTART |
91 |
+ |
92 |
+-install-upstart: install-sysconfig |
93 |
++install-upstart: |
94 |
+ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d |
95 |
+ for f in $(UPSTART_FILES:%.upstart=%); \ |
96 |
+ do \ |
97 |
+@@ -892,7 +875,7 @@ install-upstart: install-sysconfig |
98 |
+ $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \ |
99 |
+ done |
100 |
+ |
101 |
+-uninstall-upstart: uninstall-sysconfig |
102 |
++uninstall-upstart: |
103 |
+ for f in $(UPSTART_FILES:%.upstart=%); \ |
104 |
+ do \ |
105 |
+ tgt=`basename $$f` ; \ |
106 |
+diff --git i/src/locking/virtlockd.service.in w/src/locking/virtlockd.service.in |
107 |
+index 3c9d587032..2449b201d9 100644 |
108 |
+--- i/src/locking/virtlockd.service.in |
109 |
++++ w/src/locking/virtlockd.service.in |
110 |
+@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8) |
111 |
+ Documentation=https://libvirt.org |
112 |
+ |
113 |
+ [Service] |
114 |
+-EnvironmentFile=-/etc/sysconfig/virtlockd |
115 |
+-ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS |
116 |
++ExecStart=@sbindir@/virtlockd |
117 |
+ ExecReload=/bin/kill -USR1 $MAINPID |
118 |
+ # Loosing the locks is a really bad thing that will |
119 |
+ # cause the machine to be fenced (rebooted), so make |
120 |
+diff --git i/src/logging/virtlogd.service.in w/src/logging/virtlogd.service.in |
121 |
+index 3d9ae36150..43736191d5 100644 |
122 |
+--- i/src/logging/virtlogd.service.in |
123 |
++++ w/src/logging/virtlogd.service.in |
124 |
+@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8) |
125 |
+ Documentation=https://libvirt.org |
126 |
+ |
127 |
+ [Service] |
128 |
+-EnvironmentFile=-/etc/sysconfig/virtlogd |
129 |
+-ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS |
130 |
++ExecStart=@sbindir@/virtlogd |
131 |
+ ExecReload=/bin/kill -USR1 $MAINPID |
132 |
+ # Loosing the logs is a really bad thing that will |
133 |
+ # cause the machine to be fenced (rebooted), so make |
134 |
+diff --git i/src/remote/libvirtd.service.in w/src/remote/libvirtd.service.in |
135 |
+index 769702ea75..1830c72e3f 100644 |
136 |
+--- i/src/remote/libvirtd.service.in |
137 |
++++ w/src/remote/libvirtd.service.in |
138 |
+@@ -21,8 +21,7 @@ Documentation=https://libvirt.org |
139 |
+ |
140 |
+ [Service] |
141 |
+ Type=notify |
142 |
+-EnvironmentFile=-/etc/sysconfig/libvirtd |
143 |
+-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS |
144 |
++ExecStart=@sbindir@/libvirtd |
145 |
+ ExecReload=/bin/kill -HUP $MAINPID |
146 |
+ KillMode=process |
147 |
+ Restart=on-failure |
148 |
+diff --git i/tools/Makefile.am w/tools/Makefile.am |
149 |
+index 1452d984a0..cef08741cb 100644 |
150 |
+--- i/tools/Makefile.am |
151 |
++++ w/tools/Makefile.am |
152 |
+@@ -336,15 +336,6 @@ install-data-local: install-init install-systemd install-nss \ |
153 |
+ uninstall-local: uninstall-init uninstall-systemd uninstall-nss \ |
154 |
+ uninstall-bash-completion |
155 |
+ |
156 |
+-install-sysconfig: |
157 |
+- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig |
158 |
+- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \ |
159 |
+- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests |
160 |
+- |
161 |
+-uninstall-sysconfig: |
162 |
+- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests |
163 |
+- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||: |
164 |
+- |
165 |
+ EXTRA_DIST += libvirt-guests.sh.in libvirt-guests.init.in |
166 |
+ |
167 |
+ install-initscript: libvirt-guests.init |
168 |
+@@ -359,8 +350,8 @@ uninstall-initscript: |
169 |
+ |
170 |
+ if LIBVIRT_INIT_SCRIPT_RED_HAT |
171 |
+ BUILT_SOURCES += libvirt-guests.init |
172 |
+-install-init: install-sysconfig install-initscript |
173 |
+-uninstall-init: uninstall-sysconfig uninstall-initscript |
174 |
++install-init: install-initscript |
175 |
++uninstall-init: uninstall-initscript |
176 |
+ else ! LIBVIRT_INIT_SCRIPT_RED_HAT |
177 |
+ install-init: |
178 |
+ uninstall-init: |
179 |
+@@ -391,12 +382,12 @@ EXTRA_DIST += libvirt-guests.service.in |
180 |
+ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system |
181 |
+ |
182 |
+ if LIBVIRT_INIT_SCRIPT_SYSTEMD |
183 |
+-install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh |
184 |
++install-systemd: libvirt-guests.service libvirt-guests.sh |
185 |
+ $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) |
186 |
+ $(INSTALL_DATA) libvirt-guests.service \ |
187 |
+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service |
188 |
+ |
189 |
+-uninstall-systemd: uninstall-sysconfig |
190 |
++uninstall-systemd: |
191 |
+ rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service |
192 |
+ rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: |
193 |
+ |
194 |
+diff --git i/tools/libvirt-guests.service.in w/tools/libvirt-guests.service.in |
195 |
+index 491ca62138..f0f417bffb 100644 |
196 |
+--- i/tools/libvirt-guests.service.in |
197 |
++++ w/tools/libvirt-guests.service.in |
198 |
+@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8) |
199 |
+ Documentation=https://libvirt.org |
200 |
+ |
201 |
+ [Service] |
202 |
+-EnvironmentFile=-/etc/sysconfig/libvirt-guests |
203 |
++EnvironmentFile=-/etc/libvirt/libvirt-guests.conf |
204 |
+ # Hack just call traditional service until we factor |
205 |
+ # out the code |
206 |
+ ExecStart=@libexecdir@/libvirt-guests.sh start |
207 |
+diff --git i/tools/libvirt-guests.sysconf w/tools/libvirt-guests.sysconf |
208 |
+index 08204ca039..2da172b022 100644 |
209 |
+--- i/tools/libvirt-guests.sysconf |
210 |
++++ w/tools/libvirt-guests.sysconf |
211 |
+@@ -1,3 +1,10 @@ |
212 |
++# |
213 |
++# Warning: This configuration file is only sourced by the systemd |
214 |
++# libvirt-guests.service unit. The coresponding openrc facility is in |
215 |
++# /etc/init.d/libvirtd and /etc/conf.d/libvirtd |
216 |
++# |
217 |
++ |
218 |
++ |
219 |
+ # URIs to check for running guests |
220 |
+ # example: URIS='default xen:/// vbox+tcp://host/system lxc:///' |
221 |
+ #URIS=default |
222 |
|
223 |
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild |
224 |
index 7aff7685c70..21cd6af1aa3 100644 |
225 |
--- a/app-emulation/libvirt/libvirt-9999.ebuild |
226 |
+++ b/app-emulation/libvirt/libvirt-9999.ebuild |
227 |
@@ -122,7 +122,7 @@ DEPEND="${RDEPEND} |
228 |
virtual/pkgconfig" |
229 |
|
230 |
PATCHES=( |
231 |
- "${FILESDIR}"/${PN}-4.1.0-do_not_use_sysconf.patch |
232 |
+ "${FILESDIR}"/${PN}-4.2.0-do_not_use_sysconf.patch |
233 |
"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch |
234 |
"${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch |
235 |
) |