1 |
commit: f80abc70fa18166129b827b6ed4c671cb5c656b0 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 3 04:04:09 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 3 04:35:37 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f80abc70 |
7 |
|
8 |
app-emulation/libvirt: add 8.2.0 |
9 |
|
10 |
* Add 8.2.0 |
11 |
* Tighten up some lower bounds on dependencies |
12 |
* Add shorewall to init script 'after' |
13 |
|
14 |
Bug: https://bugs.gentoo.org/836128 |
15 |
Closes: https://bugs.gentoo.org/833754 |
16 |
Closes: https://bugs.gentoo.org/831121 |
17 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
18 |
|
19 |
app-emulation/libvirt/Manifest | 2 + |
20 |
app-emulation/libvirt/files/libvirtd.init-r19 | 2 +- |
21 |
.../{libvirt-9999.ebuild => libvirt-8.2.0.ebuild} | 52 +++++++++++----------- |
22 |
app-emulation/libvirt/libvirt-9999.ebuild | 52 +++++++++++----------- |
23 |
app-emulation/libvirt/metadata.xml | 4 ++ |
24 |
5 files changed, 57 insertions(+), 55 deletions(-) |
25 |
|
26 |
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest |
27 |
index 98669a94c4d6..10e25ce2940e 100644 |
28 |
--- a/app-emulation/libvirt/Manifest |
29 |
+++ b/app-emulation/libvirt/Manifest |
30 |
@@ -6,3 +6,5 @@ DIST libvirt-8.0.0.tar.xz 8860124 BLAKE2B 4669ae8f4de6379c3f94d3b6875ccc8eb435fb |
31 |
DIST libvirt-8.0.0.tar.xz.asc 833 BLAKE2B 2571ee10d433630ddd79761b1a50948aed33f61ef11e793a7e563e37c28e48bc856139aa1cc62bf50852b056de14f36bb75fa97155b31bfa97c8af2ef55ba4dc SHA512 ce1252a034723774542ab00e782c24b7ef243b5ca302033e45993f90273c697cdb82e9a126b729557a6c90b5f407f0f06b78c0affb6eefe60c364fa979831f8b |
32 |
DIST libvirt-8.1.0.tar.xz 8881608 BLAKE2B ddbd684f43a75ab04aca8be0a761ec5890c365e3c802af55e85d0f3b906a3b075f737acd14648d46cdacce90cbd2ccdda12d39784eaa17a05657b13447df1fe7 SHA512 5db227b78f48e35f917030eeb45ce9d0f7e868c5ce75da496ca06fad175ad6b026173b2fb78415c0103a61af24aec78d89bcebdf60b817d8ff6e84dc926faa97 |
33 |
DIST libvirt-8.1.0.tar.xz.asc 833 BLAKE2B 21ea45127d68313264b9e17c315d75b20e409ef56ce3f6a61899c3c9d9ce1ff51a4743d912f7440d2197230df802d955516cbc8d6f98960cef8a0265a7d0f334 SHA512 9a28b0405c01518f7d6837d02df492d6d97d6e73cd711e718b53cc18d8830a1216aa87366b2065ef5ce65b12d72cbb3d80024529264430de20fe89d8bf595d76 |
34 |
+DIST libvirt-8.2.0.tar.xz 8871236 BLAKE2B 85c4fd7323f4ea0564e6fcb37dffe643d0ff54f228a695476c1b24c78022402a86cf967503e40fad003d82528f24a02bef79466e38c133c5ad37cbcd5783f01d SHA512 fbdc2953e86117643aafb3198a3d9327188d94abfd155eae4439ee0e722737a57ee44dbb2929746c0a28e10e275c35f4a8190e99668e4cba4025555358591544 |
35 |
+DIST libvirt-8.2.0.tar.xz.asc 833 BLAKE2B 3dba2fe7dc76052307ab8b1d7f2a61445759ed15e130615ca2a6325e981ae5c1a7143e7d78ee67f2bf9001cdf82126dff89f4f1eb3b39b77620721a5b75f4cfa SHA512 33ecc465da1b7e4b53733611255d01414f8c1081c96fdcb0a9f1a0e194823872b7f9f9032938527f6d1d8bbebc3b61f2dc393875b8d11fdd47bec40e9408475b |
36 |
|
37 |
diff --git a/app-emulation/libvirt/files/libvirtd.init-r19 b/app-emulation/libvirt/files/libvirtd.init-r19 |
38 |
index 60dad6a791dc..bbfe6766317c 100644 |
39 |
--- a/app-emulation/libvirt/files/libvirtd.init-r19 |
40 |
+++ b/app-emulation/libvirt/files/libvirtd.init-r19 |
41 |
@@ -16,7 +16,7 @@ retry="${LIBVIRTD_TERMTIMEOUT}" |
42 |
depend() { |
43 |
need virtlogd |
44 |
use ceph dbus iscsid virtlockd |
45 |
- after cgconfig corosync ebtables iptables ip6tables nfs nfsmount ntp-client ntpdportmap rpc.statd sanlock xenconsoled |
46 |
+ after cgconfig corosync ebtables iptables ip6tables shorewall nfs nfsmount ntp-client ntpdportmap rpc.statd sanlock xenconsoled |
47 |
USE_FLAG_FIREWALLD |
48 |
} |
49 |
|
50 |
|
51 |
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-8.2.0.ebuild |
52 |
similarity index 90% |
53 |
copy from app-emulation/libvirt/libvirt-9999.ebuild |
54 |
copy to app-emulation/libvirt/libvirt-8.2.0.ebuild |
55 |
index 8f9dda421577..ba77ccd2daa7 100644 |
56 |
--- a/app-emulation/libvirt/libvirt-9999.ebuild |
57 |
+++ b/app-emulation/libvirt/libvirt-8.2.0.ebuild |
58 |
@@ -1,34 +1,31 @@ |
59 |
# Copyright 1999-2022 Gentoo Authors |
60 |
# Distributed under the terms of the GNU General Public License v2 |
61 |
|
62 |
-EAPI=7 |
63 |
+EAPI=8 |
64 |
|
65 |
# Please bump with dev-python/libvirt-python! |
66 |
|
67 |
PYTHON_COMPAT=( python3_{8..10} ) |
68 |
- |
69 |
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc |
70 |
inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig |
71 |
|
72 |
if [[ ${PV} = *9999* ]]; then |
73 |
inherit git-r3 |
74 |
EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" |
75 |
EGIT_BRANCH="master" |
76 |
- SRC_URI="" |
77 |
- SLOT="0" |
78 |
else |
79 |
SRC_URI="https://libvirt.org/sources/${P}.tar.xz |
80 |
verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" |
81 |
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" |
82 |
- SLOT="0/${PV}" |
83 |
fi |
84 |
|
85 |
DESCRIPTION="C toolkit to manipulate virtual machines" |
86 |
HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/" |
87 |
LICENSE="LGPL-2.1" |
88 |
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc |
89 |
+SLOT="0/${PV}" |
90 |
IUSE=" |
91 |
apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs |
92 |
- iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz |
93 |
+ iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz |
94 |
parted pcap policykit +qemu rbd sasl selinux +udev |
95 |
virtualbox +virt-network wireshark-plugins xen zfs |
96 |
" |
97 |
@@ -61,32 +58,32 @@ BDEPEND=" |
98 |
RDEPEND=" |
99 |
acct-user/qemu |
100 |
app-misc/scrub |
101 |
- >=dev-libs/glib-2.48.0 |
102 |
- dev-libs/libgcrypt:0 |
103 |
+ >=dev-libs/glib-2.56.0 |
104 |
+ dev-libs/libgcrypt |
105 |
dev-libs/libnl:3 |
106 |
- >=dev-libs/libxml2-2.7.6 |
107 |
+ >=dev-libs/libxml2-2.9.1 |
108 |
>=net-analyzer/openbsd-netcat-1.105-r1 |
109 |
- >=net-libs/gnutls-1.0.25:0= |
110 |
- net-libs/libssh2 |
111 |
- net-libs/libtirpc |
112 |
+ >=net-libs/gnutls-3.2.0:= |
113 |
+ net-libs/libtirpc:= |
114 |
net-libs/rpcsvc-proto |
115 |
>=net-misc/curl-7.18.0 |
116 |
sys-apps/dbus |
117 |
sys-apps/dmidecode |
118 |
sys-devel/gettext |
119 |
- sys-libs/ncurses:0= |
120 |
- sys-libs/readline:= |
121 |
+ sys-libs/ncurses:= |
122 |
+ >=sys-libs/readline-7.0:= |
123 |
virtual/acl |
124 |
apparmor? ( sys-libs/libapparmor ) |
125 |
audit? ( sys-process/audit ) |
126 |
caps? ( sys-libs/libcap-ng ) |
127 |
dtrace? ( dev-util/systemtap ) |
128 |
firewalld? ( >=net-firewall/firewalld-0.6.3 ) |
129 |
- fuse? ( sys-fs/fuse:0= ) |
130 |
+ fuse? ( sys-fs/fuse:= ) |
131 |
glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) |
132 |
- iscsi? ( sys-block/open-iscsi ) |
133 |
+ iscsi? ( >=sys-block/open-iscsi-1.18.0 ) |
134 |
iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) |
135 |
- libssh? ( net-libs/libssh ) |
136 |
+ libssh? ( >=net-libs/libssh-0.7:= ) |
137 |
+ libssh2? ( >=net-libs/libssh2-1.3 ) |
138 |
lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) |
139 |
lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) |
140 |
nfs? ( net-fs/nfs-utils ) |
141 |
@@ -98,17 +95,17 @@ RDEPEND=" |
142 |
>=sys-block/parted-1.8[device-mapper] |
143 |
sys-fs/lvm2[-device-mapper-only(-)] |
144 |
) |
145 |
- pcap? ( >=net-libs/libpcap-1.0.0 ) |
146 |
+ pcap? ( >=net-libs/libpcap-1.8.0 ) |
147 |
policykit? ( |
148 |
acct-group/libvirt |
149 |
>=sys-auth/polkit-0.9 |
150 |
) |
151 |
qemu? ( |
152 |
>=app-emulation/qemu-2.11 |
153 |
- dev-libs/yajl |
154 |
+ >=dev-libs/yajl-2.0.3:= |
155 |
) |
156 |
rbd? ( sys-cluster/ceph ) |
157 |
- sasl? ( dev-libs/cyrus-sasl ) |
158 |
+ sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) |
159 |
selinux? ( >=sys-libs/libselinux-2.0.85 ) |
160 |
virt-network? ( |
161 |
net-dns/dnsmasq[dhcp,ipv6(+),script] |
162 |
@@ -117,25 +114,25 @@ RDEPEND=" |
163 |
net-misc/radvd |
164 |
sys-apps/iproute2[-minimal] |
165 |
) |
166 |
- wireshark-plugins? ( net-analyzer/wireshark:= ) |
167 |
+ wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) |
168 |
xen? ( |
169 |
>=app-emulation/xen-4.9.0 |
170 |
app-emulation/xen-tools:= |
171 |
) |
172 |
udev? ( |
173 |
- virtual/libudev |
174 |
+ virtual/libudev:= |
175 |
>=x11-libs/libpciaccess-0.10.9 |
176 |
) |
177 |
- zfs? ( sys-fs/zfs )" |
178 |
- |
179 |
+ zfs? ( sys-fs/zfs ) |
180 |
+ kernel_linux? ( sys-apps/util-linux )" |
181 |
DEPEND="${BDEPEND} |
182 |
${RDEPEND} |
183 |
${PYTHON_DEPS}" |
184 |
|
185 |
PATCHES=( |
186 |
"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch |
187 |
- "${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch |
188 |
- "${FILESDIR}"/${PN}-8.1.0-do-not-use-sysconfig.patch |
189 |
+ "${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch |
190 |
+ "${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch |
191 |
) |
192 |
|
193 |
pkg_setup() { |
194 |
@@ -245,6 +242,7 @@ src_configure() { |
195 |
$(meson_feature iscsi-direct storage_iscsi_direct) |
196 |
$(meson_feature libvirtd driver_libvirtd) |
197 |
$(meson_feature libssh) |
198 |
+ $(meson_feature libssh2) |
199 |
$(meson_feature lvm storage_lvm) |
200 |
$(meson_feature lvm storage_mpath) |
201 |
$(meson_feature lxc driver_lxc) |
202 |
|
203 |
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild |
204 |
index 8f9dda421577..ba77ccd2daa7 100644 |
205 |
--- a/app-emulation/libvirt/libvirt-9999.ebuild |
206 |
+++ b/app-emulation/libvirt/libvirt-9999.ebuild |
207 |
@@ -1,34 +1,31 @@ |
208 |
# Copyright 1999-2022 Gentoo Authors |
209 |
# Distributed under the terms of the GNU General Public License v2 |
210 |
|
211 |
-EAPI=7 |
212 |
+EAPI=8 |
213 |
|
214 |
# Please bump with dev-python/libvirt-python! |
215 |
|
216 |
PYTHON_COMPAT=( python3_{8..10} ) |
217 |
- |
218 |
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc |
219 |
inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig |
220 |
|
221 |
if [[ ${PV} = *9999* ]]; then |
222 |
inherit git-r3 |
223 |
EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" |
224 |
EGIT_BRANCH="master" |
225 |
- SRC_URI="" |
226 |
- SLOT="0" |
227 |
else |
228 |
SRC_URI="https://libvirt.org/sources/${P}.tar.xz |
229 |
verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" |
230 |
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" |
231 |
- SLOT="0/${PV}" |
232 |
fi |
233 |
|
234 |
DESCRIPTION="C toolkit to manipulate virtual machines" |
235 |
HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/" |
236 |
LICENSE="LGPL-2.1" |
237 |
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc |
238 |
+SLOT="0/${PV}" |
239 |
IUSE=" |
240 |
apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs |
241 |
- iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz |
242 |
+ iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz |
243 |
parted pcap policykit +qemu rbd sasl selinux +udev |
244 |
virtualbox +virt-network wireshark-plugins xen zfs |
245 |
" |
246 |
@@ -61,32 +58,32 @@ BDEPEND=" |
247 |
RDEPEND=" |
248 |
acct-user/qemu |
249 |
app-misc/scrub |
250 |
- >=dev-libs/glib-2.48.0 |
251 |
- dev-libs/libgcrypt:0 |
252 |
+ >=dev-libs/glib-2.56.0 |
253 |
+ dev-libs/libgcrypt |
254 |
dev-libs/libnl:3 |
255 |
- >=dev-libs/libxml2-2.7.6 |
256 |
+ >=dev-libs/libxml2-2.9.1 |
257 |
>=net-analyzer/openbsd-netcat-1.105-r1 |
258 |
- >=net-libs/gnutls-1.0.25:0= |
259 |
- net-libs/libssh2 |
260 |
- net-libs/libtirpc |
261 |
+ >=net-libs/gnutls-3.2.0:= |
262 |
+ net-libs/libtirpc:= |
263 |
net-libs/rpcsvc-proto |
264 |
>=net-misc/curl-7.18.0 |
265 |
sys-apps/dbus |
266 |
sys-apps/dmidecode |
267 |
sys-devel/gettext |
268 |
- sys-libs/ncurses:0= |
269 |
- sys-libs/readline:= |
270 |
+ sys-libs/ncurses:= |
271 |
+ >=sys-libs/readline-7.0:= |
272 |
virtual/acl |
273 |
apparmor? ( sys-libs/libapparmor ) |
274 |
audit? ( sys-process/audit ) |
275 |
caps? ( sys-libs/libcap-ng ) |
276 |
dtrace? ( dev-util/systemtap ) |
277 |
firewalld? ( >=net-firewall/firewalld-0.6.3 ) |
278 |
- fuse? ( sys-fs/fuse:0= ) |
279 |
+ fuse? ( sys-fs/fuse:= ) |
280 |
glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) |
281 |
- iscsi? ( sys-block/open-iscsi ) |
282 |
+ iscsi? ( >=sys-block/open-iscsi-1.18.0 ) |
283 |
iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) |
284 |
- libssh? ( net-libs/libssh ) |
285 |
+ libssh? ( >=net-libs/libssh-0.7:= ) |
286 |
+ libssh2? ( >=net-libs/libssh2-1.3 ) |
287 |
lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) |
288 |
lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) |
289 |
nfs? ( net-fs/nfs-utils ) |
290 |
@@ -98,17 +95,17 @@ RDEPEND=" |
291 |
>=sys-block/parted-1.8[device-mapper] |
292 |
sys-fs/lvm2[-device-mapper-only(-)] |
293 |
) |
294 |
- pcap? ( >=net-libs/libpcap-1.0.0 ) |
295 |
+ pcap? ( >=net-libs/libpcap-1.8.0 ) |
296 |
policykit? ( |
297 |
acct-group/libvirt |
298 |
>=sys-auth/polkit-0.9 |
299 |
) |
300 |
qemu? ( |
301 |
>=app-emulation/qemu-2.11 |
302 |
- dev-libs/yajl |
303 |
+ >=dev-libs/yajl-2.0.3:= |
304 |
) |
305 |
rbd? ( sys-cluster/ceph ) |
306 |
- sasl? ( dev-libs/cyrus-sasl ) |
307 |
+ sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) |
308 |
selinux? ( >=sys-libs/libselinux-2.0.85 ) |
309 |
virt-network? ( |
310 |
net-dns/dnsmasq[dhcp,ipv6(+),script] |
311 |
@@ -117,25 +114,25 @@ RDEPEND=" |
312 |
net-misc/radvd |
313 |
sys-apps/iproute2[-minimal] |
314 |
) |
315 |
- wireshark-plugins? ( net-analyzer/wireshark:= ) |
316 |
+ wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) |
317 |
xen? ( |
318 |
>=app-emulation/xen-4.9.0 |
319 |
app-emulation/xen-tools:= |
320 |
) |
321 |
udev? ( |
322 |
- virtual/libudev |
323 |
+ virtual/libudev:= |
324 |
>=x11-libs/libpciaccess-0.10.9 |
325 |
) |
326 |
- zfs? ( sys-fs/zfs )" |
327 |
- |
328 |
+ zfs? ( sys-fs/zfs ) |
329 |
+ kernel_linux? ( sys-apps/util-linux )" |
330 |
DEPEND="${BDEPEND} |
331 |
${RDEPEND} |
332 |
${PYTHON_DEPS}" |
333 |
|
334 |
PATCHES=( |
335 |
"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch |
336 |
- "${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch |
337 |
- "${FILESDIR}"/${PN}-8.1.0-do-not-use-sysconfig.patch |
338 |
+ "${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch |
339 |
+ "${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch |
340 |
) |
341 |
|
342 |
pkg_setup() { |
343 |
@@ -245,6 +242,7 @@ src_configure() { |
344 |
$(meson_feature iscsi-direct storage_iscsi_direct) |
345 |
$(meson_feature libvirtd driver_libvirtd) |
346 |
$(meson_feature libssh) |
347 |
+ $(meson_feature libssh2) |
348 |
$(meson_feature lvm storage_lvm) |
349 |
$(meson_feature lvm storage_mpath) |
350 |
$(meson_feature lxc driver_lxc) |
351 |
|
352 |
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml |
353 |
index cd76572452f6..ab1603dc9f57 100644 |
354 |
--- a/app-emulation/libvirt/metadata.xml |
355 |
+++ b/app-emulation/libvirt/metadata.xml |
356 |
@@ -64,6 +64,10 @@ |
357 |
Use <pkg>net-libs/libssh</pkg> to communicate with remote libvirtd hosts, |
358 |
for example: qemu+libssh://server/system |
359 |
</flag> |
360 |
+ <flag name="libssh2"> |
361 |
+ Use <pkg>net-libs/libssh2</pkg> to communicate with remote libvirtd hosts, |
362 |
+ for example: qemu+libssh2://server/system |
363 |
+ </flag> |
364 |
<flag name="pcap"> |
365 |
Support auto learning IP addreses for routing |
366 |
</flag> |