diff --git a/libvirt.spec b/libvirt.spec index 4edc91c..ea87747 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -96,6 +96,7 @@ %define with_sanlock 0 %define with_numad 0 %define with_nbdkit 0 +%define with_nbdkit_config_default 0 %define with_firewalld_zone 0 %define with_netcf 0 %define with_libssh2 0 @@ -174,15 +175,23 @@ %endif %endif -# 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) +# 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. %if %{with_qemu} - %if 0%{?fedora} >= 40 + # rhel-8 lacks pidfd_open + %if 0%{?fedora} || 0%{?rhel} >= 9 %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 @@ -260,7 +269,7 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 9.10.0 +Version: 10.0.0 Release: 1%{?dist}%{?extra_release} License: GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND OFL-1.1 URL: https://libvirt.org/ @@ -392,9 +401,6 @@ 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 @@ -409,8 +415,6 @@ 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 @@ -432,8 +436,6 @@ 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 @@ -447,8 +449,6 @@ BuildRequires: mingw64-filesystem BuildRequires: mingw64-gcc BuildRequires: mingw64-binutils BuildRequires: mingw64-glib2 >= 2.48 -BuildRequires: mingw64-libgpg-error -BuildRequires: mingw64-libgcrypt BuildRequires: mingw64-gnutls BuildRequires: mingw64-gettext BuildRequires: mingw64-libxml2 @@ -651,6 +651,8 @@ 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 @@ -1232,6 +1234,12 @@ exit 1 %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 @@ -1347,6 +1355,7 @@ 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 \ @@ -1412,6 +1421,7 @@ 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 \ @@ -2571,6 +2581,13 @@ exit 0 %endif %changelog +* Tue Jan 16 2024 Jiri Denemark - 10.0.0-1 +- Rebased to libvirt-10.0.0 (RHEL-15267) +- The rebase also fixes the following bugs: + RHEL-18782, RHEL-735, RHEL-18165, RHEL-4607, RHEL-700 + RHEL-7100, RHEL-15480, RHEL-7416, RHEL-20609, RHEL-7570 + RHEL-20444, RHEL-17596, RHEL-7569 + * Wed Dec 20 2023 Jiri Denemark - 9.10.0-1 - Rebased to libvirt-9.10.0 (rhbz#RHEL-15267) - The rebase also fixes the following bugs: diff --git a/sources b/sources index 6a9762a..c02b15d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-9.10.0.tar.xz) = d35d14810a29aef9319d894e60d493c9011930e0b45d832861c8f8669ee66c0539cdd49f8e0a94801b510ae0f1ed150e4d6a03ea03cc23e8cb2e5456edd76f68 +SHA512 (libvirt-10.0.0.tar.xz) = 4ab28539ff0e9a78ac231b11b4ec88b91d76ff2607cabd0226f04aaece73b05cab4aa9cfcf05073cd257ea270a377cd5d2cb915971583dbec04dadf2cf7ad252