From 5b721187a87804e4f363b630a044f61c15a7eb45 Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Mon, 9 Jun 2025 19:02:47 +0200 Subject: [PATCH] libvirt-11.4.0-1.el10 - Rebased to libvirt-11.4.0 (RHEL-71662) - The rebase also fixes the following bugs: RHEL-79460, RHEL-84783, RHEL-85414, RHEL-86952, RHEL-87177 RHEL-88747, RHEL-89414, RHEL-90160, RHEL-90625, RHEL-92510 Resolves: RHEL-71662, RHEL-79460, RHEL-84783, RHEL-85414, RHEL-86952 Resolves: RHEL-87177, RHEL-88747, RHEL-89414, RHEL-90160, RHEL-90625 Resolves: RHEL-92510 --- libvirt.spec | 53 ++++++++++++++++++++++++---------------------------- sources | 2 +- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/libvirt.spec b/libvirt.spec index ae905d8..1220c0e 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -3,17 +3,15 @@ # This spec file assumes you are building on a Fedora or RHEL version # that's still supported by the vendor. It may work on other distros # or versions, but no effort will be made to ensure that going forward. -%define min_rhel 8 -%define min_fedora 37 +%define min_rhel 9 +%define min_fedora 41 %define arches_qemu_kvm %{ix86} x86_64 %{power64} %{arm} aarch64 s390x riscv64 %if 0%{?rhel} %if 0%{?rhel} >= 10 %define arches_qemu_kvm x86_64 aarch64 s390x riscv64 - %elif 0%{?rhel} >= 9 - %define arches_qemu_kvm x86_64 aarch64 s390x %else - %define arches_qemu_kvm x86_64 %{power64} aarch64 s390x + %define arches_qemu_kvm x86_64 aarch64 s390x %endif %endif @@ -74,19 +72,12 @@ %define with_storage_gluster 0%{!?_without_storage_gluster:1} %if 0%{?rhel} - # Glusterfs has been dropped in RHEL-9, and before that - # was only enabled on arches where KVM exists - %if 0%{?rhel} > 8 - %define with_storage_gluster 0 - %else - %ifnarch %{arches_qemu_kvm} - %define with_storage_gluster 0 - %endif - %endif + # Glusterfs has been dropped in RHEL-9. + %define with_storage_gluster 0 %endif -# Fedora has zfs-fuse -%if 0%{?fedora} +# Fedora had zfs-fuse until F43 +%if 0%{?fedora} && 0%{?fedora} < 43 %define with_storage_zfs 0%{!?_without_storage_zfs:1} %else %define with_storage_zfs 0 @@ -94,7 +85,7 @@ %define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1} # libiscsi has been dropped in RHEL-9 -%if 0%{?rhel} > 8 +%if 0%{?rhel} %define with_storage_iscsi_direct 0 %endif @@ -150,10 +141,6 @@ %define with_firewalld_zone 0%{!?_without_firewalld_zone:1} -%if 0%{?rhel} && 0%{?rhel} < 9 - %define with_netcf 0%{!?_without_netcf:1} -%endif - # fuse is used to provide virtualized /proc for LXC %if %{with_lxc} %define with_fuse 0%{!?_without_fuse:1} @@ -195,8 +182,7 @@ # Right now that's not the case anywhere, but things should be fine by the time # Fedora 40 is released. %if %{with_qemu} - # rhel-8 lacks pidfd_open - %if 0%{?fedora} || 0%{?rhel} >= 9 + %if 0%{?fedora} || 0%{?rhel} %define with_nbdkit 0%{!?_without_nbdkit:1} # setting 'with_nbdkit_config_default' must be done only when compiling @@ -204,7 +190,7 @@ # # 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 + %if 0%{?fedora} %define with_nbdkit_config_default 0%{!?_without_nbdkit_config_default:1} %endif %endif @@ -215,13 +201,13 @@ %endif %define with_modular_daemons 0 -%if 0%{?fedora} || 0%{?rhel} >= 9 +%if 0%{?fedora} || 0%{?rhel} %define with_modular_daemons 1 %endif # Prefer nftables for future OS releases but keep using iptables # for existing ones -%if 0%{?rhel} >= 10 || 0%{?fedora} >= 41 +%if 0%{?rhel} >= 10 || 0%{?fedora} %define prefer_nftables 1 %define firewall_backend_priority nftables,iptables %else @@ -275,7 +261,7 @@ # Fedora and RHEL-9 are new enough to support /dev/userfaultfd, which # does not require enabling vm.unprivileged_userfaultfd sysctl. -%if 0%{?fedora} || 0%{?rhel} >= 9 +%if 0%{?fedora} || 0%{?rhel} %define with_userfaultfd_sysctl 0 %endif @@ -302,7 +288,7 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 11.3.0 +Version: 11.4.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/ @@ -700,6 +686,9 @@ Requires: /usr/bin/qemu-img Obsoletes: libvirt-daemon-driver-storage-rbd < 5.2.0 %endif Obsoletes: libvirt-daemon-driver-storage-sheepdog < 8.8.0 + %if !%{with_storage_zfs} +Obsoletes: libvirt-daemon-driver-storage-zfs < 11.4.0 + %endif %description daemon-driver-storage-core The storage driver plugin for the libvirtd daemon, providing @@ -853,7 +842,7 @@ Requires: swtpm-tools %if %{with_numad} Requires: numad %endif - %if 0%{?fedora} || 0%{?rhel} >= 9 + %if 0%{?fedora} || 0%{?rhel} Recommends: passt Recommends: passt-selinux %endif @@ -2711,6 +2700,12 @@ exit 0 %endif %changelog +* Mon Jun 9 2025 Jiri Denemark - 11.4.0-1 +- Rebased to libvirt-11.4.0 (RHEL-71662) +- The rebase also fixes the following bugs: + RHEL-79460, RHEL-84783, RHEL-85414, RHEL-86952, RHEL-87177 + RHEL-88747, RHEL-89414, RHEL-90160, RHEL-90625, RHEL-92510 + * Tue May 6 2025 Jiri Denemark - 11.3.0-1 - Rebased to libvirt-11.3.0 (RHEL-71662) - The rebase also fixes the following bugs: diff --git a/sources b/sources index b806f58..d77f74a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-11.3.0.tar.xz) = 9d498c5b13d1754feebf3094bea773d1e07098d0badf6b6d816d7ba11a6eda5496a172aba789d3ae28578320559b5b3c9470411139c3dd58b0b763b85ec1c0a4 +SHA512 (libvirt-11.4.0.tar.xz) = 88888b0cf80c1c4350a834d9f462c030235878a57d8723ca13775872cc8d4034c8360536513d8117ab542fd045287f3af0e3f2b70ae26f3af6acaaf3fc3f4c01