Sync from SUSE:SLFO:1.1 libvirt revision f3f9a7dcc1804de4c676ea506990b678

_service

@@ -1,19 +1,18 @@
 <services>
-  <service name="obs_scm" mode="manual">
+  <service name="tar_scm" mode="manual">
     <param name="scm">git</param>
     <param name="url">https://gitlab.suse.de/virtualization/libvirt.git</param>
-    <param name="revision">v11.4.0-sle16.0</param>
+    <param name="revision">v10.0.0-sle15sp6</param>
     <param name="extract">libvirt.spec</param>
     <param name="extract">README.packaging.txt</param>
     <param name="extract">libvirt-supportconfig</param>
     <param name="versionformat">@PARENT_TAG@</param>
-    <param name="versionrewrite-pattern">[v]?([^-a-z]+)(.*)</param>
+    <param name="versionrewrite-pattern">[v]?([^-+a-z]+)(.*)</param>
     <param name="versionrewrite-replacement">\1</param>
     <param name="changesgenerate">disable</param>
   </service>
   <service name="set_version" mode="manual"/>
-  <service name="tar" mode="buildtime"/>
+  <service name="recompress" mode="manual">
-  <service name="recompress" mode="buildtime">
     <param name="file">*.tar</param>
     <param name="compression">xz</param>
   </service>

libvirt.obsinfo

@@ -1,4 +0,0 @@
-name: libvirt
-version: 11.4.0
-mtime: 1754586400
-commit: 928b3bdae2dda843fd673ce15839eba3b4c11d61

libvirt.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libvirt
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -36,30 +36,22 @@
 # The gluster storage backend is built for both openSUSE and SLE, but it is
 # not supported
 %define with_storage_gluster  0%{!?_without_storage_gluster:1}
-%define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1}
+%define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:0}
 %define with_apparmor      0%{!?_without_apparmor:1}
-%define with_selinux_unconfined_daemon_hooks	0%{!?_without_selinux:1}
+%define with_interface     0%{!?_without_interface:1}
-# The udev interface backend is the only one that works across SUSE distros.
-# It supports just a handful of read-only operations, has a history of
-# instability, and is insufficiently maintained. Completely disable the
-# interface driver.
-%define with_interface     0%{!?_without_interface:0}
 
 # Optional bits on by default
 %define with_sanlock       0%{!?_without_sanlock:1}
 %define with_polkit_rules  0%{!?_without_polkit_rules:1}
 %define with_wireshark     0%{!?_without_wireshark:1}
-%define with_libssh        0%{!?_without_libssh:1}
 %define with_libssh2       0%{!?_without_libssh2:1}
 %define with_numactl       0%{!?_without_numactl:1}
-%define with_nwfilter      0%{!?_without_nwfilter:1}
 %define with_modular_daemons 0%{!?_without_modular_daemons:1}
-%define with_userfaultfd_sysctl 0%{!?_without_userfaultfd_sysctl:1}
-%define with_firewalld_zone 0%{!?_without_firewalld_zone:1}
 
 # A few optional bits off by default, we enable later
-%define with_fuse          0%{!?_without_fuse:0}
 %define with_numad         0%{!?_without_numad:0}
+%define with_firewalld_zone 0%{!?_without_firewalld_zone:0}
+%define with_libssh        0%{!?_without_libssh:0}
 %define with_nbdkit        0%{!?_without_nbdkit:0}
 %define with_nbdkit_config_default 0%{!?_without_nbdkit_config_default:0}
 
@@ -80,61 +72,44 @@
     %define with_vbox      0
 %endif
 
+# The 'libvirt' zone must be used with firewalld >= 0.7.0
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
+    %define with_firewalld_zone 0%{!?_without_firewalld_zone:1}
+%endif
+
+# Enable libssh support in newer code bases
+%if 0%{?suse_version} >= 1500
+    %define with_libssh    0%{!?_without_libssh:1}
+%endif
+
 %ifarch x86_64 aarch64
     %define with_storage_rbd 0%{!?_without_storage_rbd:1}
 %endif
 
-# Tumbleweeed is new enough to support /dev/userfaultfd, which
+# libiscsi storage backend needs libiscsi >= 1.18.0 which is only available
-# does not require enabling vm.unprivileged_userfaultfd sysct
+# in suse_version >= 1500
-%if 0%{?suse_version} > 1500
+%if 0%{?suse_version} >= 1500
-    %define with_userfaultfd_sysctl 0
+    %define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1}
 %endif
 
-# numa-preplace (formerly numad) is used to manage the CPU and memory
+# numad is used to manage the CPU and memory placement dynamically for
-# placement dynamically for qemu and lxc drivers
+# qemu and lxc drivers
 %if %{with_qemu} || %{with_lxc}
-    %ifarch aarch64 %{power64} x86_64
+# Enable numad for most architectures
+    %ifnarch s390 s390x %arm %ix86
         %define with_numad 0%{!?_without_numad:1}
     %endif
 %endif
 
-# fuse is used to provide virtualized /proc for LXC
+# Items to exclude in ALP-based products
-%if %{with_lxc}
-    %define with_fuse      0%{!?_without_fuse:1}
-%endif
-
-# Items to exclude in SLFO:Main based products
 %if 0%{?suse_version} == 1600
-    %define with_apparmor  0
-    %define with_esx       0
-    %define with_interface 0
     %define with_libxl     0
-    %define with_lxc       0
+    %define with_apparmor  0
-    %define with_fuse      0
+    %define with_interface 0
     %define with_sanlock   0
+    %define with_numad     0
+    %define with_esx       0
     %define with_storage_gluster 0
-    %define with_storage_rbd     0
-%endif
-
-%if 0%{?suse_version} < 1600
-    %define with_selinux_unconfined_daemon_hooks 0
-%endif
-
-# Factory and SLFO strive to drop iptables. The nwfilter driver has a runtime
-# dependency on iptables, but no build-time one. The driver will be built
-# unconditionally, but will no longer be required/recommended by the meta
-# subpackages in Factory and SLFO.
-%if 0%{?suse_version} >= 1600
-    %define with_nwfilter  0
-%endif
-
-# Prefer nftables if available
-%if "%{?default_firewall_backend}" == "nftables"
-    %define prefer_nftables 1
-    %define firewall_backend_priority nftables,iptables
-%else
-    %define prefer_nftables 0
-    %define firewall_backend_priority iptables,nftables
 %endif
 
 # Force QEMU to run as qemu:qemu
@@ -153,17 +128,14 @@
 
 Name:           libvirt
 URL:            https://libvirt.org/
-Version:        11.4.0
+Version:        10.0.0
 Release:        0
 Summary:        Library providing a virtualization API
 License:        LGPL-2.1-or-later
 
 Requires:       %{name}-daemon = %{version}-%{release}
 Requires:       %{name}-daemon-config-network = %{version}-%{release}
-%if %{with_nwfilter}
 Requires:       %{name}-daemon-config-nwfilter = %{version}-%{release}
-Requires:       %{name}-daemon-driver-nwfilter = %{version}-%{release}
-%endif
 %if %{with_libxl}
 Requires:       %{name}-daemon-driver-libxl = %{version}-%{release}
 %endif
@@ -180,6 +152,7 @@ Requires:       %{name}-daemon-driver-interface = %{version}-%{release}
 %endif
 Requires:       %{name}-daemon-driver-network = %{version}-%{release}
 Requires:       %{name}-daemon-driver-nodedev = %{version}-%{release}
+Requires:       %{name}-daemon-driver-nwfilter = %{version}-%{release}
 Requires:       %{name}-daemon-driver-secret = %{version}-%{release}
 Requires:       %{name}-daemon-driver-storage = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
@@ -202,7 +175,7 @@ BuildRequires:  libacl-devel
 BuildRequires:  qemu-tools
 %endif
 BuildRequires:  bash-completion-devel >= 2.0
-BuildRequires:  glib2-devel >= 2.66
+BuildRequires:  glib2-devel >= 2.56
 BuildRequires:  libattr-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libgnutls-devel
@@ -217,7 +190,7 @@ BuildRequires:  readline-devel
 # For pool-build probing for existing pools
 BuildRequires:  libblkid-devel >= 2.17
 BuildRequires:  libpciaccess0-devel >= 0.10.9
-BuildRequires:  libjson-c-devel
+BuildRequires:  libyajl-devel
 BuildRequires:  pkgconfig(libudev) >= 145
 %if %{with_sanlock}
 BuildRequires:  sanlock-devel >= 2.4
@@ -231,6 +204,8 @@ BuildRequires:  apparmor-rpm-macros
 BuildRequires:  libapparmor-devel
 %endif
 BuildRequires:  cyrus-sasl-devel
+BuildRequires:  ebtables
+BuildRequires:  iptables
 BuildRequires:  polkit >= 0.112
 %if %{with_nbdkit}
 BuildRequires:  libnbd-devel
@@ -260,9 +235,7 @@ BuildRequires:  glusterfs-devel >= 3.4.1
 # For QEMU/LXC numa info
 BuildRequires:  libnuma-devel
 %endif
-%if %{with_fuse}
+BuildRequires:  fuse-devel >= 2.8.6
-BuildRequires:  pkgconfig(fuse3) >= 3.1.0
-%endif
 BuildRequires:  libcap-ng-devel >= 0.5.0
 %if %{with_interface}
 BuildRequires:  libnetcontrol-devel >= 0.2.0
@@ -279,6 +252,9 @@ BuildRequires:  libwsman-devel >= 2.6.3
 BuildRequires:  audit-devel
 # For /usr/sbin/dtrace
 BuildRequires:  systemtap-sdt-devel
+%if %{with_numad}
+BuildRequires:  numad
+%endif
 %if %{with_wireshark}
 BuildRequires:  wireshark-devel
 %endif
@@ -307,8 +283,6 @@ on a single hardware system where the basic resources are driven by a
 Linux instance. The library aims to provide long term stable C API
 to interact with Linux virtualization technologies.
 
-This package does not contain files, it just requires the necessary packages.
-
 %package doc
 Summary:        API reference and website documentation for libvirt
 BuildArch:      noarch
@@ -356,11 +330,6 @@ Requires:       group(libvirt)
 # Needed by libvirt-guests init script.
 Requires:       gettext-runtime
 Requires:       bash-completion >= 2.0
-# virt-manager uses netcat for accessing spice and VNC servers running in
-# qemu processes. See boo#1222100 for details. Although libvirt does not
-# use netcat, it's in a good position to provide the dependency for
-# virt-manager. netcat-openbsd is a tiny package, so it's a tolerable hack.
-Requires:       netcat-openbsd
 
 %if %{with_apparmor}
 Recommends:     apparmor-abstractions
@@ -385,7 +354,6 @@ resources
 %package daemon-plugin-lockd
 Summary:        lockd client plugin for virtlockd
 Requires:       %{name}-libs = %{version}-%{release}
-Requires:       %{name}-daemon-common = %{version}-%{release}
 
 %description daemon-plugin-lockd
 A client-side plugin that implements disk locking using POSIX fcntl advisory
@@ -401,22 +369,22 @@ Server side daemon used to manage logs from virtual machine consoles
 %package daemon-proxy
 Summary:        Server side daemon providing libvirtd proxy
 Requires:       %{name}-libs = %{version}-%{release}
+# netcat is needed on the server side so that clients that have
+# libvirt < 6.9.0 can connect, but newer versions will prefer
+# virt-ssh-helper
+Recommends:     netcat-openbsd
 
 %description daemon-proxy
 Server side daemon providing functionality previously provided by
 the monolithic libvirtd
 
 %package daemon-hooks
-Summary:        Hook scripts for QEMU
+Summary:        Hook scripts for the libvirtd daemon
-%if %{with_selinux_unconfined_daemon_hooks}
+Requires:       %{name}-daemon = %{version}-%{release}
-BuildRequires:       selinux-policy-devel
-%selinux_requires
-%endif
-Requires:       %{name}-daemon-driver-qemu = %{version}-%{release}
 Requires:       python3-lxml
 
 %description daemon-hooks
-Hook scripts for the virtqemud daemon
+Default hook scripts for the libvirt daemon
 
 %package daemon-config-network
 Summary:        Default configuration files for the libvirtd daemon
@@ -438,11 +406,7 @@ Summary:        Network driver plugin for the libvirtd daemon
 Requires:       %{name}-daemon-common = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       dnsmasq >= 2.41
-%if %{prefer_nftables}
-Requires:       nftables
-%else
 Requires:       iptables
-%endif
 
 %description daemon-driver-network
 The network driver plugin for the libvirtd daemon, providing
@@ -466,7 +430,9 @@ Summary:        Nodedev driver plugin for the libvirtd daemon
 Requires:       %{name}-daemon-common = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 # For managing persistent mediated devices
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
 Requires:       mdevctl
+%endif
 # For modprobe of pci devices
 Requires:       modutils
 
@@ -497,7 +463,7 @@ an implementation of the secret key APIs.
 Summary:        Storage driver plugin including base backends for the libvirtd daemon
 Requires:       %{name}-daemon-common = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
-Recommends:     nfs-utils
+Requires:       nfs-utils
 # For mkfs
 Requires:       util-linux
 %if %{with_qemu}
@@ -611,8 +577,6 @@ The storage driver plugin for the libvirtd daemon, providing
 an implementation of the storage APIs using LVM, iSCSI,
 parted and more.
 
-This package does not contain files, it just requires the necessary packages.
-
 %package daemon-driver-qemu
 Summary:        Qemu driver plugin for the libvirtd daemon
 Requires:       %{name}-daemon-common = %{version}-%{release}
@@ -624,11 +588,12 @@ Requires:       /usr/bin/bzip2
 Requires:       /usr/bin/gzip
 Requires:       /usr/bin/lzop
 Requires:       /usr/bin/xz
-Requires:       /usr/bin/zstd
 Requires:       qemu
 Requires:       systemd-container
 # swtp is needed to manage <tpm> devices.
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
 Requires:       swtpm
+%endif
 %ifarch x86_64
 Requires:       qemu-ovmf-x86_64
 %endif
@@ -636,7 +601,7 @@ Requires:       qemu-ovmf-x86_64
 Requires:       qemu-uefi-aarch64
 %endif
 %if %{with_numad}
-Suggests:       numa-preplace
+Suggests:       numad
 %endif
 %if %{with_nbdkit}
 Recommends:     nbdkit
@@ -658,7 +623,7 @@ Requires:       systemd-container
 # For modprobe of nbd driver
 Requires:       modutils
 %if %{with_numad}
-Suggests:       numa-preplace
+Suggests:       numad
 %endif
 
 %description daemon-driver-lxc
@@ -700,9 +665,7 @@ Requires:       %{name}-daemon-driver-interface = %{version}-%{release}
 %endif
 Requires:       %{name}-daemon-driver-network = %{version}-%{release}
 Requires:       %{name}-daemon-driver-nodedev = %{version}-%{release}
-%if %{with_nwfilter}
+Requires:       %{name}-daemon-driver-nwfilter = %{version}-%{release}
-Recommends:     %{name}-daemon-driver-nwfilter = %{version}-%{release}
-%endif
 Requires:       %{name}-daemon-driver-qemu = %{version}-%{release}
 Requires:       %{name}-daemon-driver-secret = %{version}-%{release}
 Requires:       %{name}-daemon-driver-storage = %{version}-%{release}
@@ -711,8 +674,6 @@ Requires:       %{name}-daemon-driver-storage = %{version}-%{release}
 Server side daemon and driver required to manage the virtualization
 capabilities of the QEMU emulators
 
-This package does not contain files, it just requires the necessary packages.
-
 %package daemon-lxc
 Summary:        Server side daemon & driver required to run LXC guests
 %if %{with_modular_daemons}
@@ -726,9 +687,7 @@ Requires:       %{name}-daemon-driver-interface = %{version}-%{release}
 Requires:       %{name}-daemon-driver-lxc = %{version}-%{release}
 Requires:       %{name}-daemon-driver-network = %{version}-%{release}
 Requires:       %{name}-daemon-driver-nodedev = %{version}-%{release}
-%if %{with_nwfilter}
+Requires:       %{name}-daemon-driver-nwfilter = %{version}-%{release}
-Recommends:     %{name}-daemon-driver-nwfilter = %{version}-%{release}
-%endif
 Requires:       %{name}-daemon-driver-secret = %{version}-%{release}
 Requires:       %{name}-daemon-driver-storage = %{version}-%{release}
 
@@ -736,8 +695,6 @@ Requires:       %{name}-daemon-driver-storage = %{version}-%{release}
 Server side daemon and driver required to manage the virtualization
 capabilities of LXC
 
-This package does not contain files, it just requires the necessary packages.
-
 %package daemon-xen
 Summary:        Server side daemon & driver required to run XEN guests
 %if %{with_modular_daemons}
@@ -752,6 +709,7 @@ Requires:       %{name}-daemon-driver-interface = %{version}-%{release}
 Requires:       %{name}-daemon-driver-libxl = %{version}-%{release}
 Requires:       %{name}-daemon-driver-network = %{version}-%{release}
 Requires:       %{name}-daemon-driver-nodedev = %{version}-%{release}
+Requires:       %{name}-daemon-driver-nwfilter = %{version}-%{release}
 Requires:       %{name}-daemon-driver-secret = %{version}-%{release}
 Requires:       %{name}-daemon-driver-storage = %{version}-%{release}
 Requires:       xen
@@ -760,8 +718,6 @@ Requires:       xen
 Server side daemon and driver required to manage the virtualization
 capabilities of XEN
 
-This package does not contain files, it just requires the necessary packages.
-
 %package daemon-vbox
 Summary:        Server side daemon & driver required to run VirtualBox guests
 %if ! %{with_modular_daemons}
@@ -772,9 +728,7 @@ Requires:       %{name}-daemon-driver-interface = %{version}-%{release}
 %endif
 Requires:       %{name}-daemon-driver-network = %{version}-%{release}
 Requires:       %{name}-daemon-driver-nodedev = %{version}-%{release}
-%if %{with_nwfilter}
+Requires:       %{name}-daemon-driver-nwfilter = %{version}-%{release}
-Recommends:     %{name}-daemon-driver-nwfilter = %{version}-%{release}
-%endif
 Requires:       %{name}-daemon-driver-secret = %{version}-%{release}
 Requires:       %{name}-daemon-driver-storage = %{version}-%{release}
 Requires:       %{name}-daemon-driver-vbox = %{version}-%{release}
@@ -786,12 +740,13 @@ Requires:       virtualbox < 5.3
 Server side daemon and driver required to manage the virtualization
 capabilities of VirtualBox
 
-This package does not contain files, it just requires the necessary packages.
-
 %package client
 Summary:        Client side utilities of the libvirt library
 Requires:       %{name}-libs = %{version}-%{release}
+# Needed by virt-pki-validate script.
+Requires:       cyrus-sasl
 Requires:       bash-completion >= 2.0
+Requires:       gnutls
 
 # Ensure smooth upgrades
 Obsoletes:      libvirt-bash-completion < 7.3.0
@@ -832,7 +787,6 @@ Summary:        Sanlock lock manager plugin for QEMU driver
 Requires:       sanlock >= 2.4
 # For virt-sanlock-cleanup require augeas
 Requires:       %{name}-libs = %{version}-%{release}
-Requires:       %{name}-daemon-common = %{version}-%{release}
 Requires:       augeas
 Obsoletes:      %{name}-lock-sanlock < 9.0.0
 Provides:       %{name}-lock-sanlock = %{version}-%{release}
@@ -855,13 +809,6 @@ Requires:       %{name}-daemon-driver-network = %{version}-%{release}
 %description nss
 libvirt plugin for NSS for translating domain names into IP addresses.
 
-%package ssh-proxy
-Summary:        Libvirt SSH proxy
-Requires:       %{name}-libs = %{version}-%{release}
-
-%description ssh-proxy
-Allows SSH into domains via VSOCK without need for network.
-
 %prep
 %autosetup -p1
 
@@ -953,16 +900,6 @@ Allows SSH into domains via VSOCK without need for network.
 %else
     %define arg_numad -Dnumad=disabled
 %endif
-%if %{with_fuse}
-    %define arg_fuse -Dfuse=enabled
-%else
-    %define arg_fuse -Dfuse=disabled
-%endif
-%if %{with_userfaultfd_sysctl}
-    %define arg_userfaultfd_sysctl -Duserfaultfd_sysctl=enabled
-%else
-    %define arg_userfaultfd_sysctl -Duserfaultfd_sysctl=disabled
-%endif
 %if %{with_nbdkit}
     %define arg_nbdkit -Dnbdkit=enabled
 %else
@@ -998,6 +935,26 @@ Allows SSH into domains via VSOCK without need for network.
 
 %define arg_selinux_mount -Dselinux_mount="/selinux"
 
+# UEFI firmwares
+# For SLE15 SP2 (Leap 15.2) and newer, use firmware descriptor files from the
+# firmware packages, otherwise define firmwares via configure option
+%if ! (0%{?suse_version} > 1500 || 0%{?sle_version} > 150100)
+    # x86_64 UEFI firmwares
+    # To more closely resemble actual hardware, we use the firmwares with
+    # embedded Microsoft keys
+    #
+    # The Windows HCK test requires a bigger variable store, so 4MB firmware
+    # images have been introduced. They are advertised first and will be
+    # used by default for new VM installations. The 2MB images are still
+    # available for existing VMs, and can be selected for new installations
+    # as well.
+    LOADERS="/usr/share/qemu/ovmf-x86_64-ms-4m-code.bin:/usr/share/qemu/ovmf-x86_64-ms-4m-vars.bin"
+    LOADERS="$LOADERS:/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin"
+    # aarch64 UEFI firmwares
+    LOADERS="$LOADERS:/usr/share/qemu/aavmf-aarch64-code.bin:/usr/share/qemu/aavmf-aarch64-vars.bin"
+    %define arg_loader_nvram -Dloader-nvram="$LOADERS"
+%endif
+
 # Macros for moving vendor provided configuration from /etc to /usr
 %if 0%{?suse_version} > 1500
     %define logrotate_prefix %nil
@@ -1031,8 +988,6 @@ Allows SSH into domains via VSOCK without need for network.
 %meson \
            --libexecdir=%{_libexecdir} \
            -Drunstatedir=%{_rundir} \
-           -Dunitdir=%{_unitdir} \
-           -Dsysusersdir=%{_sysusersdir} \
            %{?arg_qemu} \
            %{?arg_openvz} \
            %{?arg_lxc} \
@@ -1065,13 +1020,10 @@ Allows SSH into domains via VSOCK without need for network.
            -Dstorage_vstorage=disabled \
            %{?arg_numactl} \
            %{?arg_numad} \
-           %{?arg_userfaultfd_sysctl} \
            %{?arg_nbdkit} \
            %{?arg_nbdkit_config_default} \
-           -Dssh_proxy=enabled \
-           -Dsysctl_config=enabled \
            -Dcapng=enabled \
-           %{?arg_fuse} \
+           -Dfuse=enabled \
            -Dnetcf=disabled \
            %{?arg_netcontrol} \
            -Dselinux=enabled \
@@ -1079,7 +1031,7 @@ Allows SSH into domains via VSOCK without need for network.
            %{?arg_apparmor} \
            %{?arg_apparmor_profiles} \
            -Dudev=enabled \
-           -Djson_c=enabled \
+           -Dyajl=enabled \
            %{?arg_sanlock} \
            -Dlibpcap=enabled \
            -Dlibnl=enabled \
@@ -1097,8 +1049,8 @@ Allows SSH into domains via VSOCK without need for network.
            -Dqemu_moddir=%{qemu_moddir} \
            -Dqemu_datadir=%{qemu_datadir} \
            -Dexpensive_tests=enabled \
+           %{?arg_loader_nvram} \
            -Dinit_script=systemd \
-           -Dfirewall_backend_priority=%{firewall_backend_priority} \
            -Ddocs=enabled \
            -Dtests=enabled \
            -Drpath=disabled \
@@ -1127,9 +1079,7 @@ mv %{buildroot}/%{_sysconfdir}/logrotate.d/libvirtd %{buildroot}/%{logrotate_dir
 %endif
 
 mkdir -p %{buildroot}/%{_localstatedir}/lib/%{name}
-%if %{with_qemu}
 mkdir -p %{buildroot}/%{_sysconfdir}/%{name}/hooks
-%endif
 %find_lang %{name}
 install -d -m 0755 %{buildroot}/%{_datadir}/%{name}/networks/
 cp %{buildroot}/%{_sysconfdir}/%{name}/qemu/networks/default.xml \
@@ -1161,9 +1111,34 @@ rm -f %{buildroot}/%{_datadir}/augeas/lenses/libvirt_sanlock.aug
 rm -f %{buildroot}/%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
 %endif
 
-rm -f %{buildroot}/%{_sysusersdir}/libvirt.conf
-rm -f %{buildroot}/%{_sysusersdir}/libvirt-qemu.conf
 rm -f %{buildroot}/usr/lib/sysctl.d/60-libvirtd.conf
+# Provide rc symlink backward compatibility
+ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rclibvirtd
+ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtproxyd
+ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtlogd
+ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtlockd
+ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtnetworkd
+ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtnodedevd
+ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtnwfilterd
+ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtsecretd
+ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtstoraged
+ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rclibvirt-guests
+
+%if %{with_interface}
+ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtinterfaced
+%endif
+%if %{with_qemu}
+ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtqemud
+%endif
+%if %{with_lxc}
+ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtlxcd
+%endif
+%if %{with_libxl}
+ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtxend
+%endif
+%if %{with_vbox}
+ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtvboxd
+%endif
 
 # Install firewall services for migration ports
 mkdir -p %{buildroot}/%{_fwdefdir}
@@ -1174,9 +1149,7 @@ mkdir -p %{buildroot}/usr/lib/supportconfig/plugins
 install -m 755 %{S:1} %{buildroot}/usr/lib/supportconfig/plugins/libvirt
 
 # Install qemu hook script
-%if %{with_qemu}
 install -m 755 %{S:2} %{buildroot}/%{_sysconfdir}/%{name}/hooks/qemu
-%endif
 
 %ifarch %{power64} s390x x86_64
 mv %{buildroot}/%{_datadir}/systemtap/tapset/libvirt_probes.stp \
@@ -1188,8 +1161,7 @@ mv %{buildroot}/%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \
 %endif
 
 %check
-export VIR_TEST_DEBUG=1
+VIR_TEST_DEBUG=1 %meson_test -t 5 --no-suite syntax-check
-%meson_test -t 5 --no-suite syntax-check
 
 # For daemons with only UNIX sockets
 %define libvirt_daemon_systemd_pre() %service_add_pre %1.socket %1-ro.socket %1-admin.socket %1.service
@@ -1256,18 +1228,6 @@ fi
 /sbin/ldconfig
 %service_del_postun_without_restart libvirt-guests.service
 
-%if %{with_selinux_unconfined_daemon_hooks}
-%post daemon-hooks
-if [ $1 -eq 1 ]; then
-    %selinux_set_booleans -s targeted virt_hooks_unconfined=1
-fi
-
-%postun daemon-hooks
-if [ $1 -eq 0 ]; then
-    %selinux_unset_booleans -s targeted virt_hooks_unconfined=1
-fi
-%endif
-
 %pre daemon-proxy
 %libvirt_daemon_systemd_pre_inet virtproxyd
 
@@ -1472,6 +1432,7 @@ fi
 %{_unitdir}/libvirtd-admin.socket
 %{_unitdir}/libvirtd-tcp.socket
 %{_unitdir}/libvirtd-tls.socket
+%{_sbindir}/rclibvirtd
 %config(noreplace) %{_sysconfdir}/%{name}/libvirtd.conf
 %if %{with_apparmor}
 %config(noreplace) %{_sysconfdir}/apparmor.d/usr.sbin.libvirtd
@@ -1486,11 +1447,11 @@ fi
 
 %files daemon-common
 %dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/connection-driver/
 %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh
 %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/hooks
 %{_unitdir}/libvirt-guests.service
 %{_unitdir}/virt-guest-shutdown.target
+%{_sbindir}/rclibvirt-guests
 %{_bindir}/virt-admin
 %{_bindir}/virt-host-validate
 %dir %{_sysconfdir}/sasl2/
@@ -1537,6 +1498,7 @@ fi
 %{_unitdir}/virtlockd.service
 %{_unitdir}/virtlockd.socket
 %{_unitdir}/virtlockd-admin.socket
+%{_sbindir}/rcvirtlockd
 %config(noreplace) %{_sysconfdir}/%{name}/virtlockd.conf
 %{_datadir}/augeas/lenses/virtlockd.aug
 %{_datadir}/augeas/lenses/tests/test_virtlockd.aug
@@ -1553,6 +1515,7 @@ fi
 %{_unitdir}/virtlogd.service
 %{_unitdir}/virtlogd.socket
 %{_unitdir}/virtlogd-admin.socket
+%{_sbindir}/rcvirtlogd
 %config(noreplace) %{_sysconfdir}/%{name}/virtlogd.conf
 %{_datadir}/augeas/lenses/virtlogd.aug
 %{_datadir}/augeas/lenses/tests/test_virtlogd.aug
@@ -1566,15 +1529,14 @@ fi
 %{_unitdir}/virtproxyd-admin.socket
 %{_unitdir}/virtproxyd-tcp.socket
 %{_unitdir}/virtproxyd-tls.socket
+%{_sbindir}/rcvirtproxyd
 %config(noreplace) %{_sysconfdir}/%{name}/virtproxyd.conf
 %{_datadir}/augeas/lenses/virtproxyd.aug
 %{_datadir}/augeas/lenses/tests/test_virtproxyd.aug
 %doc %{_mandir}/man8/virtproxyd.8*
 
-%if %{with_qemu}
 %files daemon-hooks
 %{_sysconfdir}/%{name}/hooks/qemu
-%endif
 
 %files daemon-config-network
 %dir %{_datadir}/%{name}/networks/
@@ -1594,6 +1556,8 @@ fi
 %{_unitdir}/virtinterfaced-ro.socket
 %{_unitdir}/virtinterfaced-admin.socket
 %{_sbindir}/virtinterfaced
+%{_sbindir}/rcvirtinterfaced
+%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so
 %doc %{_mandir}/man8/virtinterfaced.8*
 %endif
@@ -1602,20 +1566,19 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/virtnetworkd.conf
 %{_datadir}/augeas/lenses/virtnetworkd.aug
 %{_datadir}/augeas/lenses/tests/test_virtnetworkd.aug
-%config(noreplace) %{_sysconfdir}/%{name}/network.conf
-%{_datadir}/augeas/lenses/libvirtd_network.aug
-%{_datadir}/augeas/lenses/tests/test_libvirtd_network.aug
 %{_unitdir}/virtnetworkd.service
 %{_unitdir}/virtnetworkd.socket
 %{_unitdir}/virtnetworkd-ro.socket
 %{_unitdir}/virtnetworkd-admin.socket
 %{_sbindir}/virtnetworkd
+%{_sbindir}/rcvirtnetworkd
 %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/qemu/
 %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/qemu/networks/
 %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/qemu/networks/autostart/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/%{name}/network/
 %dir %attr(0755, root, root) %{_localstatedir}/lib/%{name}/dnsmasq/
 %attr(0755, root, root) %{_libexecdir}/libvirt_leaseshelper
+%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_network.so
 %if %{with_firewalld_zone}
 %dir %{_prefix}/lib/firewalld/zones/
@@ -1637,6 +1600,8 @@ fi
 %{_unitdir}/virtnodedevd-ro.socket
 %{_unitdir}/virtnodedevd-admin.socket
 %{_sbindir}/virtnodedevd
+%{_sbindir}/rcvirtnodedevd
+%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so
 %doc %{_mandir}/man8/virtnodedevd.8*
 
@@ -1649,7 +1614,9 @@ fi
 %{_unitdir}/virtnwfilterd-ro.socket
 %{_unitdir}/virtnwfilterd-admin.socket
 %{_sbindir}/virtnwfilterd
+%{_sbindir}/rcvirtnwfilterd
 %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/nwfilter/
+%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so
 %doc %{_mandir}/man8/virtnwfilterd.8*
 
@@ -1662,7 +1629,9 @@ fi
 %{_unitdir}/virtsecretd-ro.socket
 %{_unitdir}/virtsecretd-admin.socket
 %{_sbindir}/virtsecretd
+%{_sbindir}/rcvirtsecretd
 %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/secrets/
+%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so
 %doc %{_mandir}/man8/virtsecretd.8*
 
@@ -1677,12 +1646,16 @@ fi
 %{_unitdir}/virtstoraged-ro.socket
 %{_unitdir}/virtstoraged-admin.socket
 %{_sbindir}/virtstoraged
+%{_sbindir}/rcvirtstoraged
 %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
 %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/storage/
 %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/storage/autostart/
+%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so
 %dir %{_libdir}/%{name}/storage-backend/
 %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_fs.so
+%dir %{_libdir}/%{name}/storage-file/
+%{_libdir}/%{name}/storage-file/libvirt_storage_file_fs.so
 %doc %{_mandir}/man8/virtstoraged.8*
 
 %files daemon-driver-storage-disk
@@ -1703,7 +1676,6 @@ fi
 %if %{with_storage_gluster}
 %files daemon-driver-storage-gluster
 %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_gluster.so
-%dir %{_libdir}/%{name}/storage-file/
 %{_libdir}/%{name}/storage-file/libvirt_storage_file_gluster.so
 %endif
 
@@ -1724,9 +1696,7 @@ fi
 %if %{with_apparmor}
 %config(noreplace) %{_sysconfdir}/apparmor.d/usr.sbin.virtqemud
 %endif
-%if %{with_userfaultfd_sysctl}
 %config(noreplace) %{_prefix}/lib/sysctl.d/60-qemu-postcopy-migration.conf
-%endif
 %{_datadir}/augeas/lenses/virtqemud.aug
 %{_datadir}/augeas/lenses/tests/test_virtqemud.aug
 %{_unitdir}/virtqemud.service
@@ -1734,6 +1704,7 @@ fi
 %{_unitdir}/virtqemud-ro.socket
 %{_unitdir}/virtqemud-admin.socket
 %{_sbindir}/virtqemud
+%{_sbindir}/rcvirtqemud
 %config(noreplace) %{_sysconfdir}/%{name}/qemu.conf
 %config(noreplace) %{_sysconfdir}/%{name}/qemu-lockd.conf
 %{logrotate_prefix} %{logrotate_dir}/libvirtd.qemu
@@ -1743,6 +1714,7 @@ fi
 %dir %attr(0700, root, root) %{_localstatedir}/log/%{name}/qemu/
 %{_datadir}/augeas/lenses/libvirtd_qemu.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
+%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_qemu.so
 %dir %attr(0711, root, root) %{_localstatedir}/lib/%{name}/swtpm/
 %dir %attr(0711, root, root) %{_localstatedir}/log/swtpm/
@@ -1764,6 +1736,7 @@ fi
 %{_unitdir}/virtlxcd-ro.socket
 %{_unitdir}/virtlxcd-admin.socket
 %{_sbindir}/virtlxcd
+%{_sbindir}/rcvirtlxcd
 %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/lxc/
 %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/lxc/autostart/
 %config(noreplace) %{_sysconfdir}/%{name}/lxc.conf
@@ -1773,6 +1746,7 @@ fi
 %attr(0755, root, root) %{_libexecdir}/libvirt_lxc
 %{_datadir}/augeas/lenses/libvirtd_lxc.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
+%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_lxc.so
 %{_bindir}/virt-create-rootfs
 %doc %{_mandir}/man1/virt-create-rootfs.1*
@@ -1793,6 +1767,7 @@ fi
 %{_unitdir}/virtxend-ro.socket
 %{_unitdir}/virtxend-admin.socket
 %{_sbindir}/virtxend
+%{_sbindir}/rcvirtxend
 %config(noreplace) %{_sysconfdir}/%{name}/libxl.conf
 %{logrotate_prefix} %{logrotate_dir}/libvirtd.libxl
 %config(noreplace) %{_sysconfdir}/%{name}/libxl-lockd.conf
@@ -1804,6 +1779,7 @@ fi
 %dir %attr(0700, root, root) %{_localstatedir}/lib/%{name}/libxl/dump/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/%{name}/libxl/save/
 %dir %attr(0700, root, root) %{_localstatedir}/log/%{name}/libxl/
+%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_libxl.so
 %doc %{_mandir}/man8/virtxend.8*
 %endif
@@ -1819,6 +1795,7 @@ fi
 %{_unitdir}/virtvboxd-ro.socket
 %{_unitdir}/virtvboxd-admin.socket
 %{_sbindir}/virtvboxd
+%{_sbindir}/rcvirtvboxd
 %{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so
 %doc %{_mandir}/man8/virtvboxd.8*
 %endif
@@ -1854,6 +1831,7 @@ fi
 %{_bindir}/virt-pki-query-dn
 %{_bindir}/virt-pki-validate
 %{_datadir}/bash-completion/completions/virsh
+%dir %{_libdir}/%{name}/
 
 %if %{with_qemu}
 %files client-qemu
@@ -1938,10 +1916,4 @@ fi
 %{_libdir}/libnss_libvirt.so.2
 %{_libdir}/libnss_libvirt_guest.so.2
 
-%files ssh-proxy
-%dir %{_sysconfdir}/ssh/
-%dir %{_sysconfdir}/ssh/ssh_config.d/
-%config(noreplace) %{_sysconfdir}/ssh/ssh_config.d/30-libvirt-ssh-proxy.conf
-%{_libexecdir}/libvirt-ssh-proxy
-
 %changelog