[packages/libvirt] - updated to 8.10.0
qboosh
qboosh at pld-linux.org
Thu May 18 19:28:20 CEST 2023
commit 542efd599318d33bdbdcf95f3eea1226f172c472
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu May 18 19:30:55 2023 +0200
- updated to 8.10.0
libvirt-path-options.patch | 67 +++++++++++++++++++++++-----------------------
libvirt.spec | 21 +++++++++++----
2 files changed, 50 insertions(+), 38 deletions(-)
---
diff --git a/libvirt.spec b/libvirt.spec
index 4e1660d..9384145 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -45,12 +45,12 @@
Summary: Toolkit to interact with virtualization capabilities
Summary(pl.UTF-8): Narzędzia współpracujące z funkcjami wirtualizacji
Name: libvirt
-Version: 8.8.0
+Version: 8.10.0
Release: 1
License: LGPL v2.1+
Group: Libraries
-Source0: https://libvirt.org/sources/%{name}-%{version}.tar.xz
-# Source0-md5: c20121ef8c9297a982dd1f2e529159f3
+Source0: https://download.libvirt.org/%{name}-%{version}.tar.xz
+# Source0-md5: 47feb4bed510cb7ed8fdc5be6b9d6d04
Source1: %{name}.init
Source2: %{name}.tmpfiles
Patch0: %{name}-sasl.patch
@@ -505,6 +505,8 @@ Moduł sekcji Wiresharka do pakietów libvirt.
%{__sed} -i '/^libvirt\(_admin\|_lxc\|_qemu\)\?_lib = / s/shared_library/library/' src/meson.build
%endif
+%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' tools/virt-qemu-qmp-proxy
+
%build
%meson build \
-Dbash_completion=enabled \
@@ -791,7 +793,11 @@ fi
%attr(755,root,root) %{_libexecdir}/libvirt_parthelper
%attr(755,root,root) %{_libexecdir}/virt-aa-helper
# TODO:
+#%{_libdir}/firewalld/policies/libvirt-routed-in.xml
+#%{_libdir}/firewalld/policies/libvirt-routed-out.xml
+#%{_libdir}/firewalld/policies/libvirt-to-host.xml
#%{_libdir}/firewalld/zones/libvirt.xml
+#%{_libdir}/firewalld/zones/libvirt-routed.xml
%dir %{_libdir}/libvirt/connection-driver
%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_interface.so
%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_network.so
@@ -926,7 +932,10 @@ fi
%if %{with qemu}
%files daemon-qemu
%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/virt-qemu-qmp-proxy
%attr(755,root,root) %{_bindir}/virt-qemu-run
+%attr(755,root,root) %{_bindir}/virt-qemu-sev-validate
+%attr(755,root,root) %{_sbindir}/virtqemud
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu-lockd.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtqemud.conf
@@ -936,19 +945,20 @@ fi
%{systemdunitdir}/virtqemud.socket
%{systemdunitdir}/virtqemud-admin.socket
%{systemdunitdir}/virtqemud-ro.socket
-%attr(755,root,root) %{_sbindir}/virtqemud
%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_qemu.so
%{_datadir}/augeas/lenses/libvirtd_qemu.aug
%{_datadir}/augeas/lenses/virtqemud.aug
%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug
%{_datadir}/augeas/lenses/tests/test_virtqemud.aug
-%{_mandir}/man1/virt-qemu-run.1*
%attr(750,qemu,qemu) %dir /var/cache/libvirt/qemu
%attr(750,qemu,qemu) %dir /var/lib/libvirt/qemu
%attr(700,root,root) %dir /var/log/libvirt/qemu
%attr(700,root,root) %dir /var/run/libvirt/qemu
%{_prefix}/lib/sysctl.d/60-qemu-postcopy-migration.conf
+%{_mandir}/man1/virt-qemu-qmp-proxy.1*
+%{_mandir}/man1/virt-qemu-run.1*
+%{_mandir}/man1/virt-qemu-sev-validate.1*
%{_mandir}/man8/virtqemud.8*
%endif
@@ -1026,6 +1036,7 @@ fi
%{_datadir}/libvirt/schemas/nwfilter.rng
%{_datadir}/libvirt/schemas/nwfilter_params.rng
%{_datadir}/libvirt/schemas/nwfilterbinding.rng
+%{_datadir}/libvirt/schemas/privatedata.rng
%{_datadir}/libvirt/schemas/secret.rng
%{_datadir}/libvirt/schemas/storagecommon.rng
%{_datadir}/libvirt/schemas/storagepool.rng
diff --git a/libvirt-path-options.patch b/libvirt-path-options.patch
index 70df6f4..1b575ea 100644
--- a/libvirt-path-options.patch
+++ b/libvirt-path-options.patch
@@ -1,6 +1,6 @@
---- libvirt-8.8.0/meson.build.orig 2020-12-01 09:51:29.000000000 +0100
-+++ libvirt-8.8.0/meson.build 2022-06-15 21:02:52.949418900 +0200
-@@ -943,16 +943,19 @@ optional_programs = [
+--- libvirt-8.10.0/meson.build.orig 2020-12-01 09:51:29.000000000 +0100
++++ libvirt-8.10.0/meson.build 2022-06-15 21:02:52.949418900 +0200
+@@ -832,16 +832,19 @@ optional_programs = [
]
foreach name : optional_programs
@@ -10,7 +10,7 @@
prog = find_program(name, required: false, dirs: libvirt_sbin_path)
- varname = name.underscorify()
if prog.found()
- prog_path = prog.path()
+ prog_path = prog.full_path()
else
prog_path = name
endif
@@ -22,7 +22,7 @@
endforeach
-@@ -1725,6 +1734,8 @@ if not get_option('driver_qemu').disable
+@@ -1684,6 +1687,8 @@ if not get_option('driver_qemu').disable
conf.set_quoted('QEMU_USER', qemu_user)
conf.set_quoted('QEMU_GROUP', qemu_group)
@@ -31,7 +31,7 @@
qemu_bridge_prog = find_program(
'qemu-bridge-helper',
dirs: [ '/usr/libexec', '/usr/lib/qemu', '/usr/lib' ],
-@@ -1735,8 +1746,11 @@ if not get_option('driver_qemu').disable
+@@ -1694,8 +1699,11 @@ if not get_option('driver_qemu').disable
else
qemu_bridge_path = '/usr/libexec/qemu-bridge-helper'
endif
@@ -43,7 +43,7 @@
qemu_pr_prog = find_program(
'qemu-pr-helper',
dirs: [ '/usr/bin', '/usr/libexec' ],
-@@ -1747,8 +1761,11 @@ if not get_option('driver_qemu').disable
+@@ -1706,8 +1714,11 @@ if not get_option('driver_qemu').disable
else
qemu_pr_path = '/usr/bin/qemu-pr-helper'
endif
@@ -55,7 +55,7 @@
qemu_slirp_prog = find_program(
'slirp-helper',
dirs: [ '/usr/bin', '/usr/libexec' ],
-@@ -1759,8 +1776,11 @@ if not get_option('driver_qemu').disable
+@@ -1718,8 +1729,11 @@ if not get_option('driver_qemu').disable
else
qemu_slirp_path = '/usr/bin/slirp-helper'
endif
@@ -67,7 +67,7 @@
qemu_dbus_daemon_prog = find_program(
'dbus-daemon',
dirs: [ '/usr/bin', '/usr/libexec' ],
-@@ -1771,6 +1791,7 @@ if not get_option('driver_qemu').disable
+@@ -1730,6 +1744,7 @@ if not get_option('driver_qemu').disable
else
qemu_dbus_daemon_path = '/usr/bin/dbus-daemon'
endif
@@ -75,7 +75,7 @@
conf.set_quoted('QEMU_DBUS_DAEMON', qemu_dbus_daemon_path)
endif
endif
-@@ -1850,11 +1871,29 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1809,11 +1824,29 @@ if conf.has('WITH_LIBVIRTD')
endif
if fs_enable
@@ -106,13 +106,13 @@
fs_enable = false
endif
endif
-@@ -1863,15 +1902,17 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1822,15 +1855,17 @@ if conf.has('WITH_LIBVIRTD')
use_storage = true
conf.set('WITH_STORAGE_FS', 1)
-- conf.set_quoted('MOUNT', mount_prog.path())
-- conf.set_quoted('UMOUNT', umount_prog.path())
-- conf.set_quoted('MKFS', mkfs_prog.path())
+- conf.set_quoted('MOUNT', mount_prog.full_path())
+- conf.set_quoted('UMOUNT', umount_prog.full_path())
+- conf.set_quoted('MKFS', mkfs_prog.full_path())
+ conf.set_quoted('MOUNT', mount_path)
+ conf.set_quoted('UMOUNT', umount_path)
+ conf.set_quoted('MKFS', mkfs_path)
@@ -122,13 +122,13 @@
showmount_prog = find_program('showmount', required: false, dirs: libvirt_sbin_path)
- showmount_path = ''
if showmount_prog.found()
- showmount_path = showmount_prog.path()
+ showmount_path = showmount_prog.full_path()
endif
+ endif
conf.set_quoted('SHOWMOUNT', showmount_path)
endif
endif
-@@ -1883,7 +1924,7 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1842,7 +1877,7 @@ if conf.has('WITH_LIBVIRTD')
error('Need glusterfs (libgfapi) for gluster storage driver')
endif
@@ -137,7 +137,7 @@
use_storage = true
conf.set('WITH_STORAGE_ISCSI', 1)
elif get_option('storage_iscsi').enabled()
-@@ -1906,11 +1947,17 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1865,11 +1900,17 @@ if conf.has('WITH_LIBVIRTD')
'pvs', 'vgs', 'lvs',
]
foreach name : lvm_progs
@@ -158,16 +158,16 @@
lvm_enable = false
endif
endforeach
-@@ -1920,7 +1967,7 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1879,7 +1920,7 @@ if conf.has('WITH_LIBVIRTD')
conf.set('WITH_STORAGE_LVM', 1)
foreach name : lvm_progs
-- conf.set_quoted(name.to_upper(), get_variable('@0 at _prog'.format(name)).path())
+- conf.set_quoted(name.to_upper(), get_variable('@0 at _prog'.format(name)).full_path())
+ conf.set_quoted(name.to_upper(), get_variable('@0 at _path'.format(name)))
endforeach
endif
endif
-@@ -2104,10 +2168,16 @@ if not get_option('nss').disabled()
+@@ -2030,10 +2071,16 @@ if not get_option('nss').disabled()
endif
if not get_option('numad').disabled() and numactl_dep.found()
@@ -175,29 +175,30 @@
+ if numad_path == ''
numad_prog = find_program('numad', required: get_option('numad'), dirs: libvirt_sbin_path)
if numad_prog.found()
-+ numad_path = numad_prog.path()
++ numad_path = numad_prog.full_path()
+ endif
+ endif
+ if numad_path != ''
conf.set('WITH_NUMAD', 1)
-- conf.set_quoted('NUMAD', numad_prog.path())
+- conf.set_quoted('NUMAD', numad_prog.full_path())
+ conf.set_quoted('NUMAD', numad_path)
endif
elif get_option('numad').enabled()
error('You must have numactl enabled for numad support.')
---- libvirt-6.10.0/build-aux/meson.build.orig 2020-12-01 09:51:29.000000000 +0100
-+++ libvirt-6.10.0/build-aux/meson.build 2022-06-15 21:13:56.995821452 +0200
-@@ -1,7 +1,3 @@ syntax_check_conf = configuration_data()
+--- libvirt-8.10.0/build-aux/meson.build.orig 2020-12-01 09:51:29.000000000 +0100
++++ libvirt-8.10.0/build-aux/meson.build 2022-06-15 21:13:56.995821452 +0200
+@@ -1,8 +1,3 @@
-flake8_path = ''
-if flake8_prog.found()
-- flake8_path = flake8_prog.path()
+- flake8_path = flake8_prog.full_path()
-endif
-
+-
if host_machine.system() == 'freebsd' or host_machine.system() == 'darwin'
make_prog = find_program('gmake')
---- libvirt-6.10.0/src/meson.build.orig 2020-12-01 09:51:29.000000000 +0100
-+++ libvirt-6.10.0/src/meson.build 2022-06-15 21:23:22.326092128 +0200
-@@ -982,11 +982,11 @@ test(
+ sed_prog = find_program('gsed')
+--- libvirt-8.10.0/src/meson.build.orig 2020-12-01 09:51:29.000000000 +0100
++++ libvirt-8.10.0/src/meson.build 2022-06-15 21:23:22.326092128 +0200
+@@ -989,11 +989,11 @@ test(
env: runutf8,
)
@@ -211,7 +212,7 @@
args: [
'-I', data['srcdir'],
'-I', data['builddir'],
-@@ -996,7 +996,7 @@ if augparse_prog.found()
+@@ -1003,7 +1003,7 @@ if augparse_prog.found()
endforeach
endif
@@ -220,11 +221,11 @@
foreach proto : check_protocols
lib = proto['lib']
test(
-@@ -1007,7 +1007,7 @@ if pdwtags_prog.found() and cc.get_id()
+@@ -1014,7 +1014,7 @@ if pdwtags_prog.found() and cc.get_id()
proto['name'],
lib.name(),
lib.full_path(),
-- pdwtags_prog.path(),
+- pdwtags_prog.full_path(),
+ pdwtags_path,
files('@0 at -structs'.format(proto['name'])),
],
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libvirt.git/commitdiff/542efd599318d33bdbdcf95f3eea1226f172c472
More information about the pld-cvs-commit
mailing list