diff --git a/libvirt-9.10.0.tar.xz b/libvirt-9.10.0.tar.xz index 54ff983a9ed69b85fce7a87efd2377dd4d0c18d7..43ccea27c3e7cc0b25984e4c777603b39b916c6a 100644 Binary files a/libvirt-9.10.0.tar.xz and b/libvirt-9.10.0.tar.xz differ diff --git a/libvirt.spec b/libvirt.spec index 607dea10ba5959e2cc12edfc1c38596be2fd49b3..390b07ea6bed3c65e9611d89515397d8befd8838 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -97,7 +97,6 @@ %define with_sanlock 1 %define with_numad 0 %define with_nbdkit 0 -%define with_nbdkit_config_default 0 %define with_firewalld_zone 1 %define with_netcf 0 %define with_libssh2 1 @@ -176,23 +175,15 @@ %endif %endif -# We want to build with nbdkit support, but should only enable nbdkit by -# default if the OS ships a SELinux policy that allows libvirt to launch it. -# Right now that's not the case anywhere, but things should be fine by the time -# Fedora 40 is released. +# We should only enable nbdkit support if the OS ships a SELinux policy that +# allows libvirt to launch it. Right now that's not the case anywhere, but +# things should be fine by the time Fedora 40 is released. +# +# TODO: add RHEL 9 once a minor release that contains the necessary SELinux +# bits exists (we only support the most recent minor release) %if %{with_qemu} - # rhel-8 lacks pidfd_open - %if 0%{?fedora} || 0%{?rhel} >= 9 + %if 0%{?fedora} >= 40 %define with_nbdkit 0%{!?_without_nbdkit:1} - - # setting 'with_nbdkit_config_default' must be done only when compiling - # in nbdkit support - # - # TODO: add RHEL 9 once a minor release that contains the necessary SELinux - # bits exists (we only support the most recent minor release) - %if 0%{?fedora} >= 40 - %define with_nbdkit_config_default 0%{!?_without_nbdkit_config_default:1} - %endif %endif %endif @@ -271,7 +262,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 9.10.0 -Release: 2 +Release: 3 License: LGPLv2+ URL: https://libvirt.org/ @@ -407,6 +398,9 @@ BuildRequires: libssh2-devel >= 1.3.0 %endif %if %{with_netcf} BuildRequires: netcf-devel >= 0.2.2 + %endif + %if 0%{?fedora} || 0%{?rhel} >= 9 +BuildRequires: passt %endif %if %{with_esx} BuildRequires: libcurl-devel @@ -421,6 +415,8 @@ BuildRequires: systemtap-sdt-devel BuildRequires: util-linux # For showmount in FS driver (netfs discovery) BuildRequires: nfs-utils +# For storage wiping with different algorithms +BuildRequires: scrub %if %{with_numad} BuildRequires: numad %endif @@ -442,6 +438,8 @@ BuildRequires: mingw32-filesystem BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-glib2 >= 2.48 +BuildRequires: mingw32-libgpg-error +BuildRequires: mingw32-libgcrypt BuildRequires: mingw32-gnutls BuildRequires: mingw32-gettext BuildRequires: mingw32-libxml2 @@ -455,6 +453,8 @@ BuildRequires: mingw64-filesystem BuildRequires: mingw64-gcc BuildRequires: mingw64-binutils BuildRequires: mingw64-glib2 >= 2.48 +BuildRequires: mingw32-libgpg-error +BuildRequires: mingw32-libgcrypt BuildRequires: mingw64-gnutls BuildRequires: mingw64-gettext BuildRequires: mingw64-libxml2 @@ -657,8 +657,6 @@ Requires: libvirt-libs = %{version}-%{release} Requires: nfs-utils # For mkfs Requires: util-linux -# For storage wiping with different algorithms -Requires: scrub %if %{with_qemu} # From QEMU RPMs Requires: /usr/bin/qemu-img @@ -1220,12 +1218,6 @@ MinGW Windows libvirt virtualization library. %define arg_nbdkit -Dnbdkit=disabled %endif -%if %{with_nbdkit_config_default} - %define arg_nbdkit_config_default -Dnbdkit_config_default=enabled -%else - %define arg_nbdkit_config_default -Dnbdkit_config_default=disabled -%endif - %if %{with_fuse} %define arg_fuse -Dfuse=enabled %else @@ -1341,7 +1333,6 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec) %{?arg_sanlock} \ -Dlibpcap=enabled \ %{?arg_nbdkit} \ - %{?arg_nbdkit_config_default} \ -Dlibnl=enabled \ -Daudit=enabled \ -Ddtrace=enabled \ @@ -1407,7 +1398,6 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec) -Dhost_validate=disabled \ -Dlibiscsi=disabled \ -Dnbdkit=disabled \ - -Dnbdkit_config_default=disabled \ -Dlibnl=disabled \ -Dlibpcap=disabled \ -Dlibssh2=disabled \ @@ -2575,6 +2565,9 @@ exit 0 %endif %changelog +* Tue Apr 2 2024 mayunlong - 9.10.0-3 +- Incorrect tar package, update it + * Wed Mar 27 2024 mayunlong - 9.10.0-2 - nodedev: delete mdev - spec: fix some switch in spec