From 24d349fa37fd356f9112e9f6515652dd4045b8a6 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Mon, 1 Aug 2022 11:03:07 -0400 Subject: [PATCH 01/28] libvirt-8.6.0-1 Update to version 8.6.0 --- libvirt.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libvirt.spec b/libvirt.spec index 62092b2..8cdc669 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -230,7 +230,7 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 8.5.0 +Version: 8.6.0 Release: 1%{?dist} License: LGPLv2+ URL: https://libvirt.org/ @@ -2127,6 +2127,9 @@ exit 0 %changelog +* Mon Aug 01 2022 Cole Robinson - 8.6.0-1 +- Update to version 8.6.0 + * Thu Jul 21 2022 Cole Robinson - 8.5.0-1 - Update to version 8.5.0 diff --git a/sources b/sources index f7cb88d..7f7abe5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-8.5.0.tar.xz) = 62b05c5cd58eab0ab2d945b832fd85807aea9b5f12a7ef5d1205fe0edac8d361ba3a9245f60f200a8548c96f718943d4502d87fff87c4495bd1e2637f14aaccf +SHA512 (libvirt-8.6.0.tar.xz) = 6198ac33ea718045bfd12a2740d5a7fa70c754b1ecda7c0cad5791fbdf7311091587056254fde88ebe3c2f927a8fb56909fe4c3a115595854b18d3a704db73de From 417e4c9cf785a5083f3d3c2d0865d6229fa2bc8d Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Mon, 1 Aug 2022 15:35:19 -0400 Subject: [PATCH 02/28] Fix build with glibc 2.36 Signed-off-by: Cole Robinson --- ...containter-fix-build-with-glibc-2.36.patch | 34 +++++++++++++++++ 0002-virfile-Fix-build-with-glibc-2.36.patch | 37 +++++++++++++++++++ libvirt.spec | 4 ++ 3 files changed, 75 insertions(+) create mode 100644 0001-lxc-containter-fix-build-with-glibc-2.36.patch create mode 100644 0002-virfile-Fix-build-with-glibc-2.36.patch diff --git a/0001-lxc-containter-fix-build-with-glibc-2.36.patch b/0001-lxc-containter-fix-build-with-glibc-2.36.patch new file mode 100644 index 0000000..8aa1c16 --- /dev/null +++ b/0001-lxc-containter-fix-build-with-glibc-2.36.patch @@ -0,0 +1,34 @@ +From de63f9ca622e25df97ca926d7e409d074499fcf6 Mon Sep 17 00:00:00 2001 +From: Cole Robinson +Date: Mon, 1 Aug 2022 15:20:38 -0400 +Subject: [PATCH] lxc: containter: fix build with glibc 2.36 +Content-type: text/plain + +With glibc 2.36, sys/mount.h and linux/mount.h conflict: +https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +lxc_container.c imports sys/mount.h and linux/fs.h, which pulls in +linux/mount.h. + +linux/fs.h isn't required here though. glibc sys/mount.h has had +MS_MOVE since 2.12 in 2010 + +Signed-off-by: Cole Robinson +--- + src/lxc/lxc_container.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c +index b5278831da..a5401c2186 100644 +--- a/src/lxc/lxc_container.c ++++ b/src/lxc/lxc_container.c +@@ -33,9 +33,6 @@ + /* Yes, we want linux private one, for _syscall2() macro */ + #include + +-/* For MS_MOVE */ +-#include +- + #if WITH_CAPNG + # include + #endif diff --git a/0002-virfile-Fix-build-with-glibc-2.36.patch b/0002-virfile-Fix-build-with-glibc-2.36.patch new file mode 100644 index 0000000..8e11716 --- /dev/null +++ b/0002-virfile-Fix-build-with-glibc-2.36.patch @@ -0,0 +1,37 @@ +From 3b6a3cfd76832efd504bb3e868675e0f27e16c3a Mon Sep 17 00:00:00 2001 +From: Cole Robinson +Date: Mon, 1 Aug 2022 15:24:01 -0400 +Subject: [PATCH] virfile: Fix build with glibc 2.36 +Content-type: text/plain + +With glibc 2.36, sys/mount.h and linux/mount.h conflict: +https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +virfile.c imports sys/mount.h and linux/fs.h, which pulls in +linux/mount.h. + +Manually define the constants we need from linux/fs.h, like was +done in llvm: + +https://reviews.llvm.org/rGb379129c4beb3f26223288627a1291739f33af02 + +Signed-off-by: Cole Robinson +--- + src/util/virfile.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/util/virfile.c b/src/util/virfile.c +index 99da058db3..65d6d2a701 100644 +--- a/src/util/virfile.c ++++ b/src/util/virfile.c +@@ -71,7 +71,9 @@ + # endif + # include + # include +-# include ++# define FS_IOC_GETFLAGS _IOR('f', 1, long) ++# define FS_IOC_SETFLAGS _IOR('f', 2, long) ++# define FS_NOCOW_FL 0x00800000 + #endif + + #if WITH_LIBATTR diff --git a/libvirt.spec b/libvirt.spec index 8cdc669..d9a99e4 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -240,6 +240,10 @@ URL: https://libvirt.org/ %endif Source: https://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz +# Fix build with glibc 2.36 +Patch0001: 0001-lxc-containter-fix-build-with-glibc-2.36.patch +Patch0002: 0002-virfile-Fix-build-with-glibc-2.36.patch + Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} Requires: libvirt-daemon-config-nwfilter = %{version}-%{release} From 535bbcdd91585856234b3764d1662513eeb36cb7 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Thu, 4 Aug 2022 15:57:34 -0400 Subject: [PATCH 03/28] Use upstreamed 'glibc fix' commits Signed-off-by: Cole Robinson --- ...lxc-containter-fix-build-with-glibc-2.36.patch | 3 ++- 0002-virfile-Fix-build-with-glibc-2.36.patch | 15 +++++++++------ libvirt.spec | 5 ++++- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/0001-lxc-containter-fix-build-with-glibc-2.36.patch b/0001-lxc-containter-fix-build-with-glibc-2.36.patch index 8aa1c16..4e78977 100644 --- a/0001-lxc-containter-fix-build-with-glibc-2.36.patch +++ b/0001-lxc-containter-fix-build-with-glibc-2.36.patch @@ -1,4 +1,4 @@ -From de63f9ca622e25df97ca926d7e409d074499fcf6 Mon Sep 17 00:00:00 2001 +From 9493c9b79dc541ec9e0fd73c6d87bdf8d30aaa90 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Mon, 1 Aug 2022 15:20:38 -0400 Subject: [PATCH] lxc: containter: fix build with glibc 2.36 @@ -13,6 +13,7 @@ linux/mount.h. linux/fs.h isn't required here though. glibc sys/mount.h has had MS_MOVE since 2.12 in 2010 +Reviewed-by: Erik Skultety Signed-off-by: Cole Robinson --- src/lxc/lxc_container.c | 3 --- diff --git a/0002-virfile-Fix-build-with-glibc-2.36.patch b/0002-virfile-Fix-build-with-glibc-2.36.patch index 8e11716..40fcbc7 100644 --- a/0002-virfile-Fix-build-with-glibc-2.36.patch +++ b/0002-virfile-Fix-build-with-glibc-2.36.patch @@ -1,4 +1,4 @@ -From 3b6a3cfd76832efd504bb3e868675e0f27e16c3a Mon Sep 17 00:00:00 2001 +From c0d9adf220dc0d223330a7bac37b174132d330ba Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Mon, 1 Aug 2022 15:24:01 -0400 Subject: [PATCH] virfile: Fix build with glibc 2.36 @@ -15,22 +15,25 @@ done in llvm: https://reviews.llvm.org/rGb379129c4beb3f26223288627a1291739f33af02 +Reviewed-by: Erik Skultety Signed-off-by: Cole Robinson --- - src/util/virfile.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + src/util/virfile.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/virfile.c b/src/util/virfile.c -index 99da058db3..65d6d2a701 100644 +index 99da058db3..ce541b8946 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c -@@ -71,7 +71,9 @@ +@@ -71,7 +71,11 @@ # endif # include # include -# include ++/* These come from linux/fs.h, but that header conflicts with ++ * sys/mount.h on glibc 2.36+ */ +# define FS_IOC_GETFLAGS _IOR('f', 1, long) -+# define FS_IOC_SETFLAGS _IOR('f', 2, long) ++# define FS_IOC_SETFLAGS _IOW('f', 2, long) +# define FS_NOCOW_FL 0x00800000 #endif diff --git a/libvirt.spec b/libvirt.spec index d9a99e4..f4937e7 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -231,7 +231,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 8.6.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://libvirt.org/ @@ -2131,6 +2131,9 @@ exit 0 %changelog +* Thu Aug 04 2022 Cole Robinson - 8.6.0-2 +- Use upstream 'glibc fix' commits + * Mon Aug 01 2022 Cole Robinson - 8.6.0-1 - Update to version 8.6.0 From 83def04a25b6656cf20168057c40b33542df5605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 9 Aug 2022 09:18:37 -0400 Subject: [PATCH 04/28] pull in mingw sub-packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- libvirt.spec | 292 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 291 insertions(+), 1 deletion(-) diff --git a/libvirt.spec b/libvirt.spec index f4937e7..78091bf 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -197,6 +197,10 @@ %define qemu_moddir %{_libdir}/qemu %define qemu_datadir %{_datadir}/qemu +%define with_mingw 0 +%if 0%{?fedora} + %define with_mingw 0%{!?_without_mingw:1} +%endif # RHEL releases provide stable tool chains and so it is safe to turn # compiler warning into errors without being worried about frequent @@ -231,7 +235,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 8.6.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: https://libvirt.org/ @@ -397,6 +401,36 @@ BuildRequires: libtirpc-devel BuildRequires: firewalld-filesystem %endif +%if %{with_mingw} +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 +BuildRequires: mingw32-portablexdr +BuildRequires: mingw32-dlfcn +BuildRequires: mingw32-libssh2 +BuildRequires: mingw32-curl + +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 +BuildRequires: mingw64-portablexdr +BuildRequires: mingw64-dlfcn +BuildRequires: mingw64-libssh2 +BuildRequires: mingw64-curl +%endif + %description Libvirt is a C toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes). The main package includes @@ -952,6 +986,25 @@ Requires: libvirt-daemon-driver-network = %{version}-%{release} %description nss Libvirt plugin for NSS for translating domain names into IP addresses. +%if %{with_mingw} +%package -n mingw32-libvirt +Summary: %{summary} +Obsoletes: mingw32-libvirt-static < 7.0.0 +BuildArch: noarch + +%description -n mingw32-libvirt +MinGW Windows libvirt virtualization library. + +%package -n mingw64-libvirt +Summary: %{summary} +Obsoletes: mingw64-libvirt-static < 7.0.0 +BuildArch: noarch + +%description -n mingw64-libvirt +MinGW Windows libvirt virtualization library. + +%{?mingw_debug_package} +%endif %prep @@ -1195,6 +1248,84 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) %meson_build +%if %{with_mingw} +%mingw_meson \ + --auto-features=enabled \ + -Ddriver_remote=enabled \ + -Ddriver_test=enabled \ + -Ddriver_esx=enabled \ + -Dcurl=enabled \ + -Ddocs=enabled \ + -Dapparmor=disabled \ + -Dapparmor_profiles=disabled \ + -Dattr=disabled \ + -Daudit=disabled \ + -Dbash_completion=disabled \ + -Dblkid=disabled \ + -Dcapng=disabled \ + -Ddriver_bhyve=disabled \ + -Ddriver_hyperv=disabled \ + -Ddriver_interface=disabled \ + -Ddriver_libvirtd=disabled \ + -Ddriver_libxl=disabled \ + -Ddriver_lxc=disabled \ + -Ddriver_network=disabled \ + -Ddriver_openvz=disabled \ + -Ddriver_qemu=disabled \ + -Ddriver_secrets=disabled \ + -Ddriver_vbox=disabled \ + -Ddriver_vmware=disabled \ + -Ddriver_vz=disabled \ + -Ddtrace=disabled \ + -Dexpensive_tests=enabled \ + -Dfirewalld=disabled \ + -Dfirewalld_zone=disabled \ + -Dfuse=disabled \ + -Dglusterfs=disabled \ + -Dhost_validate=disabled \ + -Dlibiscsi=disabled \ + -Dlibnl=disabled \ + -Dlibpcap=disabled \ + -Dlibssh2=disabled \ + -Dlibssh=disabled \ + -Dlogin_shell=disabled \ + -Dnetcf=disabled \ + -Dnls=disabled \ + -Dnss=disabled \ + -Dnumactl=disabled \ + -Dnumad=disabled \ + -Dopenwsman=disabled \ + -Dpciaccess=disabled \ + -Dpm_utils=disabled \ + -Dpolkit=disabled \ + -Dreadline=disabled \ + -Drpath=disabled \ + -Dsanlock=disabled \ + -Dsasl=disabled \ + -Dsecdriver_apparmor=disabled \ + -Dsecdriver_selinux=disabled \ + -Dselinux=disabled \ + -Dstorage_dir=disabled \ + -Dstorage_disk=disabled \ + -Dstorage_fs=disabled \ + -Dstorage_gluster=disabled \ + -Dstorage_iscsi_direct=disabled \ + -Dstorage_iscsi=disabled \ + -Dstorage_lvm=disabled \ + -Dstorage_mpath=disabled \ + -Dstorage_rbd=disabled \ + -Dstorage_scsi=disabled \ + -Dstorage_sheepdog=disabled \ + -Dstorage_vstorage=disabled \ + -Dstorage_zfs=disabled \ + -Dsysctl_config=disabled \ + -Dtests=disabled \ + -Dudev=disabled \ + -Dwireshark_dissector=disabled \ + -Dyajl=disabled +%mingw_ninja +%endif + %install rm -fr %{buildroot} @@ -1263,6 +1394,26 @@ mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \ %endif %endif +%if %{with_mingw} +%mingw_ninja_install + +rm -rf $RPM_BUILD_ROOT%{mingw32_sysconfdir}/libvirt/nwfilter +rm -rf $RPM_BUILD_ROOT%{mingw64_sysconfdir}/libvirt/nwfilter +rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/doc/* +rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/doc/* +rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc/* +rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc/* + +rm -rf $RPM_BUILD_ROOT%{mingw32_libexecdir}/libvirt_iohelper.exe +rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt_iohelper.exe +rm -rf $RPM_BUILD_ROOT%{mingw32_libexecdir}/libvirt-guests.sh +rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh + +%mingw_debug_install_post + +%endif + + %check # Building on slow archs, like emulated s390x in Fedora copr, requires # raising the test timeout @@ -2129,8 +2280,147 @@ exit 0 %{_datadir}/libvirt/api/libvirt-qemu-api.xml %{_datadir}/libvirt/api/libvirt-lxc-api.xml +%if %{with_mingw} +%files -n mingw32-libvirt +%dir %{mingw32_sysconfdir}/libvirt/ +%config(noreplace) %{mingw32_sysconfdir}/libvirt/libvirt.conf +%config(noreplace) %{mingw32_sysconfdir}/libvirt/libvirt-admin.conf + +%{mingw32_bindir}/libvirt-0.dll +%{mingw32_bindir}/virsh.exe +%{mingw32_bindir}/virt-admin.exe +%{mingw32_bindir}/virt-xml-validate +%{mingw32_bindir}/virt-pki-query-dn.exe +%{mingw32_bindir}/virt-pki-validate +%{mingw32_bindir}/libvirt-lxc-0.dll +%{mingw32_bindir}/libvirt-qemu-0.dll +%{mingw32_bindir}/libvirt-admin-0.dll + +%{mingw32_libdir}/libvirt.dll.a +%{mingw32_libdir}/pkgconfig/libvirt.pc +%{mingw32_libdir}/pkgconfig/libvirt-qemu.pc +%{mingw32_libdir}/pkgconfig/libvirt-lxc.pc +%{mingw32_libdir}/pkgconfig/libvirt-admin.pc +%{mingw32_libdir}/libvirt-lxc.dll.a +%{mingw32_libdir}/libvirt-qemu.dll.a +%{mingw32_libdir}/libvirt-admin.dll.a + +%dir %{mingw32_datadir}/libvirt/ +%dir %{mingw32_datadir}/libvirt/schemas/ +%{mingw32_datadir}/libvirt/schemas/*.rng + +%dir %{mingw32_datadir}/libvirt/api/ +%{mingw32_datadir}/libvirt/api/libvirt-api.xml +%{mingw32_datadir}/libvirt/api/libvirt-lxc-api.xml +%{mingw32_datadir}/libvirt/api/libvirt-qemu-api.xml +%{mingw32_datadir}/libvirt/api/libvirt-admin-api.xml + +%{mingw32_datadir}/libvirt/cpu_map/*.xml + +%{mingw32_datadir}/libvirt/test-screenshot.png + +%{mingw32_datadir}/locale/*/LC_MESSAGES/libvirt.mo + +%dir %{mingw32_includedir}/libvirt +%{mingw32_includedir}/libvirt/libvirt.h +%{mingw32_includedir}/libvirt/libvirt-common.h +%{mingw32_includedir}/libvirt/libvirt-domain.h +%{mingw32_includedir}/libvirt/libvirt-domain-checkpoint.h +%{mingw32_includedir}/libvirt/libvirt-domain-snapshot.h +%{mingw32_includedir}/libvirt/libvirt-event.h +%{mingw32_includedir}/libvirt/libvirt-host.h +%{mingw32_includedir}/libvirt/libvirt-interface.h +%{mingw32_includedir}/libvirt/libvirt-network.h +%{mingw32_includedir}/libvirt/libvirt-nodedev.h +%{mingw32_includedir}/libvirt/libvirt-nwfilter.h +%{mingw32_includedir}/libvirt/libvirt-secret.h +%{mingw32_includedir}/libvirt/libvirt-storage.h +%{mingw32_includedir}/libvirt/libvirt-stream.h +%{mingw32_includedir}/libvirt/virterror.h +%{mingw32_includedir}/libvirt/libvirt-lxc.h +%{mingw32_includedir}/libvirt/libvirt-qemu.h +%{mingw32_includedir}/libvirt/libvirt-admin.h + +%{mingw32_mandir}/man1/virsh.1* +%{mingw32_mandir}/man1/virt-admin.1* +%{mingw32_mandir}/man1/virt-xml-validate.1* +%{mingw32_mandir}/man1/virt-pki-query-dn.1* +%{mingw32_mandir}/man1/virt-pki-validate.1* +%{mingw32_mandir}/man7/virkey*.7* + + +%files -n mingw64-libvirt +%dir %{mingw64_sysconfdir}/libvirt/ +%config(noreplace) %{mingw64_sysconfdir}/libvirt/libvirt.conf +%config(noreplace) %{mingw64_sysconfdir}/libvirt/libvirt-admin.conf + +%{mingw64_bindir}/libvirt-0.dll +%{mingw64_bindir}/virsh.exe +%{mingw64_bindir}/virt-admin.exe +%{mingw64_bindir}/virt-xml-validate +%{mingw64_bindir}/virt-pki-query-dn.exe +%{mingw64_bindir}/virt-pki-validate +%{mingw64_bindir}/libvirt-lxc-0.dll +%{mingw64_bindir}/libvirt-qemu-0.dll +%{mingw64_bindir}/libvirt-admin-0.dll + +%{mingw64_libdir}/libvirt.dll.a +%{mingw64_libdir}/pkgconfig/libvirt.pc +%{mingw64_libdir}/pkgconfig/libvirt-qemu.pc +%{mingw64_libdir}/pkgconfig/libvirt-lxc.pc +%{mingw64_libdir}/pkgconfig/libvirt-admin.pc +%{mingw64_libdir}/libvirt-lxc.dll.a +%{mingw64_libdir}/libvirt-qemu.dll.a +%{mingw64_libdir}/libvirt-admin.dll.a + +%dir %{mingw64_datadir}/libvirt/ +%dir %{mingw64_datadir}/libvirt/schemas/ +%{mingw64_datadir}/libvirt/schemas/*.rng + +%dir %{mingw64_datadir}/libvirt/api/ +%{mingw64_datadir}/libvirt/api/libvirt-api.xml +%{mingw64_datadir}/libvirt/api/libvirt-lxc-api.xml +%{mingw64_datadir}/libvirt/api/libvirt-qemu-api.xml +%{mingw64_datadir}/libvirt/api/libvirt-admin-api.xml + +%{mingw64_datadir}/libvirt/cpu_map/*.xml + +%{mingw64_datadir}/libvirt/test-screenshot.png + +%{mingw64_datadir}/locale/*/LC_MESSAGES/libvirt.mo + +%dir %{mingw64_includedir}/libvirt +%{mingw64_includedir}/libvirt/libvirt.h +%{mingw64_includedir}/libvirt/libvirt-common.h +%{mingw64_includedir}/libvirt/libvirt-domain.h +%{mingw64_includedir}/libvirt/libvirt-domain-checkpoint.h +%{mingw64_includedir}/libvirt/libvirt-domain-snapshot.h +%{mingw64_includedir}/libvirt/libvirt-event.h +%{mingw64_includedir}/libvirt/libvirt-host.h +%{mingw64_includedir}/libvirt/libvirt-interface.h +%{mingw64_includedir}/libvirt/libvirt-network.h +%{mingw64_includedir}/libvirt/libvirt-nodedev.h +%{mingw64_includedir}/libvirt/libvirt-nwfilter.h +%{mingw64_includedir}/libvirt/libvirt-secret.h +%{mingw64_includedir}/libvirt/libvirt-storage.h +%{mingw64_includedir}/libvirt/libvirt-stream.h +%{mingw64_includedir}/libvirt/virterror.h +%{mingw64_includedir}/libvirt/libvirt-lxc.h +%{mingw64_includedir}/libvirt/libvirt-qemu.h +%{mingw64_includedir}/libvirt/libvirt-admin.h + +%{mingw64_mandir}/man1/virsh.1* +%{mingw64_mandir}/man1/virt-admin.1* +%{mingw64_mandir}/man1/virt-xml-validate.1* +%{mingw64_mandir}/man1/virt-pki-query-dn.1* +%{mingw64_mandir}/man1/virt-pki-validate.1* +%{mingw64_mandir}/man7/virkey*.7* +%endif %changelog +* Tue Aug 9 2022 Daniel P. Berrangé - 8.1.0-3 +- Pull in mingw sub-packages + * Thu Aug 04 2022 Cole Robinson - 8.6.0-2 - Use upstream 'glibc fix' commits From 66060fa39545462accddb03fa34463d480278ad5 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 6 Sep 2022 10:25:54 -0400 Subject: [PATCH 05/28] libvirt-8.7.0-1 Update to version 8.7.0 --- ...containter-fix-build-with-glibc-2.36.patch | 35 ---------------- 0002-virfile-Fix-build-with-glibc-2.36.patch | 40 ------------------- libvirt.spec | 30 ++++++-------- sources | 2 +- 4 files changed, 13 insertions(+), 94 deletions(-) delete mode 100644 0001-lxc-containter-fix-build-with-glibc-2.36.patch delete mode 100644 0002-virfile-Fix-build-with-glibc-2.36.patch diff --git a/0001-lxc-containter-fix-build-with-glibc-2.36.patch b/0001-lxc-containter-fix-build-with-glibc-2.36.patch deleted file mode 100644 index 4e78977..0000000 --- a/0001-lxc-containter-fix-build-with-glibc-2.36.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9493c9b79dc541ec9e0fd73c6d87bdf8d30aaa90 Mon Sep 17 00:00:00 2001 -From: Cole Robinson -Date: Mon, 1 Aug 2022 15:20:38 -0400 -Subject: [PATCH] lxc: containter: fix build with glibc 2.36 -Content-type: text/plain - -With glibc 2.36, sys/mount.h and linux/mount.h conflict: -https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E - -lxc_container.c imports sys/mount.h and linux/fs.h, which pulls in -linux/mount.h. - -linux/fs.h isn't required here though. glibc sys/mount.h has had -MS_MOVE since 2.12 in 2010 - -Reviewed-by: Erik Skultety -Signed-off-by: Cole Robinson ---- - src/lxc/lxc_container.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c -index b5278831da..a5401c2186 100644 ---- a/src/lxc/lxc_container.c -+++ b/src/lxc/lxc_container.c -@@ -33,9 +33,6 @@ - /* Yes, we want linux private one, for _syscall2() macro */ - #include - --/* For MS_MOVE */ --#include -- - #if WITH_CAPNG - # include - #endif diff --git a/0002-virfile-Fix-build-with-glibc-2.36.patch b/0002-virfile-Fix-build-with-glibc-2.36.patch deleted file mode 100644 index 40fcbc7..0000000 --- a/0002-virfile-Fix-build-with-glibc-2.36.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c0d9adf220dc0d223330a7bac37b174132d330ba Mon Sep 17 00:00:00 2001 -From: Cole Robinson -Date: Mon, 1 Aug 2022 15:24:01 -0400 -Subject: [PATCH] virfile: Fix build with glibc 2.36 -Content-type: text/plain - -With glibc 2.36, sys/mount.h and linux/mount.h conflict: -https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E - -virfile.c imports sys/mount.h and linux/fs.h, which pulls in -linux/mount.h. - -Manually define the constants we need from linux/fs.h, like was -done in llvm: - -https://reviews.llvm.org/rGb379129c4beb3f26223288627a1291739f33af02 - -Reviewed-by: Erik Skultety -Signed-off-by: Cole Robinson ---- - src/util/virfile.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/util/virfile.c b/src/util/virfile.c -index 99da058db3..ce541b8946 100644 ---- a/src/util/virfile.c -+++ b/src/util/virfile.c -@@ -71,7 +71,11 @@ - # endif - # include - # include --# include -+/* These come from linux/fs.h, but that header conflicts with -+ * sys/mount.h on glibc 2.36+ */ -+# define FS_IOC_GETFLAGS _IOR('f', 1, long) -+# define FS_IOC_SETFLAGS _IOW('f', 2, long) -+# define FS_NOCOW_FL 0x00800000 - #endif - - #if WITH_LIBATTR diff --git a/libvirt.spec b/libvirt.spec index 78091bf..32e1630 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -234,8 +234,8 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 8.6.0 -Release: 3%{?dist} +Version: 8.7.0 +Release: 1%{?dist} License: LGPLv2+ URL: https://libvirt.org/ @@ -244,10 +244,6 @@ URL: https://libvirt.org/ %endif Source: https://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz -# Fix build with glibc 2.36 -Patch0001: 0001-lxc-containter-fix-build-with-glibc-2.36.patch -Patch0002: 0002-virfile-Fix-build-with-glibc-2.36.patch - Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} Requires: libvirt-daemon-config-nwfilter = %{version}-%{release} @@ -1520,18 +1516,12 @@ then # own the sockets again when it comes back up. Thus we must # do this particular ordering, so that we get libvirtd # running with socket activation in use - /bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1 - if test $? = 0 - then - /bin/systemctl stop libvirtd.service >/dev/null 2>&1 || : - - /bin/systemctl try-restart \ - libvirtd.socket \ - libvirtd-ro.socket \ - libvirtd-admin.socket >/dev/null 2>&1 || : - - /bin/systemctl start libvirtd.service >/dev/null 2>&1 || : - fi + /bin/systemctl stop libvirtd.service >/dev/null 2>&1 || : + /bin/systemctl try-restart \ + libvirtd.socket \ + libvirtd-ro.socket \ + libvirtd-admin.socket >/dev/null 2>&1 || : + /bin/systemctl start libvirtd.service >/dev/null 2>&1 || : fi fi @@ -2417,7 +2407,11 @@ exit 0 %{mingw64_mandir}/man7/virkey*.7* %endif + %changelog +* Tue Sep 06 2022 Cole Robinson - 8.7.0-1 +- Update to version 8.7.0 + * Tue Aug 9 2022 Daniel P. Berrangé - 8.1.0-3 - Pull in mingw sub-packages diff --git a/sources b/sources index 7f7abe5..ed5e703 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-8.6.0.tar.xz) = 6198ac33ea718045bfd12a2740d5a7fa70c754b1ecda7c0cad5791fbdf7311091587056254fde88ebe3c2f927a8fb56909fe4c3a115595854b18d3a704db73de +SHA512 (libvirt-8.7.0.tar.xz) = 35d33d0e0dab525e8f0a8a592d286e9d17fc5c5d1ff2fab5af5c40b85248481dd17b5c3daf64e8c6e1b8a93328eebee6ece3e95edacff208a81d8b78dc102d7a From 662f0e2ba441ed37c2cde169a1f37ef3dbf2cdbf Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Aug 2022 15:56:50 +0800 Subject: [PATCH 06/28] change gettext requires to gettext-runtime for F37 (#2117209) See https://fedoraproject.org/wiki/Changes/GettextRuntimeSubpackage --- libvirt.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libvirt.spec b/libvirt.spec index 32e1630..eb5d5c8 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -235,7 +235,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 8.7.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://libvirt.org/ @@ -478,7 +478,11 @@ Requires: dbus # For uid creation during pre Requires(pre): shadow-utils # Needed by /usr/libexec/libvirt-guests.sh script. +%if 0%{?fedora} >= 37 +Requires: gettext-runtime +%else Requires: gettext +%endif # Ensure smooth upgrades Obsoletes: libvirt-admin < 7.3.0 @@ -2409,6 +2413,9 @@ exit 0 %changelog +* Fri Sep 9 2022 Jens Petersen - 8.7.0-2 +- F37 libvirt-daemon: depend on gettext-runtime instead of gettext (#2117209) + * Tue Sep 06 2022 Cole Robinson - 8.7.0-1 - Update to version 8.7.0 From 5e0d67787a634087375cac00bd48bafb120be078 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 4 Oct 2022 10:22:03 -0400 Subject: [PATCH 07/28] libvirt-8.8.0-1 Update to version 8.8.0 Signed-off-by: Cole Robinson --- libvirt.spec | 50 +++++++++----------------------------------------- 1 file changed, 9 insertions(+), 41 deletions(-) diff --git a/libvirt.spec b/libvirt.spec index eb5d5c8..e9d4eb6 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -61,11 +61,6 @@ # Then the secondary host drivers, which run inside libvirtd %define with_storage_rbd 0%{!?_without_storage_rbd:1} -%if 0%{?fedora} - %define with_storage_sheepdog 0%{!?_without_storage_sheepdog:1} -%else - %define with_storage_sheepdog 0 -%endif %define with_storage_gluster 0%{!?_without_storage_gluster:1} %if 0%{?rhel} @@ -234,8 +229,8 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 8.7.0 -Release: 2%{?dist} +Version: 8.8.0 +Release: 1%{?dist} License: LGPLv2+ URL: https://libvirt.org/ @@ -339,9 +334,6 @@ BuildRequires: librbd-devel BuildRequires: glusterfs-api-devel >= 3.4.1 BuildRequires: glusterfs-devel >= 3.4.1 %endif -%if %{with_storage_sheepdog} -BuildRequires: sheepdog -%endif %if %{with_numactl} # For QEMU/LXC numa info BuildRequires: numactl-devel @@ -386,7 +378,7 @@ BuildRequires: wireshark-devel %endif %if %{with_libssh} -BuildRequires: libssh-devel >= 0.7.0 +BuildRequires: libssh-devel >= 0.8.1 %endif BuildRequires: rpcgen @@ -484,6 +476,7 @@ Requires: gettext-runtime Requires: gettext %endif + # Ensure smooth upgrades Obsoletes: libvirt-admin < 7.3.0 Provides: libvirt-admin = %{version}-%{release} @@ -586,8 +579,9 @@ Requires: util-linux Requires: /usr/bin/qemu-img %endif %if !%{with_storage_rbd} -Obsoletes: libvirt-daemon-driver-storage-rbd < %{version}-%{release} +Obsoletes: libvirt-daemon-driver-storage-rbd < 5.2.0 %endif +Obsoletes: libvirt-daemon-driver-storage-sheepdog < 8.8.0 %description daemon-driver-storage-core The storage driver plugin for the libvirtd daemon, providing @@ -691,19 +685,6 @@ volumes using the ceph protocol. %endif -%if %{with_storage_sheepdog} -%package daemon-driver-storage-sheepdog -Summary: Storage driver plugin for sheepdog -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} -Requires: sheepdog - -%description daemon-driver-storage-sheepdog -The storage driver backend adding implementation of the storage APIs for -sheepdog volumes using. -%endif - - %if %{with_storage_zfs} %package daemon-driver-storage-zfs Summary: Storage driver plugin for ZFS @@ -736,9 +717,6 @@ Requires: libvirt-daemon-driver-storage-gluster = %{version}-%{release} %if %{with_storage_rbd} Requires: libvirt-daemon-driver-storage-rbd = %{version}-%{release} %endif -%if %{with_storage_sheepdog} -Requires: libvirt-daemon-driver-storage-sheepdog = %{version}-%{release} -%endif %if %{with_storage_zfs} Requires: libvirt-daemon-driver-storage-zfs = %{version}-%{release} %endif @@ -1078,12 +1056,6 @@ exit 1 %define arg_storage_rbd -Dstorage_rbd=disabled %endif -%if %{with_storage_sheepdog} - %define arg_storage_sheepdog -Dstorage_sheepdog=enabled -%else - %define arg_storage_sheepdog -Dstorage_sheepdog=disabled -%endif - %if %{with_storage_gluster} %define arg_storage_gluster -Dstorage_gluster=enabled -Dglusterfs=enabled %else @@ -1203,7 +1175,6 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) -Dstorage_disk=enabled \ -Dstorage_mpath=enabled \ %{?arg_storage_rbd} \ - %{?arg_storage_sheepdog} \ %{?arg_storage_gluster} \ %{?arg_storage_zfs} \ -Dstorage_vstorage=disabled \ @@ -1315,7 +1286,6 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) -Dstorage_mpath=disabled \ -Dstorage_rbd=disabled \ -Dstorage_scsi=disabled \ - -Dstorage_sheepdog=disabled \ -Dstorage_vstorage=disabled \ -Dstorage_zfs=disabled \ -Dsysctl_config=disabled \ @@ -2031,11 +2001,6 @@ exit 0 %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_rbd.so %endif -%if %{with_storage_sheepdog} -%files daemon-driver-storage-sheepdog -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_sheepdog.so -%endif - %if %{with_storage_zfs} %files daemon-driver-storage-zfs %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_zfs.so @@ -2413,6 +2378,9 @@ exit 0 %changelog +* Tue Oct 04 2022 Cole Robinson - 8.8.0-1 +- Update to version 8.8.0 + * Fri Sep 9 2022 Jens Petersen - 8.7.0-2 - F37 libvirt-daemon: depend on gettext-runtime instead of gettext (#2117209) From dc9be9b9a738438d6531f0084e5da48c5769a57c Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 4 Oct 2022 10:27:49 -0400 Subject: [PATCH 08/28] Add missing sources Signed-off-by: Cole Robinson --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index ed5e703..1a8f446 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-8.7.0.tar.xz) = 35d33d0e0dab525e8f0a8a592d286e9d17fc5c5d1ff2fab5af5c40b85248481dd17b5c3daf64e8c6e1b8a93328eebee6ece3e95edacff208a81d8b78dc102d7a +SHA512 (libvirt-8.8.0.tar.xz) = 868e49b369afe200c5af6e2cd0606de2eeebfa92523b5ad3c653203c8838d304bd0cdc5acfb3c4d4c33c0a87ab8e769b84cc62e3f06e055936c43573a23d7190 From 6c3d79e65d9680566ba87b24cc43a9a252f2fa21 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Mon, 24 Oct 2022 11:02:56 -0400 Subject: [PATCH 09/28] libvirt-8.8.0-2 Rebuild for wireshark soname bump --- libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt.spec b/libvirt.spec index e9d4eb6..19a6ac9 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -230,7 +230,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 8.8.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://libvirt.org/ @@ -2378,6 +2378,9 @@ exit 0 %changelog +* Mon Oct 24 2022 Cole Robinson - 8.8.0-2 +- Rebuild for wireshark soname bump + * Tue Oct 04 2022 Cole Robinson - 8.8.0-1 - Update to version 8.8.0 From f1888958a663df387fa7f3086047fbb17eb5c3e6 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Thu, 27 Oct 2022 10:13:49 -0400 Subject: [PATCH 10/28] Fix tests on aarch64 Signed-off-by: Cole Robinson --- ...bxlxml2domconfigtest-with-latest-xen.patch | 239 ++++++++++++++++++ libvirt.spec | 1 + 2 files changed, 240 insertions(+) create mode 100644 0001-tests-Fix-libxlxml2domconfigtest-with-latest-xen.patch diff --git a/0001-tests-Fix-libxlxml2domconfigtest-with-latest-xen.patch b/0001-tests-Fix-libxlxml2domconfigtest-with-latest-xen.patch new file mode 100644 index 0000000..c6d1836 --- /dev/null +++ b/0001-tests-Fix-libxlxml2domconfigtest-with-latest-xen.patch @@ -0,0 +1,239 @@ +From 99b40587e8cd83a136d94e208d32a80be76dc22a Mon Sep 17 00:00:00 2001 +Message-Id: <99b40587e8cd83a136d94e208d32a80be76dc22a.1666875466.git.crobinso@redhat.com> +From: Cole Robinson +Date: Thu, 27 Oct 2022 08:51:25 -0400 +Subject: [PATCH] tests: Fix libxlxml2domconfigtest with latest xen +Content-type: text/plain + +shadow_memkb is populated from a libxl API call, and the value can +change. For example: +https://xenbits.xen.org/gitweb/?p=xen.git;a=commit;h=2c992810854a15b41be920519ce83a4a328d5168 + +Mock libxl_get_required_shadow_memory to give consistent output + +Signed-off-by: Cole Robinson +--- + tests/libxlmock.c | 11 +++++++++++ + tests/libxlxml2domconfigdata/basic-hvm.json | 2 +- + tests/libxlxml2domconfigdata/basic-pv.json | 2 +- + tests/libxlxml2domconfigdata/basic-pvh.json | 2 +- + tests/libxlxml2domconfigdata/cpu-shares-hvm.json | 2 +- + tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json | 2 +- + .../fullvirt-cpuid-legacy-nest.json | 2 +- + tests/libxlxml2domconfigdata/fullvirt-cpuid.json | 2 +- + .../libxlxml2domconfigdata/max-eventchannels-hvm.json | 2 +- + tests/libxlxml2domconfigdata/max-gntframes-hvm.json | 2 +- + tests/libxlxml2domconfigdata/moredevs-hvm.json | 2 +- + tests/libxlxml2domconfigdata/multiple-ip.json | 2 +- + tests/libxlxml2domconfigdata/variable-clock-hvm.json | 2 +- + .../libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json | 2 +- + tests/libxlxml2domconfigdata/vnuma-hvm.json | 2 +- + 15 files changed, 25 insertions(+), 14 deletions(-) + +diff --git a/tests/libxlmock.c b/tests/libxlmock.c +index 0e4bf7df52..4754597e5b 100644 +--- a/tests/libxlmock.c ++++ b/tests/libxlmock.c +@@ -109,6 +109,17 @@ VIR_MOCK_STUB_RET_ARGS(bind, + const struct sockaddr *, addr, + socklen_t, addrlen) + ++VIR_MOCK_IMPL_RET_ARGS(libxl_get_required_shadow_memory, ++ unsigned long, ++ unsigned long, maxmem_kb, ++ unsigned int, smp_cpus) ++{ ++ /* silence gcc warning about unused function */ ++ if (0) ++ real_libxl_get_required_shadow_memory(maxmem_kb, smp_cpus); ++ return 1234; ++} ++ + VIR_MOCK_IMPL_RET_ARGS(__xstat, int, + int, ver, + const char *, path, +diff --git a/tests/libxlxml2domconfigdata/basic-hvm.json b/tests/libxlxml2domconfigdata/basic-hvm.json +index 87f8cb7d8a..d30875420d 100644 +--- a/tests/libxlxml2domconfigdata/basic-hvm.json ++++ b/tests/libxlxml2domconfigdata/basic-hvm.json +@@ -15,7 +15,7 @@ + "max_memkb": 1048576, + "target_memkb": 1048576, + "video_memkb": 8192, +- "shadow_memkb": 12288, ++ "shadow_memkb": 1234, + "device_model_version": "qemu_xen", + "device_model": "/bin/true", + "sched_params": { +diff --git a/tests/libxlxml2domconfigdata/basic-pv.json b/tests/libxlxml2domconfigdata/basic-pv.json +index b71c3b0f49..32d188fabd 100644 +--- a/tests/libxlxml2domconfigdata/basic-pv.json ++++ b/tests/libxlxml2domconfigdata/basic-pv.json +@@ -14,7 +14,7 @@ + ], + "max_memkb": 524288, + "target_memkb": 524288, +- "shadow_memkb": 8192, ++ "shadow_memkb": 1234, + "sched_params": { + + }, +diff --git a/tests/libxlxml2domconfigdata/basic-pvh.json b/tests/libxlxml2domconfigdata/basic-pvh.json +index 48365c9026..f51957aa85 100644 +--- a/tests/libxlxml2domconfigdata/basic-pvh.json ++++ b/tests/libxlxml2domconfigdata/basic-pvh.json +@@ -14,7 +14,7 @@ + ], + "max_memkb": 524288, + "target_memkb": 524288, +- "shadow_memkb": 8192, ++ "shadow_memkb": 1234, + "sched_params": { + + }, +diff --git a/tests/libxlxml2domconfigdata/cpu-shares-hvm.json b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json +index 2aa97e88c5..15105c83ad 100644 +--- a/tests/libxlxml2domconfigdata/cpu-shares-hvm.json ++++ b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json +@@ -15,7 +15,7 @@ + "max_memkb": 1048576, + "target_memkb": 1048576, + "video_memkb": 8192, +- "shadow_memkb": 12288, ++ "shadow_memkb": 1234, + "device_model_version": "qemu_xen", + "device_model": "/bin/true", + "sched_params": { +diff --git a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json +index a2d46797aa..26f5abefee 100644 +--- a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json ++++ b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json +@@ -11,7 +11,7 @@ + ], + "max_memkb": 592896, + "target_memkb": 403456, +- "shadow_memkb": 5656, ++ "shadow_memkb": 1234, + "sched_params": { + }, + "apic": "True", +diff --git a/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json b/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json +index 6290655c20..740b82d2e6 100644 +--- a/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json ++++ b/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json +@@ -11,7 +11,7 @@ + ], + "max_memkb": 592896, + "target_memkb": 403456, +- "shadow_memkb": 5656, ++ "shadow_memkb": 1234, + "cpuid": [ + { + "leaf": 1, +diff --git a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json +index 811a4f0ac7..8bf41894a5 100644 +--- a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json ++++ b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json +@@ -11,7 +11,7 @@ + ], + "max_memkb": 592896, + "target_memkb": 403456, +- "shadow_memkb": 5656, ++ "shadow_memkb": 1234, + "cpuid": [ + { + "leaf": 1, +diff --git a/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json b/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json +index 4a5b0ca65f..6f0daa065f 100644 +--- a/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json ++++ b/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json +@@ -15,7 +15,7 @@ + "max_memkb": 1048576, + "target_memkb": 1048576, + "video_memkb": 8192, +- "shadow_memkb": 12288, ++ "shadow_memkb": 1234, + "event_channels": 2047, + "device_model_version": "qemu_xen", + "device_model": "/bin/true", +diff --git a/tests/libxlxml2domconfigdata/max-gntframes-hvm.json b/tests/libxlxml2domconfigdata/max-gntframes-hvm.json +index 2883d057ff..35de588abc 100644 +--- a/tests/libxlxml2domconfigdata/max-gntframes-hvm.json ++++ b/tests/libxlxml2domconfigdata/max-gntframes-hvm.json +@@ -15,7 +15,7 @@ + "max_memkb": 1048576, + "target_memkb": 1048576, + "video_memkb": 8192, +- "shadow_memkb": 12288, ++ "shadow_memkb": 1234, + "max_grant_frames": 64, + "device_model_version": "qemu_xen", + "device_model": "/bin/true", +diff --git a/tests/libxlxml2domconfigdata/moredevs-hvm.json b/tests/libxlxml2domconfigdata/moredevs-hvm.json +index 58cf32a8d4..bdc9afc29b 100644 +--- a/tests/libxlxml2domconfigdata/moredevs-hvm.json ++++ b/tests/libxlxml2domconfigdata/moredevs-hvm.json +@@ -17,7 +17,7 @@ + "max_memkb": 1048576, + "target_memkb": 1048576, + "video_memkb": 8192, +- "shadow_memkb": 12288, ++ "shadow_memkb": 1234, + "device_model_version": "qemu_xen", + "device_model": "/bin/true", + "sched_params": { +diff --git a/tests/libxlxml2domconfigdata/multiple-ip.json b/tests/libxlxml2domconfigdata/multiple-ip.json +index 2db98b82f6..e0b37aa795 100644 +--- a/tests/libxlxml2domconfigdata/multiple-ip.json ++++ b/tests/libxlxml2domconfigdata/multiple-ip.json +@@ -14,7 +14,7 @@ + ], + "max_memkb": 524288, + "target_memkb": 524288, +- "shadow_memkb": 8192, ++ "shadow_memkb": 1234, + "sched_params": { + + }, +diff --git a/tests/libxlxml2domconfigdata/variable-clock-hvm.json b/tests/libxlxml2domconfigdata/variable-clock-hvm.json +index 9a25d51da2..3c131c603c 100644 +--- a/tests/libxlxml2domconfigdata/variable-clock-hvm.json ++++ b/tests/libxlxml2domconfigdata/variable-clock-hvm.json +@@ -15,7 +15,7 @@ + "max_memkb": 1048576, + "target_memkb": 1048576, + "video_memkb": 8192, +- "shadow_memkb": 12288, ++ "shadow_memkb": 1234, + "rtc_timeoffset": 3600, + "localtime": "True", + "device_model_version": "qemu_xen", +diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json b/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json +index 6cda8d0252..6725df9112 100644 +--- a/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json ++++ b/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json +@@ -103,7 +103,7 @@ + "max_memkb": 1048576, + "target_memkb": 1048576, + "video_memkb": 8192, +- "shadow_memkb": 14336, ++ "shadow_memkb": 1234, + "device_model_version": "qemu_xen", + "device_model": "/bin/true", + "sched_params": { +diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm.json b/tests/libxlxml2domconfigdata/vnuma-hvm.json +index f578ccd3d3..2556c82d5f 100644 +--- a/tests/libxlxml2domconfigdata/vnuma-hvm.json ++++ b/tests/libxlxml2domconfigdata/vnuma-hvm.json +@@ -103,7 +103,7 @@ + "max_memkb": 1048576, + "target_memkb": 1048576, + "video_memkb": 8192, +- "shadow_memkb": 14336, ++ "shadow_memkb": 1234, + "device_model_version": "qemu_xen", + "device_model": "/bin/true", + "sched_params": { +-- +2.37.3 + diff --git a/libvirt.spec b/libvirt.spec index 19a6ac9..b43f9a9 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -238,6 +238,7 @@ URL: https://libvirt.org/ %define mainturl stable_updates/ %endif Source: https://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz +Patch: 0001-tests-Fix-libxlxml2domconfigtest-with-latest-xen.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} From 58043b20fb18b81251a85f592b1dd8c5206e3b59 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Thu, 3 Nov 2022 05:21:34 -0400 Subject: [PATCH 11/28] libvirt-8.9.0-1 Update to version 8.9.0 --- ...bxlxml2domconfigtest-with-latest-xen.patch | 239 ------------------ libvirt.spec | 27 +- sources | 2 +- 3 files changed, 23 insertions(+), 245 deletions(-) delete mode 100644 0001-tests-Fix-libxlxml2domconfigtest-with-latest-xen.patch diff --git a/0001-tests-Fix-libxlxml2domconfigtest-with-latest-xen.patch b/0001-tests-Fix-libxlxml2domconfigtest-with-latest-xen.patch deleted file mode 100644 index c6d1836..0000000 --- a/0001-tests-Fix-libxlxml2domconfigtest-with-latest-xen.patch +++ /dev/null @@ -1,239 +0,0 @@ -From 99b40587e8cd83a136d94e208d32a80be76dc22a Mon Sep 17 00:00:00 2001 -Message-Id: <99b40587e8cd83a136d94e208d32a80be76dc22a.1666875466.git.crobinso@redhat.com> -From: Cole Robinson -Date: Thu, 27 Oct 2022 08:51:25 -0400 -Subject: [PATCH] tests: Fix libxlxml2domconfigtest with latest xen -Content-type: text/plain - -shadow_memkb is populated from a libxl API call, and the value can -change. For example: -https://xenbits.xen.org/gitweb/?p=xen.git;a=commit;h=2c992810854a15b41be920519ce83a4a328d5168 - -Mock libxl_get_required_shadow_memory to give consistent output - -Signed-off-by: Cole Robinson ---- - tests/libxlmock.c | 11 +++++++++++ - tests/libxlxml2domconfigdata/basic-hvm.json | 2 +- - tests/libxlxml2domconfigdata/basic-pv.json | 2 +- - tests/libxlxml2domconfigdata/basic-pvh.json | 2 +- - tests/libxlxml2domconfigdata/cpu-shares-hvm.json | 2 +- - tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json | 2 +- - .../fullvirt-cpuid-legacy-nest.json | 2 +- - tests/libxlxml2domconfigdata/fullvirt-cpuid.json | 2 +- - .../libxlxml2domconfigdata/max-eventchannels-hvm.json | 2 +- - tests/libxlxml2domconfigdata/max-gntframes-hvm.json | 2 +- - tests/libxlxml2domconfigdata/moredevs-hvm.json | 2 +- - tests/libxlxml2domconfigdata/multiple-ip.json | 2 +- - tests/libxlxml2domconfigdata/variable-clock-hvm.json | 2 +- - .../libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json | 2 +- - tests/libxlxml2domconfigdata/vnuma-hvm.json | 2 +- - 15 files changed, 25 insertions(+), 14 deletions(-) - -diff --git a/tests/libxlmock.c b/tests/libxlmock.c -index 0e4bf7df52..4754597e5b 100644 ---- a/tests/libxlmock.c -+++ b/tests/libxlmock.c -@@ -109,6 +109,17 @@ VIR_MOCK_STUB_RET_ARGS(bind, - const struct sockaddr *, addr, - socklen_t, addrlen) - -+VIR_MOCK_IMPL_RET_ARGS(libxl_get_required_shadow_memory, -+ unsigned long, -+ unsigned long, maxmem_kb, -+ unsigned int, smp_cpus) -+{ -+ /* silence gcc warning about unused function */ -+ if (0) -+ real_libxl_get_required_shadow_memory(maxmem_kb, smp_cpus); -+ return 1234; -+} -+ - VIR_MOCK_IMPL_RET_ARGS(__xstat, int, - int, ver, - const char *, path, -diff --git a/tests/libxlxml2domconfigdata/basic-hvm.json b/tests/libxlxml2domconfigdata/basic-hvm.json -index 87f8cb7d8a..d30875420d 100644 ---- a/tests/libxlxml2domconfigdata/basic-hvm.json -+++ b/tests/libxlxml2domconfigdata/basic-hvm.json -@@ -15,7 +15,7 @@ - "max_memkb": 1048576, - "target_memkb": 1048576, - "video_memkb": 8192, -- "shadow_memkb": 12288, -+ "shadow_memkb": 1234, - "device_model_version": "qemu_xen", - "device_model": "/bin/true", - "sched_params": { -diff --git a/tests/libxlxml2domconfigdata/basic-pv.json b/tests/libxlxml2domconfigdata/basic-pv.json -index b71c3b0f49..32d188fabd 100644 ---- a/tests/libxlxml2domconfigdata/basic-pv.json -+++ b/tests/libxlxml2domconfigdata/basic-pv.json -@@ -14,7 +14,7 @@ - ], - "max_memkb": 524288, - "target_memkb": 524288, -- "shadow_memkb": 8192, -+ "shadow_memkb": 1234, - "sched_params": { - - }, -diff --git a/tests/libxlxml2domconfigdata/basic-pvh.json b/tests/libxlxml2domconfigdata/basic-pvh.json -index 48365c9026..f51957aa85 100644 ---- a/tests/libxlxml2domconfigdata/basic-pvh.json -+++ b/tests/libxlxml2domconfigdata/basic-pvh.json -@@ -14,7 +14,7 @@ - ], - "max_memkb": 524288, - "target_memkb": 524288, -- "shadow_memkb": 8192, -+ "shadow_memkb": 1234, - "sched_params": { - - }, -diff --git a/tests/libxlxml2domconfigdata/cpu-shares-hvm.json b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json -index 2aa97e88c5..15105c83ad 100644 ---- a/tests/libxlxml2domconfigdata/cpu-shares-hvm.json -+++ b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json -@@ -15,7 +15,7 @@ - "max_memkb": 1048576, - "target_memkb": 1048576, - "video_memkb": 8192, -- "shadow_memkb": 12288, -+ "shadow_memkb": 1234, - "device_model_version": "qemu_xen", - "device_model": "/bin/true", - "sched_params": { -diff --git a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json -index a2d46797aa..26f5abefee 100644 ---- a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json -+++ b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json -@@ -11,7 +11,7 @@ - ], - "max_memkb": 592896, - "target_memkb": 403456, -- "shadow_memkb": 5656, -+ "shadow_memkb": 1234, - "sched_params": { - }, - "apic": "True", -diff --git a/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json b/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json -index 6290655c20..740b82d2e6 100644 ---- a/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json -+++ b/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json -@@ -11,7 +11,7 @@ - ], - "max_memkb": 592896, - "target_memkb": 403456, -- "shadow_memkb": 5656, -+ "shadow_memkb": 1234, - "cpuid": [ - { - "leaf": 1, -diff --git a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json -index 811a4f0ac7..8bf41894a5 100644 ---- a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json -+++ b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json -@@ -11,7 +11,7 @@ - ], - "max_memkb": 592896, - "target_memkb": 403456, -- "shadow_memkb": 5656, -+ "shadow_memkb": 1234, - "cpuid": [ - { - "leaf": 1, -diff --git a/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json b/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json -index 4a5b0ca65f..6f0daa065f 100644 ---- a/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json -+++ b/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json -@@ -15,7 +15,7 @@ - "max_memkb": 1048576, - "target_memkb": 1048576, - "video_memkb": 8192, -- "shadow_memkb": 12288, -+ "shadow_memkb": 1234, - "event_channels": 2047, - "device_model_version": "qemu_xen", - "device_model": "/bin/true", -diff --git a/tests/libxlxml2domconfigdata/max-gntframes-hvm.json b/tests/libxlxml2domconfigdata/max-gntframes-hvm.json -index 2883d057ff..35de588abc 100644 ---- a/tests/libxlxml2domconfigdata/max-gntframes-hvm.json -+++ b/tests/libxlxml2domconfigdata/max-gntframes-hvm.json -@@ -15,7 +15,7 @@ - "max_memkb": 1048576, - "target_memkb": 1048576, - "video_memkb": 8192, -- "shadow_memkb": 12288, -+ "shadow_memkb": 1234, - "max_grant_frames": 64, - "device_model_version": "qemu_xen", - "device_model": "/bin/true", -diff --git a/tests/libxlxml2domconfigdata/moredevs-hvm.json b/tests/libxlxml2domconfigdata/moredevs-hvm.json -index 58cf32a8d4..bdc9afc29b 100644 ---- a/tests/libxlxml2domconfigdata/moredevs-hvm.json -+++ b/tests/libxlxml2domconfigdata/moredevs-hvm.json -@@ -17,7 +17,7 @@ - "max_memkb": 1048576, - "target_memkb": 1048576, - "video_memkb": 8192, -- "shadow_memkb": 12288, -+ "shadow_memkb": 1234, - "device_model_version": "qemu_xen", - "device_model": "/bin/true", - "sched_params": { -diff --git a/tests/libxlxml2domconfigdata/multiple-ip.json b/tests/libxlxml2domconfigdata/multiple-ip.json -index 2db98b82f6..e0b37aa795 100644 ---- a/tests/libxlxml2domconfigdata/multiple-ip.json -+++ b/tests/libxlxml2domconfigdata/multiple-ip.json -@@ -14,7 +14,7 @@ - ], - "max_memkb": 524288, - "target_memkb": 524288, -- "shadow_memkb": 8192, -+ "shadow_memkb": 1234, - "sched_params": { - - }, -diff --git a/tests/libxlxml2domconfigdata/variable-clock-hvm.json b/tests/libxlxml2domconfigdata/variable-clock-hvm.json -index 9a25d51da2..3c131c603c 100644 ---- a/tests/libxlxml2domconfigdata/variable-clock-hvm.json -+++ b/tests/libxlxml2domconfigdata/variable-clock-hvm.json -@@ -15,7 +15,7 @@ - "max_memkb": 1048576, - "target_memkb": 1048576, - "video_memkb": 8192, -- "shadow_memkb": 12288, -+ "shadow_memkb": 1234, - "rtc_timeoffset": 3600, - "localtime": "True", - "device_model_version": "qemu_xen", -diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json b/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json -index 6cda8d0252..6725df9112 100644 ---- a/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json -+++ b/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json -@@ -103,7 +103,7 @@ - "max_memkb": 1048576, - "target_memkb": 1048576, - "video_memkb": 8192, -- "shadow_memkb": 14336, -+ "shadow_memkb": 1234, - "device_model_version": "qemu_xen", - "device_model": "/bin/true", - "sched_params": { -diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm.json b/tests/libxlxml2domconfigdata/vnuma-hvm.json -index f578ccd3d3..2556c82d5f 100644 ---- a/tests/libxlxml2domconfigdata/vnuma-hvm.json -+++ b/tests/libxlxml2domconfigdata/vnuma-hvm.json -@@ -103,7 +103,7 @@ - "max_memkb": 1048576, - "target_memkb": 1048576, - "video_memkb": 8192, -- "shadow_memkb": 14336, -+ "shadow_memkb": 1234, - "device_model_version": "qemu_xen", - "device_model": "/bin/true", - "sched_params": { --- -2.37.3 - diff --git a/libvirt.spec b/libvirt.spec index b43f9a9..bcdc188 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -229,8 +229,8 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 8.8.0 -Release: 2%{?dist} +Version: 8.9.0 +Release: 1%{?dist} License: LGPLv2+ URL: https://libvirt.org/ @@ -238,7 +238,6 @@ URL: https://libvirt.org/ %define mainturl stable_updates/ %endif Source: https://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz -Patch: 0001-tests-Fix-libxlxml2domconfigtest-with-latest-xen.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -272,7 +271,7 @@ Requires: libvirt-libs = %{version}-%{release} # listed against each sub-RPM BuildRequires: python3-docutils BuildRequires: gcc -BuildRequires: meson >= 0.54.0 +BuildRequires: meson >= 0.56.0 BuildRequires: ninja-build BuildRequires: git BuildRequires: perl-interpreter @@ -294,6 +293,7 @@ BuildRequires: libblkid-devel >= 2.17 # for augparse, optionally used in testing BuildRequires: augeas BuildRequires: systemd-devel >= 185 +BuildRequires: systemd-rpm-macros BuildRequires: libpciaccess-devel >= 0.10.9 BuildRequires: yajl-devel %if %{with_sanlock} @@ -477,7 +477,6 @@ Requires: gettext-runtime Requires: gettext %endif - # Ensure smooth upgrades Obsoletes: libvirt-admin < 7.3.0 Provides: libvirt-admin = %{version}-%{release} @@ -904,6 +903,15 @@ Obsoletes: libvirt-bash-completion < 7.3.0 The client binaries needed to access the virtualization capabilities of recent versions of Linux (and other OSes). +%package client-qemu +Summary: Additional client side utilities for QEMU +Requires: %{name}-libs = %{version}-%{release} +Requires: python3-libvirt >= %{version}-%{release} + +%description client-qemu +The additional client binaries are used to interact +with some QEMU specific features of libvirt. + %package libs Summary: Client side libraries # So remote clients can access libvirt over SSH tunnel @@ -2164,6 +2172,12 @@ exit 0 %{_datadir}/bash-completion/completions/virsh +%if %{with_qemu} +%files client-qemu +%{_mandir}/man1/virt-qemu-qmp-proxy.1* +%{_bindir}/virt-qemu-qmp-proxy +%endif + %files libs -f %{name}.lang %license COPYING COPYING.LESSER %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ @@ -2379,6 +2393,9 @@ exit 0 %changelog +* Thu Nov 03 2022 Cole Robinson - 8.9.0-1 +- Update to version 8.9.0 + * Mon Oct 24 2022 Cole Robinson - 8.8.0-2 - Rebuild for wireshark soname bump diff --git a/sources b/sources index 1a8f446..92a339a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-8.8.0.tar.xz) = 868e49b369afe200c5af6e2cd0606de2eeebfa92523b5ad3c653203c8838d304bd0cdc5acfb3c4d4c33c0a87ab8e769b84cc62e3f06e055936c43573a23d7190 +SHA512 (libvirt-8.9.0.tar.xz) = 10426d45d55bb18e8e5d4327d698fbc6efd83c5f515ac40a0fcd72048a77936fe0b422ac14bce9966a65379d262df294c314f854a97861a223a0cbc6a8fd2382 From 987430ba8b89c0fe2e009242c2cadb01e38b1bee Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Sat, 3 Dec 2022 18:45:22 -0500 Subject: [PATCH 12/28] libvirt-8.10.0-1 Update to version 8.10.0 --- libvirt.spec | 19 +++++++++++++++++-- sources | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/libvirt.spec b/libvirt.spec index bcdc188..3387ccf 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -229,7 +229,7 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 8.9.0 +Version: 8.10.0 Release: 1%{?dist} License: LGPLv2+ URL: https://libvirt.org/ @@ -441,6 +441,12 @@ Summary: Server side daemon and supporting files for libvirt library # The client side, i.e. shared libs are in a subpackage Requires: %{name}-libs = %{version}-%{release} +# The libvirt-guests.sh script requires virsh from libvirt-client subpackage, +# but not every deployment wants to use libvirt-guests service. Using +# Recommends here will install libvirt-client by default (if available), but +# RPM won't complain if the package is unavailable, masked, or removed later. +Recommends: %{name}-client = %{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. Making this a Recommends means that it gets @@ -906,7 +912,7 @@ capabilities of recent versions of Linux (and other OSes). %package client-qemu Summary: Additional client side utilities for QEMU Requires: %{name}-libs = %{version}-%{release} -Requires: python3-libvirt >= %{version}-%{release} +Requires: python3-libvirt >= 3.7.0 %description client-qemu The additional client binaries are used to interact @@ -1914,6 +1920,10 @@ exit 0 %if %{with_firewalld_zone} %{_prefix}/lib/firewalld/zones/libvirt.xml +%{_prefix}/lib/firewalld/zones/libvirt-routed.xml +%{_prefix}/lib/firewalld/policies/libvirt-routed-in.xml +%{_prefix}/lib/firewalld/policies/libvirt-routed-out.xml +%{_prefix}/lib/firewalld/policies/libvirt-to-host.xml %endif %files daemon-driver-nodedev @@ -2175,7 +2185,9 @@ exit 0 %if %{with_qemu} %files client-qemu %{_mandir}/man1/virt-qemu-qmp-proxy.1* +%{_mandir}/man1/virt-qemu-sev-validate.1* %{_bindir}/virt-qemu-qmp-proxy +%{_bindir}/virt-qemu-sev-validate %endif %files libs -f %{name}.lang @@ -2393,6 +2405,9 @@ exit 0 %changelog +* Sat Dec 03 2022 Cole Robinson - 8.10.0-1 +- Update to version 8.10.0 + * Thu Nov 03 2022 Cole Robinson - 8.9.0-1 - Update to version 8.9.0 diff --git a/sources b/sources index 92a339a..0fa8b69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-8.9.0.tar.xz) = 10426d45d55bb18e8e5d4327d698fbc6efd83c5f515ac40a0fcd72048a77936fe0b422ac14bce9966a65379d262df294c314f854a97861a223a0cbc6a8fd2382 +SHA512 (libvirt-8.10.0.tar.xz) = 1d4006e909e185a89f9163e6d2309841f4086da65b9165c42eb512e2f6ae964749eeb72f74e86476768a09061e2e311cfcc31f4024b4ecbaba04cd3f5f5d849d From c98b586e70b2faf9b821e82a36de7bb82ed4004a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 3 Jan 2023 08:24:40 +0000 Subject: [PATCH 13/28] Rebuild for xen-4.17.0 --- libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt.spec b/libvirt.spec index 3387ccf..47c90d9 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -230,7 +230,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 8.10.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://libvirt.org/ @@ -2405,6 +2405,9 @@ exit 0 %changelog +* Tue Jan 03 2023 Richard W.M. Jones - 8.10.0-2 +- Rebuild for xen-4.17.0 + * Sat Dec 03 2022 Cole Robinson - 8.10.0-1 - Update to version 8.10.0 From 50aba9b5a0256273846915e4e1680e2f5396b9cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 9 Jan 2023 10:44:05 +0000 Subject: [PATCH 14/28] Trim changelogs older than 2 years MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- libvirt.spec | 78 ---------------------------------------------------- 1 file changed, 78 deletions(-) diff --git a/libvirt.spec b/libvirt.spec index 47c90d9..4b67d03 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -2533,81 +2533,3 @@ exit 0 * Fri Jan 15 2021 Daniel P. Berrangé - 7.0.0-1 - Rebase to 7.0.0 release - -* Fri Dec 04 2020 Cole Robinson - 6.10.0-2.1 -- Rebuild for wireshark soname bump - -* Fri Dec 04 2020 Richard W.M. Jones - 6.10.0-2 -- Build libvirt-daemon-kvm for riscv64. - -* Tue Dec 01 2020 Cole Robinson - 6.10.0-1 -- Update to version 6.10.0 - -* Wed Nov 4 2020 Daniel P. Berrangé - 6.9.0-2 -- Re-apply reverted fix for disabling glusterfs, curl, openswman and libiscsi - -* Tue Nov 03 2020 Cole Robinson - 6.9.0-1 -- Update to version 6.9.0 - -* Mon Nov 2 2020 Daniel P. Berrangé - 6.8.0-4 -- Really fix meson option for disabling glusterfs -- Fix disabling curl, openswman and libiscsi - -* Mon Nov 2 2020 Daniel P. Berrangé - 6.8.0-4 -- Fix name of meson option for disabling glusterfs - -* Fri Oct 30 2020 Daniel P. Berrangé - 6.8.0-3 -- Fix stat() mocking for new glibc - -* Wed Oct 28 2020 Daniel P. Berrangé - 6.8.0-2 -- Remove obsolete bash_completion conditional -- Pass args to meson based on with_libssh/with_libssh2 - -* Thu Oct 01 2020 Cole Robinson - 6.8.0-1 -- Update to version 6.8.0 - -* Fri Sep 4 2020 Daniel P. Berrangé - 6.7.0-2 -- Fix QEMU start when KVM is not loaded (rhbz#1875327) - -* Tue Sep 01 2020 Cole Robinson - 6.7.0-1 -- Update to version 6.7.0 - -* Fri Aug 21 2020 Merlin Mathesius - 6.6.0-3 -- Fix so no platforms depend upon ceph for 32-bit architectures -- Include upstream patches to fix GCC 10 warnings - -* Fri Aug 21 2020 Daniel P. Berrangé - 6.6.0-2 -- Fix creation of pools on non-btrfs (rhbz#1870197) - -* Tue Aug 04 2020 Cole Robinson - 6.6.0-1 -- Update to version 6.6.0 - -* Tue Jul 28 2020 Fedora Release Engineering - 6.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 03 2020 Cole Robinson - 6.5.0-1 -- Update to version 6.5.0 - -* Tue Jun 02 2020 Cole Robinson - 6.4.0-1 -- Update to version 6.4.0 - -* Tue May 05 2020 Cole Robinson - 6.3.0-1 -- Update to version 6.3.0 - -* Thu Apr 02 2020 Cole Robinson - 6.2.0-1 -- Update to version 6.2.0 - -* Tue Mar 24 2020 Felipe Borges - 6.1.0-2 -- Check for disk type correctly in virDomainDiskTranslateSourcePool - -* Wed Mar 04 2020 Cole Robinson - 6.1.0-1 -- Update to version 6.1.0 - -* Tue Feb 25 2020 Cole Robinson - 6.0.0-3 -- Rebuild for libiscsi soname bump - -* Wed Jan 29 2020 Fedora Release Engineering - 6.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jan 15 2020 Cole Robinson - 6.0.0-1 -- Update to version 6.0.0 From 044c5b06651c92de46c3cbbd0df1c45fcb85bd30 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Mon, 16 Jan 2023 13:21:37 -0500 Subject: [PATCH 15/28] libvirt-9.0.0-1 Update to version 9.0.0 --- libvirt.spec | 198 ++++++++++++++------------------------------------- sources | 2 +- 2 files changed, 54 insertions(+), 146 deletions(-) diff --git a/libvirt.spec b/libvirt.spec index 4b67d03..3e4de1f 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -138,7 +138,6 @@ %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} @@ -229,8 +228,8 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 8.10.0 -Release: 2%{?dist} +Version: 9.0.0 +Release: 1%{?dist} License: LGPLv2+ URL: https://libvirt.org/ @@ -258,7 +257,6 @@ Obsoletes: libvirt-daemon-uml <= 5.0.0 Requires: libvirt-daemon-driver-vbox = %{version}-%{release} %endif Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} - Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: libvirt-daemon-driver-storage = %{version}-%{release} @@ -349,6 +347,9 @@ BuildRequires: libssh2-devel >= 1.3.0 %if %{with_netcf} BuildRequires: netcf-devel >= 0.2.2 %endif +%if (0%{?fedora} >= 36) || (0%{?rhel} >= 9) +BuildRequires: passt +%endif %if %{with_esx} BuildRequires: libcurl-devel %endif @@ -358,33 +359,25 @@ BuildRequires: libwsman-devel >= 2.6.3 BuildRequires: audit-libs-devel # we need /usr/sbin/dtrace BuildRequires: systemtap-sdt-devel - # For mount/umount in FS driver BuildRequires: util-linux # For showmount in FS driver (netfs discovery) BuildRequires: nfs-utils - # Fedora build root suckage BuildRequires: gawk - # For storage wiping with different algorithms BuildRequires: scrub - %if %{with_numad} BuildRequires: numad %endif - %if %{with_wireshark} BuildRequires: wireshark-devel %endif - %if %{with_libssh} BuildRequires: libssh-devel >= 0.8.1 %endif - BuildRequires: rpcgen BuildRequires: libtirpc-devel - # Needed for the firewalld_reload macro %if %{with_firewalld_zone} BuildRequires: firewalld-filesystem @@ -404,7 +397,6 @@ BuildRequires: mingw32-portablexdr BuildRequires: mingw32-dlfcn BuildRequires: mingw32-libssh2 BuildRequires: mingw32-curl - BuildRequires: mingw64-filesystem BuildRequires: mingw64-gcc BuildRequires: mingw64-binutils @@ -439,29 +431,24 @@ Summary: Server side daemon and supporting files for libvirt library # for subpackages are listed later in those subpackages) # The client side, i.e. shared libs are in a subpackage -Requires: %{name}-libs = %{version}-%{release} - +Requires: libvirt-libs = %{version}-%{release} # The libvirt-guests.sh script requires virsh from libvirt-client subpackage, # but not every deployment wants to use libvirt-guests service. Using # Recommends here will install libvirt-client by default (if available), but # RPM won't complain if the package is unavailable, masked, or removed later. -Recommends: %{name}-client = %{version}-%{release} - +Recommends: libvirt-client = %{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. Making this a Recommends means that it gets # installed by default, but can still be removed if compatibility # with old clients is not required Recommends: /usr/bin/nc - # for modprobe of pci devices Requires: module-init-tools - # for /sbin/ip Requires: iproute # for /sbin/tc Requires: iproute-tc - Requires: polkit >= 0.112 %if %{with_dmidecode} # For virConnectGetSysinfo @@ -523,7 +510,6 @@ The network driver plugin for the libvirtd daemon, providing an implementation of the virtual network APIs using the Linux bridge capabilities. - %package daemon-driver-nwfilter Summary: Nwfilter driver plugin for the libvirtd daemon Requires: libvirt-daemon = %{version}-%{release} @@ -536,7 +522,6 @@ The nwfilter driver plugin for the libvirtd daemon, providing an implementation of the firewall APIs using the ebtables, iptables and ip6tables capabilities - %package daemon-driver-nodedev Summary: Nodedev driver plugin for the libvirtd daemon Requires: libvirt-daemon = %{version}-%{release} @@ -551,7 +536,6 @@ The nodedev driver plugin for the libvirtd daemon, providing an implementation of the node device APIs using the udev capabilities. - %package daemon-driver-interface Summary: Interface driver plugin for the libvirtd daemon Requires: libvirt-daemon = %{version}-%{release} @@ -604,7 +588,6 @@ Requires: lvm2 The storage driver backend adding implementation of the storage APIs for block volumes using lvm. - %package daemon-driver-storage-disk Summary: Storage driver plugin for disk Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} @@ -616,7 +599,6 @@ Requires: device-mapper The storage driver backend adding implementation of the storage APIs for block volumes using the host disks. - %package daemon-driver-storage-scsi Summary: Storage driver plugin for local scsi devices Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} @@ -626,7 +608,6 @@ Requires: libvirt-libs = %{version}-%{release} The storage driver backend adding implementation of the storage APIs for scsi host devices. - %package daemon-driver-storage-iscsi Summary: Storage driver plugin for iscsi Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} @@ -637,7 +618,6 @@ Requires: iscsi-initiator-utils The storage driver backend adding implementation of the storage APIs for iscsi volumes using the host iscsi stack. - %if %{with_storage_iscsi_direct} %package daemon-driver-storage-iscsi-direct Summary: Storage driver plugin for iscsi-direct @@ -649,7 +629,6 @@ The storage driver backend adding implementation of the storage APIs for iscsi volumes using libiscsi direct connection. %endif - %package daemon-driver-storage-mpath Summary: Storage driver plugin for multipath volumes Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} @@ -660,7 +639,6 @@ Requires: device-mapper The storage driver backend adding implementation of the storage APIs for multipath storage using device mapper. - %if %{with_storage_gluster} %package daemon-driver-storage-gluster Summary: Storage driver plugin for gluster @@ -678,7 +656,6 @@ The storage driver backend adding implementation of the storage APIs for gluster volumes using libgfapi. %endif - %if %{with_storage_rbd} %package daemon-driver-storage-rbd Summary: Storage driver plugin for rbd @@ -690,7 +667,6 @@ The storage driver backend adding implementation of the storage APIs for rbd volumes using the ceph protocol. %endif - %if %{with_storage_zfs} %package daemon-driver-storage-zfs Summary: Storage driver plugin for ZFS @@ -705,7 +681,6 @@ The storage driver backend adding implementation of the storage APIs for ZFS volumes. %endif - %package daemon-driver-storage Summary: Storage driver plugin including all backends for the libvirtd daemon Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} @@ -732,7 +707,6 @@ The storage driver plugin for the libvirtd daemon, providing an implementation of the storage APIs using LVM, iSCSI, parted and more. - %if %{with_qemu} %package daemon-driver-qemu Summary: QEMU driver plugin for the libvirtd daemon @@ -746,6 +720,9 @@ Requires: lzop Requires: xz Requires: systemd-container Requires: swtpm-tools + %if (0%{?fedora} >= 36) || (0%{?rhel} >= 9) +Recommends: passt + %endif %description daemon-driver-qemu The qemu driver plugin for the libvirtd daemon, providing @@ -753,7 +730,6 @@ an implementation of the hypervisor driver APIs using QEMU %endif - %if %{with_lxc} %package daemon-driver-lxc Summary: LXC driver plugin for the libvirtd daemon @@ -769,7 +745,6 @@ an implementation of the hypervisor driver APIs using the Linux kernel %endif - %if %{with_vbox} %package daemon-driver-vbox Summary: VirtualBox driver plugin for the libvirtd daemon @@ -782,7 +757,6 @@ an implementation of the hypervisor driver APIs using VirtualBox %endif - %if %{with_libxl} %package daemon-driver-libxl Summary: Libxl driver plugin for the libvirtd daemon @@ -796,8 +770,6 @@ an implementation of the hypervisor driver APIs using Libxl %endif - - %if %{with_qemu_tcg} %package daemon-qemu Summary: Server side daemon & driver required to run QEMU guests @@ -817,7 +789,6 @@ Server side daemon and driver required to manage the virtualization capabilities of the QEMU TCG emulators %endif - %if %{with_qemu_kvm} %package daemon-kvm Summary: Server side daemon & driver required to run KVM guests @@ -837,7 +808,6 @@ Server side daemon and driver required to manage the virtualization capabilities of the KVM hypervisor %endif - %if %{with_lxc} %package daemon-lxc Summary: Server side daemon & driver required to run LXC guests @@ -856,15 +826,12 @@ Server side daemon and driver required to manage the virtualization capabilities of LXC %endif - %if %{with_libxl} %package daemon-xen Summary: Server side daemon & driver required to run XEN guests Requires: libvirt-daemon = %{version}-%{release} - %if %{with_libxl} Requires: libvirt-daemon-driver-libxl = %{version}-%{release} - %endif Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} @@ -898,7 +865,7 @@ capabilities of VirtualBox %package client Summary: Client side utilities of the libvirt library -Requires: %{name}-libs = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} # Needed by virt-pki-validate script. Requires: gnutls-utils @@ -911,7 +878,7 @@ capabilities of recent versions of Linux (and other OSes). %package client-qemu Summary: Additional client side utilities for QEMU -Requires: %{name}-libs = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} Requires: python3-libvirt >= 3.7.0 %description client-qemu @@ -933,7 +900,7 @@ Shared libraries for accessing the libvirt daemon. %package wireshark Summary: Wireshark dissector plugin for libvirt RPC transactions Requires: wireshark -Requires: %{name}-libs = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} %description wireshark Wireshark dissector plugin for better analysis of libvirt RPC traffic. @@ -942,7 +909,7 @@ Wireshark dissector plugin for better analysis of libvirt RPC traffic. %if %{with_lxc} %package login-shell Summary: Login shell for connecting users to an LXC container -Requires: %{name}-libs = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} %description login-shell Provides the set-uid virt-login-shell binary that is used to @@ -952,7 +919,7 @@ namespaces. %package devel Summary: Libraries, includes, etc. to compile with the libvirt library -Requires: %{name}-libs = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} Requires: pkgconfig %description devel @@ -964,8 +931,8 @@ Summary: Sanlock lock manager plugin for QEMU driver Requires: sanlock >= 2.4 #for virt-sanlock-cleanup require augeas Requires: augeas -Requires: %{name}-daemon = %{version}-%{release} -Requires: %{name}-libs = %{version}-%{release} +Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} %description lock-sanlock Includes the Sanlock lock manager plugin for the QEMU @@ -1000,7 +967,6 @@ MinGW Windows libvirt virtualization library. %endif %prep - %autosetup -S git_am %build @@ -1154,12 +1120,11 @@ exit 1 %define who %{?packager}%{!?packager:Unknown} %define arg_packager -Dpackager="%{who}, %{when}, %{where}" %define arg_packager_version -Dpackager_version="%{release}" - %define arg_selinux_mount -Dselinux_mount="/sys/fs/selinux" # place macros above and build commands below this comment -export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) +export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec) %meson \ -Drunstatedir=%{_rundir} \ @@ -1314,7 +1279,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) %install rm -fr %{buildroot} -export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) +export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec) %meson_install @@ -1396,8 +1361,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %mingw_debug_install_post -%endif +%mingw_find_lang %{name} +%endif %check # Building on slow archs, like emulated s390x in Fedora copr, requires @@ -1437,7 +1403,6 @@ fi \ # libvirtd. The uid number is irrelevant, so we use dynamic allocation # described at the above link. getent group libvirt >/dev/null || groupadd -r libvirt - exit 0 %post daemon @@ -1448,14 +1413,11 @@ exit 0 %else %libvirt_daemon_systemd_post_inet libvirtd %endif - %systemd_post libvirt-guests.service - %libvirt_daemon_schedule_restart libvirtd %preun daemon %systemd_preun libvirt-guests.service - %libvirt_daemon_systemd_preun_inet libvirtd %libvirt_daemon_systemd_preun_inet virtproxyd %libvirt_daemon_systemd_preun_priv virtlogd @@ -1468,18 +1430,6 @@ if [ $1 -ge 1 ] ; then fi %systemd_postun libvirt-guests.service -# In upgrade scenario we must explicitly enable virtlockd/virtlogd -# sockets, if libvirtd is already enabled and start them if -# libvirtd is running, otherwise you'll get failures to start -# guests -%triggerpostun daemon -- libvirt-daemon < 1.3.0 -if [ $1 -ge 1 ] ; then - /bin/systemctl is-enabled libvirtd.service 1>/dev/null 2>&1 && - /bin/systemctl enable virtlogd.socket virtlogd-admin.socket || : - /bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1 && - /bin/systemctl start virtlogd.socket virtlogd-admin.socket || : -fi - %posttrans daemon %libvirt_sysconfig_posttrans libvirtd virtproxyd virtlogd virtlockd libvirt-guests if test %libvirt_daemon_needs_restart libvirtd @@ -1499,6 +1449,7 @@ then libvirtd-admin.socket \ libvirtd-tls.socket \ libvirtd-tcp.socket >/dev/null 2>&1 || : + /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || : else # Old libvirtd owns the sockets and will delete them on # shutdown. Can't use a try-restart as libvirtd will simply @@ -1513,7 +1464,6 @@ then /bin/systemctl start libvirtd.service >/dev/null 2>&1 || : fi fi - %libvirt_daemon_finish_restart libvirtd %pre daemon-driver-network @@ -1605,7 +1555,6 @@ fi %libvirt_sysconfig_posttrans virtsecretd %libvirt_daemon_perform_restart virtsecretd - %pre daemon-driver-storage-core %libvirt_sysconfig_pre virtstoraged @@ -1622,7 +1571,6 @@ fi %libvirt_sysconfig_posttrans virtstoraged %libvirt_daemon_perform_restart virtstoraged - %if %{with_qemu} %pre daemon-driver-qemu %libvirt_sysconfig_pre virtqemud @@ -1654,7 +1602,6 @@ exit 0 %libvirt_daemon_perform_restart virtqemud %endif - %if %{with_lxc} %pre daemon-driver-lxc %libvirt_sysconfig_pre virtlxcd @@ -1673,7 +1620,6 @@ exit 0 %libvirt_daemon_perform_restart virtlxcd %endif - %if %{with_vbox} %post daemon-driver-vbox %if %{with_modular_daemons} @@ -1692,7 +1638,6 @@ exit 0 %libvirt_daemon_perform_restart virtvboxd %endif - %if %{with_libxl} %post daemon-driver-libxl %if %{with_modular_daemons} @@ -1711,7 +1656,6 @@ exit 0 %libvirt_daemon_perform_restart virtxend %endif - %post daemon-config-network if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; then # see if the network used by default network creates a conflict, @@ -1787,7 +1731,6 @@ exit 0 %doc libvirt-docs/* %files daemon - %{_unitdir}/libvirtd.service %{_unitdir}/libvirtd.socket %{_unitdir}/libvirtd-ro.socket @@ -1814,25 +1757,21 @@ exit 0 %config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf %config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf - %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd %dir %{_datadir}/libvirt/ - %ghost %dir %{_rundir}/libvirt/ %ghost %dir %{_rundir}/libvirt/common/ - %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/filesystems/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/boot/ %dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/ - - %dir %attr(0755, root, root) %{_libdir}/libvirt/ %dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/ -%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver +%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/ +%dir %attr(0755, root, root) %{_libdir}/libvirt/storage-backend/ +%dir %attr(0755, root, root) %{_libdir}/libvirt/storage-file/ %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so - %{_datadir}/augeas/lenses/libvirtd.aug %{_datadir}/augeas/lenses/tests/test_libvirtd.aug %{_datadir}/augeas/lenses/virtlogd.aug @@ -1845,23 +1784,17 @@ exit 0 %if %{with_qemu} %{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug %endif - %{_datadir}/polkit-1/actions/org.libvirt.unix.policy %{_datadir}/polkit-1/actions/org.libvirt.api.policy %{_datadir}/polkit-1/rules.d/50-libvirt.rules - %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/ - %attr(0755, root, root) %{_libexecdir}/libvirt_iohelper - %attr(0755, root, root) %{_bindir}/virt-ssh-helper - %attr(0755, root, root) %{_sbindir}/libvirtd %attr(0755, root, root) %{_sbindir}/virtproxyd %attr(0755, root, root) %{_sbindir}/virtlogd %attr(0755, root, root) %{_sbindir}/virtlockd %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh - %{_mandir}/man1/virt-admin.1* %{_mandir}/man1/virt-host-validate.1* %{_mandir}/man8/virt-ssh-helper.8* @@ -1870,7 +1803,6 @@ exit 0 %{_mandir}/man8/virtlogd.8* %{_mandir}/man8/virtlockd.8* %{_mandir}/man8/virtproxyd.8* - %{_bindir}/virt-host-validate %{_bindir}/virt-admin %{_datadir}/bash-completion/completions/virt-admin @@ -1896,7 +1828,7 @@ exit 0 %{_unitdir}/virtinterfaced-admin.socket %attr(0755, root, root) %{_sbindir}/virtinterfaced %ghost %dir %{_rundir}/libvirt/interface/ -%{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so +%{_libdir}/libvirt/connection-driver/libvirt_driver_interface.so %{_mandir}/man8/virtinterfaced.8* %files daemon-driver-network @@ -1915,9 +1847,8 @@ exit 0 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/ %attr(0755, root, root) %{_libexecdir}/libvirt_leaseshelper -%{_libdir}/%{name}/connection-driver/libvirt_driver_network.so +%{_libdir}/libvirt/connection-driver/libvirt_driver_network.so %{_mandir}/man8/virtnetworkd.8* - %if %{with_firewalld_zone} %{_prefix}/lib/firewalld/zones/libvirt.xml %{_prefix}/lib/firewalld/zones/libvirt-routed.xml @@ -1936,7 +1867,7 @@ exit 0 %{_unitdir}/virtnodedevd-admin.socket %attr(0755, root, root) %{_sbindir}/virtnodedevd %ghost %dir %{_rundir}/libvirt/nodedev/ -%{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so +%{_libdir}/libvirt/connection-driver/libvirt_driver_nodedev.so %{_mandir}/man8/virtnodedevd.8* %files daemon-driver-nwfilter @@ -1952,7 +1883,7 @@ exit 0 %ghost %dir %{_rundir}/libvirt/network/ %ghost %dir %{_rundir}/libvirt/nwfilter-binding/ %ghost %dir %{_rundir}/libvirt/nwfilter/ -%{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so +%{_libdir}/libvirt/connection-driver/libvirt_driver_nwfilter.so %{_mandir}/man8/virtnwfilterd.8* %files daemon-driver-secret @@ -1966,7 +1897,7 @@ exit 0 %attr(0755, root, root) %{_sbindir}/virtsecretd %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/secrets/ %ghost %dir %{_rundir}/libvirt/secrets/ -%{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so +%{_libdir}/libvirt/connection-driver/libvirt_driver_secret.so %{_mandir}/man8/virtsecretd.8* %files daemon-driver-storage @@ -1984,45 +1915,45 @@ exit 0 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/storage/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/storage/autostart/ %ghost %dir %{_rundir}/libvirt/storage/ -%{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_fs.so -%{_libdir}/%{name}/storage-file/libvirt_storage_file_fs.so +%{_libdir}/libvirt/connection-driver/libvirt_driver_storage.so +%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_fs.so +%{_libdir}/libvirt/storage-file/libvirt_storage_file_fs.so %{_mandir}/man8/virtstoraged.8* %files daemon-driver-storage-disk -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_disk.so +%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_disk.so %files daemon-driver-storage-logical -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_logical.so +%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_logical.so %files daemon-driver-storage-scsi -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_scsi.so +%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_scsi.so %files daemon-driver-storage-iscsi -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi.so +%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_iscsi.so %if %{with_storage_iscsi_direct} %files daemon-driver-storage-iscsi-direct -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi-direct.so +%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_iscsi-direct.so %endif %files daemon-driver-storage-mpath -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_mpath.so +%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_mpath.so %if %{with_storage_gluster} %files daemon-driver-storage-gluster -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_gluster.so -%{_libdir}/%{name}/storage-file/libvirt_storage_file_gluster.so +%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_gluster.so +%{_libdir}/libvirt/storage-file/libvirt_storage_file_gluster.so %endif %if %{with_storage_rbd} %files daemon-driver-storage-rbd -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_rbd.so +%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_rbd.so %endif %if %{with_storage_zfs} %files daemon-driver-storage-zfs -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_zfs.so +%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_zfs.so %endif %if %{with_qemu} @@ -2044,6 +1975,7 @@ exit 0 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu %ghost %dir %{_rundir}/libvirt/qemu/ %ghost %dir %{_rundir}/libvirt/qemu/dbus/ +%ghost %dir %{_rundir}/libvirt/qemu/passt/ %ghost %dir %{_rundir}/libvirt/qemu/slirp/ %ghost %dir %{_rundir}/libvirt/qemu/swtpm/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ @@ -2058,7 +1990,7 @@ exit 0 %dir %attr(0750, root, root) %{_localstatedir}/cache/libvirt/qemu/ %{_datadir}/augeas/lenses/libvirtd_qemu.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug -%{_libdir}/%{name}/connection-driver/libvirt_driver_qemu.so +%{_libdir}/libvirt/connection-driver/libvirt_driver_qemu.so %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/swtpm/ %dir %attr(0730, tss, tss) %{_localstatedir}/log/swtpm/libvirt/qemu/ %{_bindir}/virt-qemu-run @@ -2086,7 +2018,7 @@ exit 0 %{_datadir}/augeas/lenses/libvirtd_lxc.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug %attr(0755, root, root) %{_libexecdir}/libvirt_lxc -%{_libdir}/%{name}/connection-driver/libvirt_driver_lxc.so +%{_libdir}/libvirt/connection-driver/libvirt_driver_lxc.so %{_mandir}/man8/virtlxcd.8* %endif @@ -2114,7 +2046,7 @@ exit 0 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/channel/target/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/dump/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/save/ -%{_libdir}/%{name}/connection-driver/libvirt_driver_libxl.so +%{_libdir}/libvirt/connection-driver/libvirt_driver_libxl.so %{_mandir}/man8/virtxend.8* %endif @@ -2128,7 +2060,7 @@ exit 0 %{_unitdir}/virtvboxd-ro.socket %{_unitdir}/virtvboxd-admin.socket %attr(0755, root, root) %{_sbindir}/virtvboxd -%{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so +%{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.so %{_mandir}/man8/virtvboxd.8* %endif @@ -2179,7 +2111,6 @@ exit 0 %{_bindir}/virt-xml-validate %{_bindir}/virt-pki-query-dn %{_bindir}/virt-pki-validate - %{_datadir}/bash-completion/completions/virsh %if %{with_qemu} @@ -2201,17 +2132,13 @@ exit 0 %{_libdir}/libvirt-admin.so.* %dir %{_datadir}/libvirt/ %dir %{_datadir}/libvirt/schemas/ - %{_datadir}/systemtap/tapset/libvirt_probes*.stp %{_datadir}/systemtap/tapset/libvirt_functions.stp %if %{with_qemu} %{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp %endif - %{_datadir}/libvirt/schemas/*.rng - %{_datadir}/libvirt/cpu_map/*.xml - %{_datadir}/libvirt/test-screenshot.png %if %{with_wireshark} @@ -2259,7 +2186,6 @@ exit 0 %{_libdir}/pkgconfig/libvirt-admin.pc %{_libdir}/pkgconfig/libvirt-qemu.pc %{_libdir}/pkgconfig/libvirt-lxc.pc - %dir %{_datadir}/libvirt/api/ %{_datadir}/libvirt/api/libvirt-api.xml %{_datadir}/libvirt/api/libvirt-admin-api.xml @@ -2267,11 +2193,10 @@ exit 0 %{_datadir}/libvirt/api/libvirt-lxc-api.xml %if %{with_mingw} -%files -n mingw32-libvirt +%files -n mingw32-libvirt -f mingw32-libvirt.lang %dir %{mingw32_sysconfdir}/libvirt/ %config(noreplace) %{mingw32_sysconfdir}/libvirt/libvirt.conf %config(noreplace) %{mingw32_sysconfdir}/libvirt/libvirt-admin.conf - %{mingw32_bindir}/libvirt-0.dll %{mingw32_bindir}/virsh.exe %{mingw32_bindir}/virt-admin.exe @@ -2281,7 +2206,6 @@ exit 0 %{mingw32_bindir}/libvirt-lxc-0.dll %{mingw32_bindir}/libvirt-qemu-0.dll %{mingw32_bindir}/libvirt-admin-0.dll - %{mingw32_libdir}/libvirt.dll.a %{mingw32_libdir}/pkgconfig/libvirt.pc %{mingw32_libdir}/pkgconfig/libvirt-qemu.pc @@ -2290,23 +2214,16 @@ exit 0 %{mingw32_libdir}/libvirt-lxc.dll.a %{mingw32_libdir}/libvirt-qemu.dll.a %{mingw32_libdir}/libvirt-admin.dll.a - %dir %{mingw32_datadir}/libvirt/ %dir %{mingw32_datadir}/libvirt/schemas/ %{mingw32_datadir}/libvirt/schemas/*.rng - %dir %{mingw32_datadir}/libvirt/api/ %{mingw32_datadir}/libvirt/api/libvirt-api.xml %{mingw32_datadir}/libvirt/api/libvirt-lxc-api.xml %{mingw32_datadir}/libvirt/api/libvirt-qemu-api.xml %{mingw32_datadir}/libvirt/api/libvirt-admin-api.xml - %{mingw32_datadir}/libvirt/cpu_map/*.xml - %{mingw32_datadir}/libvirt/test-screenshot.png - -%{mingw32_datadir}/locale/*/LC_MESSAGES/libvirt.mo - %dir %{mingw32_includedir}/libvirt %{mingw32_includedir}/libvirt/libvirt.h %{mingw32_includedir}/libvirt/libvirt-common.h @@ -2326,7 +2243,6 @@ exit 0 %{mingw32_includedir}/libvirt/libvirt-lxc.h %{mingw32_includedir}/libvirt/libvirt-qemu.h %{mingw32_includedir}/libvirt/libvirt-admin.h - %{mingw32_mandir}/man1/virsh.1* %{mingw32_mandir}/man1/virt-admin.1* %{mingw32_mandir}/man1/virt-xml-validate.1* @@ -2334,12 +2250,10 @@ exit 0 %{mingw32_mandir}/man1/virt-pki-validate.1* %{mingw32_mandir}/man7/virkey*.7* - -%files -n mingw64-libvirt +%files -n mingw64-libvirt -f mingw64-libvirt.lang %dir %{mingw64_sysconfdir}/libvirt/ %config(noreplace) %{mingw64_sysconfdir}/libvirt/libvirt.conf %config(noreplace) %{mingw64_sysconfdir}/libvirt/libvirt-admin.conf - %{mingw64_bindir}/libvirt-0.dll %{mingw64_bindir}/virsh.exe %{mingw64_bindir}/virt-admin.exe @@ -2349,7 +2263,6 @@ exit 0 %{mingw64_bindir}/libvirt-lxc-0.dll %{mingw64_bindir}/libvirt-qemu-0.dll %{mingw64_bindir}/libvirt-admin-0.dll - %{mingw64_libdir}/libvirt.dll.a %{mingw64_libdir}/pkgconfig/libvirt.pc %{mingw64_libdir}/pkgconfig/libvirt-qemu.pc @@ -2358,23 +2271,16 @@ exit 0 %{mingw64_libdir}/libvirt-lxc.dll.a %{mingw64_libdir}/libvirt-qemu.dll.a %{mingw64_libdir}/libvirt-admin.dll.a - %dir %{mingw64_datadir}/libvirt/ %dir %{mingw64_datadir}/libvirt/schemas/ %{mingw64_datadir}/libvirt/schemas/*.rng - %dir %{mingw64_datadir}/libvirt/api/ %{mingw64_datadir}/libvirt/api/libvirt-api.xml %{mingw64_datadir}/libvirt/api/libvirt-lxc-api.xml %{mingw64_datadir}/libvirt/api/libvirt-qemu-api.xml %{mingw64_datadir}/libvirt/api/libvirt-admin-api.xml - %{mingw64_datadir}/libvirt/cpu_map/*.xml - %{mingw64_datadir}/libvirt/test-screenshot.png - -%{mingw64_datadir}/locale/*/LC_MESSAGES/libvirt.mo - %dir %{mingw64_includedir}/libvirt %{mingw64_includedir}/libvirt/libvirt.h %{mingw64_includedir}/libvirt/libvirt-common.h @@ -2394,7 +2300,6 @@ exit 0 %{mingw64_includedir}/libvirt/libvirt-lxc.h %{mingw64_includedir}/libvirt/libvirt-qemu.h %{mingw64_includedir}/libvirt/libvirt-admin.h - %{mingw64_mandir}/man1/virsh.1* %{mingw64_mandir}/man1/virt-admin.1* %{mingw64_mandir}/man1/virt-xml-validate.1* @@ -2405,6 +2310,9 @@ exit 0 %changelog +* Mon Jan 16 2023 Cole Robinson - 9.0.0-1 +- Update to version 9.0.0 + * Tue Jan 03 2023 Richard W.M. Jones - 8.10.0-2 - Rebuild for xen-4.17.0 diff --git a/sources b/sources index 0fa8b69..48f81ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-8.10.0.tar.xz) = 1d4006e909e185a89f9163e6d2309841f4086da65b9165c42eb512e2f6ae964749eeb72f74e86476768a09061e2e311cfcc31f4024b4ecbaba04cd3f5f5d849d +SHA512 (libvirt-9.0.0.tar.xz) = 135f690f9fe722161c22579166f10a54d52941a371439165fd0e3d391ca7835049a3bcbff33fc81c50153046230db8a5a318d707383bad3141d489d2faa09ecb From 619904f37ac1d29b5f8e1b6622945f3115e4ed32 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 17:46:01 +0000 Subject: [PATCH 16/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt.spec b/libvirt.spec index 3e4de1f..80a1a1a 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -229,7 +229,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 9.0.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://libvirt.org/ @@ -2310,6 +2310,9 @@ exit 0 %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 9.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Jan 16 2023 Cole Robinson - 9.0.0-1 - Update to version 9.0.0 From c1a3411c3b025f320ee64a9618671e143d9ad78b Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Wed, 1 Mar 2023 12:55:47 -0500 Subject: [PATCH 17/28] libvirt-9.1.0-1 Update to version 9.1.0 --- libvirt.spec | 343 ++++++++++++++++++++++++++++++++++++--------------- sources | 2 +- 2 files changed, 246 insertions(+), 99 deletions(-) diff --git a/libvirt.spec b/libvirt.spec index 80a1a1a..f685c30 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -228,9 +228,9 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 9.0.0 -Release: 2%{?dist} -License: LGPLv2+ +Version: 9.1.0 +Release: 1%{?dist} +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/ %if %(echo %{version} | grep -q "\.0$"; echo $?) == 1 @@ -432,19 +432,25 @@ Summary: Server side daemon and supporting files for libvirt library # The client side, i.e. shared libs are in a subpackage Requires: libvirt-libs = %{version}-%{release} +Requires: libvirt-daemon-common = %{version}-%{release} +Requires: libvirt-daemon-lock = %{version}-%{release} +Requires: libvirt-daemon-plugin-lockd = %{version}-%{release} +Requires: libvirt-daemon-log = %{version}-%{release} +Requires: libvirt-daemon-proxy = %{version}-%{release} + +%description daemon +Server side daemon required to manage the virtualization capabilities +of recent versions of Linux. Requires a hypervisor specific sub-RPM +for specific drivers. + +%package daemon-common +Summary: Files and utilities used by daemons +Requires: libvirt-libs = %{version}-%{release} # The libvirt-guests.sh script requires virsh from libvirt-client subpackage, # but not every deployment wants to use libvirt-guests service. Using # Recommends here will install libvirt-client by default (if available), but # RPM won't complain if the package is unavailable, masked, or removed later. Recommends: libvirt-client = %{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. Making this a Recommends means that it gets -# installed by default, but can still be removed if compatibility -# with old clients is not required -Recommends: /usr/bin/nc -# for modprobe of pci devices -Requires: module-init-tools # for /sbin/ip Requires: iproute # for /sbin/tc @@ -456,9 +462,6 @@ Requires: dmidecode %endif # For service management Requires(post): /usr/bin/systemctl -%if %{with_numad} -Requires: numad -%endif # libvirtd depends on 'messagebus' service Requires: dbus # For uid creation during pre @@ -475,15 +478,50 @@ Obsoletes: libvirt-admin < 7.3.0 Provides: libvirt-admin = %{version}-%{release} Obsoletes: libvirt-bash-completion < 7.3.0 -%description daemon -Server side daemon required to manage the virtualization capabilities -of recent versions of Linux. Requires a hypervisor specific sub-RPM -for specific drivers. +%description daemon-common +Miscellaneous files and utilities used by other libvirt daemons + +%package daemon-lock +Summary: Server side daemon for managing locks +Requires: libvirt-libs = %{version}-%{release} + +%description daemon-lock +Server side daemon used to manage locks held against virtual machine +resources + +%package daemon-plugin-lockd +Summary: lockd client plugin for virtlockd +Requires: libvirt-libs = %{version}-%{release} +Requires: libvirt-daemon-lock = %{version}-%{release} + +%description daemon-plugin-lockd +A client-side plugin that implements disk locking using POSIX fcntl advisory +locks via communication with the virtlockd daemon + +%package daemon-log +Summary: Server side daemon for managing logs +Requires: libvirt-libs = %{version}-%{release} + +%description daemon-log +Server side daemon used to manage logs from virtual machine consoles + +%package daemon-proxy +Summary: Server side daemon providing libvirtd proxy +Requires: libvirt-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. Making this a Recommends means that it gets +# installed by default, but can still be removed if compatibility +# with old clients is not required +Recommends: /usr/bin/nc + +%description daemon-proxy +Server side daemon providing functionality previously provided by +the monolithic libvirtd %package daemon-config-network Summary: Default configuration files for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-driver-network = %{version}-%{release} %description daemon-config-network @@ -492,7 +530,6 @@ Default configuration files for setting up NAT based networking %package daemon-config-nwfilter Summary: Network filter configuration files for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} %description daemon-config-nwfilter @@ -500,7 +537,7 @@ Network filter configuration files for cleaning guest traffic %package daemon-driver-network Summary: Network driver plugin for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-daemon-common = %{version}-%{release} Requires: libvirt-libs = %{version}-%{release} Requires: dnsmasq >= 2.41 Requires: iptables @@ -512,7 +549,7 @@ bridge capabilities. %package daemon-driver-nwfilter Summary: Nwfilter driver plugin for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-daemon-common = %{version}-%{release} Requires: libvirt-libs = %{version}-%{release} Requires: iptables Requires: ebtables @@ -524,12 +561,14 @@ iptables and ip6tables capabilities %package daemon-driver-nodedev Summary: Nodedev driver plugin for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-daemon-common = %{version}-%{release} Requires: libvirt-libs = %{version}-%{release} # needed for device enumeration Requires: systemd >= 185 # For managing persistent mediated devices Requires: mdevctl +# for modprobe of pci devices +Requires: module-init-tools %description daemon-driver-nodedev The nodedev driver plugin for the libvirtd daemon, providing @@ -538,7 +577,7 @@ capabilities. %package daemon-driver-interface Summary: Interface driver plugin for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-daemon-common = %{version}-%{release} Requires: libvirt-libs = %{version}-%{release} %if %{with_netcf} Requires: netcf-libs >= 0.2.2 @@ -550,7 +589,7 @@ an implementation of the host network interface APIs. %package daemon-driver-secret Summary: Secret driver plugin for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-daemon-common = %{version}-%{release} Requires: libvirt-libs = %{version}-%{release} %description daemon-driver-secret @@ -559,7 +598,7 @@ an implementation of the secret key APIs. %package daemon-driver-storage-core Summary: Storage driver plugin including base backends for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-daemon-common = %{version}-%{release} Requires: libvirt-libs = %{version}-%{release} Requires: nfs-utils # For mkfs @@ -710,7 +749,8 @@ parted and more. %if %{with_qemu} %package daemon-driver-qemu Summary: QEMU driver plugin for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-daemon-common = %{version}-%{release} +Requires: libvirt-daemon-log = %{version}-%{release} Requires: libvirt-libs = %{version}-%{release} Requires: /usr/bin/qemu-img # For image compression @@ -720,6 +760,9 @@ Requires: lzop Requires: xz Requires: systemd-container Requires: swtpm-tools + %if %{with_numad} +Requires: numad + %endif %if (0%{?fedora} >= 36) || (0%{?rhel} >= 9) Recommends: passt %endif @@ -733,11 +776,16 @@ QEMU %if %{with_lxc} %package daemon-driver-lxc Summary: LXC driver plugin for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-daemon-common = %{version}-%{release} Requires: libvirt-libs = %{version}-%{release} # There really is a hard cross-driver dependency here Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: systemd-container +# for modprobe of nbd driver +Requires: module-init-tools + %if %{with_numad} +Requires: numad + %endif %description daemon-driver-lxc The LXC driver plugin for the libvirtd daemon, providing @@ -748,7 +796,7 @@ the Linux kernel %if %{with_vbox} %package daemon-driver-vbox Summary: VirtualBox driver plugin for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-daemon-common = %{version}-%{release} Requires: libvirt-libs = %{version}-%{release} %description daemon-driver-vbox @@ -760,7 +808,7 @@ VirtualBox %if %{with_libxl} %package daemon-driver-libxl Summary: Libxl driver plugin for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-daemon-common = %{version}-%{release} Requires: libvirt-libs = %{version}-%{release} Obsoletes: libvirt-daemon-driver-xen < 4.3.0 @@ -774,7 +822,15 @@ Libxl %package daemon-qemu Summary: Server side daemon & driver required to run QEMU guests + %if %{with_modular_daemons} +Requires: libvirt-daemon-common = %{version}-%{release} +Requires: libvirt-daemon-log = %{version}-%{release} +Requires: libvirt-daemon-lock = %{version}-%{release} +Requires: libvirt-daemon-plugin-lockd = %{version}-%{release} +Requires: libvirt-daemon-proxy = %{version}-%{release} + %else Requires: libvirt-daemon = %{version}-%{release} + %endif Requires: libvirt-daemon-driver-qemu = %{version}-%{release} Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: libvirt-daemon-driver-network = %{version}-%{release} @@ -793,7 +849,15 @@ capabilities of the QEMU TCG emulators %package daemon-kvm Summary: Server side daemon & driver required to run KVM guests + %if %{with_modular_daemons} +Requires: libvirt-daemon-common = %{version}-%{release} +Requires: libvirt-daemon-log = %{version}-%{release} +Requires: libvirt-daemon-lock = %{version}-%{release} +Requires: libvirt-daemon-plugin-lockd = %{version}-%{release} +Requires: libvirt-daemon-proxy = %{version}-%{release} + %else Requires: libvirt-daemon = %{version}-%{release} + %endif Requires: libvirt-daemon-driver-qemu = %{version}-%{release} Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: libvirt-daemon-driver-network = %{version}-%{release} @@ -812,7 +876,12 @@ capabilities of the KVM hypervisor %package daemon-lxc Summary: Server side daemon & driver required to run LXC guests + %if %{with_modular_daemons} +Requires: libvirt-daemon-common = %{version}-%{release} +Requires: libvirt-daemon-proxy = %{version}-%{release} + %else Requires: libvirt-daemon = %{version}-%{release} + %endif Requires: libvirt-daemon-driver-lxc = %{version}-%{release} Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: libvirt-daemon-driver-network = %{version}-%{release} @@ -830,7 +899,14 @@ capabilities of LXC %package daemon-xen Summary: Server side daemon & driver required to run XEN guests + %if %{with_modular_daemons} +Requires: libvirt-daemon-common = %{version}-%{release} +Requires: libvirt-daemon-lock = %{version}-%{release} +Requires: libvirt-daemon-plugin-lockd = %{version}-%{release} +Requires: libvirt-daemon-proxy = %{version}-%{release} + %else Requires: libvirt-daemon = %{version}-%{release} + %endif Requires: libvirt-daemon-driver-libxl = %{version}-%{release} Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: libvirt-daemon-driver-network = %{version}-%{release} @@ -849,7 +925,12 @@ capabilities of XEN %package daemon-vbox Summary: Server side daemon & driver required to run VirtualBox guests + %if %{with_modular_daemons} +Requires: libvirt-daemon-common = %{version}-%{release} +Requires: libvirt-daemon-proxy = %{version}-%{release} + %else Requires: libvirt-daemon = %{version}-%{release} + %endif Requires: libvirt-daemon-driver-vbox = %{version}-%{release} Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: libvirt-daemon-driver-network = %{version}-%{release} @@ -880,6 +961,8 @@ capabilities of recent versions of Linux (and other OSes). Summary: Additional client side utilities for QEMU Requires: libvirt-libs = %{version}-%{release} Requires: python3-libvirt >= 3.7.0 +Requires: python3-cryptography +Requires: python3-lxml %description client-qemu The additional client binaries are used to interact @@ -926,15 +1009,16 @@ Requires: pkgconfig Include header files & development libraries for the libvirt C library. %if %{with_sanlock} -%package lock-sanlock +%package daemon-plugin-sanlock Summary: Sanlock lock manager plugin for QEMU driver Requires: sanlock >= 2.4 #for virt-sanlock-cleanup require augeas Requires: augeas -Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-libs = %{version}-%{release} +Obsoletes: libvirt-lock-sanlock < 9.1.0 +Provides: libvirt-lock-sanlock = %{version}-%{release} -%description lock-sanlock +%description daemon-plugin-sanlock Includes the Sanlock lock manager plugin for the QEMU driver %endif @@ -1398,40 +1482,19 @@ fi \ %define libvirt_daemon_systemd_preun_priv() %systemd_preun %1.service %1-admin.socket %1.socket %pre daemon -%libvirt_sysconfig_pre libvirtd virtproxyd virtlogd virtlockd libvirt-guests -# 'libvirt' group is just to allow password-less polkit access to -# libvirtd. The uid number is irrelevant, so we use dynamic allocation -# described at the above link. -getent group libvirt >/dev/null || groupadd -r libvirt -exit 0 +%libvirt_sysconfig_pre libvirtd %post daemon -%libvirt_daemon_systemd_post_priv virtlogd -%libvirt_daemon_systemd_post_priv virtlockd -%if %{with_modular_daemons} -%libvirt_daemon_systemd_post_inet virtproxyd -%else +%if ! %{with_modular_daemons} %libvirt_daemon_systemd_post_inet libvirtd %endif -%systemd_post libvirt-guests.service %libvirt_daemon_schedule_restart libvirtd %preun daemon -%systemd_preun libvirt-guests.service %libvirt_daemon_systemd_preun_inet libvirtd -%libvirt_daemon_systemd_preun_inet virtproxyd -%libvirt_daemon_systemd_preun_priv virtlogd -%libvirt_daemon_systemd_preun_priv virtlockd - -%postun daemon -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - /bin/systemctl reload-or-try-restart virtlockd.service virtlogd.service >/dev/null 2>&1 || : -fi -%systemd_postun libvirt-guests.service %posttrans daemon -%libvirt_sysconfig_posttrans libvirtd virtproxyd virtlogd virtlockd libvirt-guests +%libvirt_sysconfig_posttrans libvirtd if test %libvirt_daemon_needs_restart libvirtd then # See if user has previously modified their install to @@ -1466,6 +1529,76 @@ then fi %libvirt_daemon_finish_restart libvirtd +%pre daemon-common +%libvirt_sysconfig_pre libvirt-guests +# 'libvirt' group is just to allow password-less polkit access to libvirt +# daemons. The uid number is irrelevant, so we use dynamic allocation. +getent group libvirt >/dev/null || groupadd -r libvirt +exit 0 + +%post daemon-common +%systemd_post libvirt-guests.service + +%preun daemon-common +%systemd_preun libvirt-guests.service + +%postun daemon-common +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +%systemd_postun libvirt-guests.service + +%posttrans daemon-common +%libvirt_sysconfig_posttrans libvirt-guests + +%pre daemon-lock +%libvirt_sysconfig_pre virtlockd + +%post daemon-lock +%libvirt_daemon_systemd_post_priv virtlockd + +%preun daemon-lock +%libvirt_daemon_systemd_preun_priv virtlockd + +%postun daemon-lock +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + /bin/systemctl reload-or-try-restart virtlockd.service >/dev/null 2>&1 || : +fi + +%posttrans daemon-lock +%libvirt_sysconfig_posttrans virtlockd + +%pre daemon-log +%libvirt_sysconfig_pre virtlogd + +%post daemon-log +%libvirt_daemon_systemd_post_priv virtlogd + +%preun daemon-log +%libvirt_daemon_systemd_preun_priv virtlogd + +%postun daemon-log +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + /bin/systemctl reload-or-try-restart virtlogd.service >/dev/null 2>&1 || : +fi + +%posttrans daemon-log +%libvirt_sysconfig_posttrans virtlogd + +%pre daemon-proxy +%libvirt_sysconfig_pre virtproxyd + +%post daemon-proxy +%if %{with_modular_daemons} +%libvirt_daemon_systemd_post_inet virtproxyd +%endif + +%preun daemon-proxy +%libvirt_daemon_systemd_preun_inet virtproxyd + +%posttrans daemon-proxy +%libvirt_sysconfig_posttrans virtproxyd + %pre daemon-driver-network %libvirt_sysconfig_pre virtnetworkd @@ -1737,27 +1870,18 @@ exit 0 %{_unitdir}/libvirtd-admin.socket %{_unitdir}/libvirtd-tcp.socket %{_unitdir}/libvirtd-tls.socket -%{_unitdir}/virtproxyd.service -%{_unitdir}/virtproxyd.socket -%{_unitdir}/virtproxyd-ro.socket -%{_unitdir}/virtproxyd-admin.socket -%{_unitdir}/virtproxyd-tcp.socket -%{_unitdir}/virtproxyd-tls.socket -%{_unitdir}/virt-guest-shutdown.target -%{_unitdir}/virtlogd.service -%{_unitdir}/virtlogd.socket -%{_unitdir}/virtlogd-admin.socket -%{_unitdir}/virtlockd.service -%{_unitdir}/virtlockd.socket -%{_unitdir}/virtlockd-admin.socket -%{_unitdir}/libvirt-guests.service %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf -%config(noreplace) %{_sysconfdir}/libvirt/virtproxyd.conf -%config(noreplace) %{_sysconfdir}/libvirt/virtlogd.conf -%config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf -%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf %config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd +%{_datadir}/augeas/lenses/libvirtd.aug +%{_datadir}/augeas/lenses/tests/test_libvirtd.aug +%attr(0755, root, root) %{_sbindir}/libvirtd +%{_mandir}/man8/libvirtd.8* + +%files daemon-common +%{_unitdir}/virt-guest-shutdown.target +%{_unitdir}/libvirt-guests.service +%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf %dir %{_datadir}/libvirt/ %ghost %dir %{_rundir}/libvirt/ %ghost %dir %{_rundir}/libvirt/common/ @@ -1768,45 +1892,64 @@ exit 0 %dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/ %dir %attr(0755, root, root) %{_libdir}/libvirt/ %dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/ -%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/ %dir %attr(0755, root, root) %{_libdir}/libvirt/storage-backend/ %dir %attr(0755, root, root) %{_libdir}/libvirt/storage-file/ -%attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so -%{_datadir}/augeas/lenses/libvirtd.aug -%{_datadir}/augeas/lenses/tests/test_libvirtd.aug -%{_datadir}/augeas/lenses/virtlogd.aug -%{_datadir}/augeas/lenses/tests/test_virtlogd.aug -%{_datadir}/augeas/lenses/virtlockd.aug -%{_datadir}/augeas/lenses/tests/test_virtlockd.aug -%{_datadir}/augeas/lenses/virtproxyd.aug -%{_datadir}/augeas/lenses/tests/test_virtproxyd.aug -%{_datadir}/augeas/lenses/libvirt_lockd.aug -%if %{with_qemu} -%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug -%endif %{_datadir}/polkit-1/actions/org.libvirt.unix.policy %{_datadir}/polkit-1/actions/org.libvirt.api.policy %{_datadir}/polkit-1/rules.d/50-libvirt.rules %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/ %attr(0755, root, root) %{_libexecdir}/libvirt_iohelper %attr(0755, root, root) %{_bindir}/virt-ssh-helper -%attr(0755, root, root) %{_sbindir}/libvirtd -%attr(0755, root, root) %{_sbindir}/virtproxyd -%attr(0755, root, root) %{_sbindir}/virtlogd -%attr(0755, root, root) %{_sbindir}/virtlockd %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh %{_mandir}/man1/virt-admin.1* %{_mandir}/man1/virt-host-validate.1* %{_mandir}/man8/virt-ssh-helper.8* %{_mandir}/man8/libvirt-guests.8* -%{_mandir}/man8/libvirtd.8* -%{_mandir}/man8/virtlogd.8* -%{_mandir}/man8/virtlockd.8* -%{_mandir}/man8/virtproxyd.8* %{_bindir}/virt-host-validate %{_bindir}/virt-admin %{_datadir}/bash-completion/completions/virt-admin +%files daemon-lock +%{_unitdir}/virtlockd.service +%{_unitdir}/virtlockd.socket +%{_unitdir}/virtlockd-admin.socket +%config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf +%{_datadir}/augeas/lenses/virtlockd.aug +%{_datadir}/augeas/lenses/tests/test_virtlockd.aug +%{_datadir}/augeas/lenses/libvirt_lockd.aug +%if %{with_qemu} +%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug +%endif +%attr(0755, root, root) %{_sbindir}/virtlockd +%{_mandir}/man8/virtlockd.8* + +%files daemon-plugin-lockd +%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/ +%attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so + +%files daemon-log +%{_unitdir}/virtlogd.service +%{_unitdir}/virtlogd.socket +%{_unitdir}/virtlogd-admin.socket +%config(noreplace) %{_sysconfdir}/libvirt/virtlogd.conf +%{_datadir}/augeas/lenses/virtlogd.aug +%{_datadir}/augeas/lenses/tests/test_virtlogd.aug +%attr(0755, root, root) %{_sbindir}/virtlogd +%{_mandir}/man8/virtlogd.8* + +%files daemon-proxy +%{_unitdir}/virtproxyd.service +%{_unitdir}/virtproxyd.socket +%{_unitdir}/virtproxyd-ro.socket +%{_unitdir}/virtproxyd-admin.socket +%{_unitdir}/virtproxyd-tcp.socket +%{_unitdir}/virtproxyd-tls.socket +%config(noreplace) %{_sysconfdir}/libvirt/virtproxyd.conf +%{_datadir}/augeas/lenses/virtproxyd.aug +%{_datadir}/augeas/lenses/tests/test_virtproxyd.aug +%attr(0755, root, root) %{_sbindir}/virtproxyd +%{_mandir}/man8/virtproxyd.8* + %files daemon-config-network %dir %{_datadir}/libvirt/networks/ %{_datadir}/libvirt/networks/default.xml @@ -2085,13 +2228,14 @@ exit 0 %endif %if %{with_sanlock} -%files lock-sanlock +%files daemon-plugin-sanlock %if %{with_qemu} %config(noreplace) %{_sysconfdir}/libvirt/qemu-sanlock.conf %endif %if %{with_libxl} %config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf %endif +%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/ %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/sanlock.so %{_datadir}/augeas/lenses/libvirt_sanlock.aug %{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug @@ -2310,6 +2454,9 @@ exit 0 %changelog +* Wed Mar 01 2023 Cole Robinson - 9.1.0-1 +- Update to version 9.1.0 + * Thu Jan 19 2023 Fedora Release Engineering - 9.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 48f81ab..6d98308 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-9.0.0.tar.xz) = 135f690f9fe722161c22579166f10a54d52941a371439165fd0e3d391ca7835049a3bcbff33fc81c50153046230db8a5a318d707383bad3141d489d2faa09ecb +SHA512 (libvirt-9.1.0.tar.xz) = f4c11ef4e5d29ffde9b91aed1f4fa466f827471d8cbdf6208b54e58b9f1f5cd8dd4fe8ca128aeea1d984f42f47b1ed7d99bbf2a5bb7264ab3943641310f36cd6 From f4fd6d7df6a0b3d9f2d9d058c7699ffa05441835 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Wed, 5 Apr 2023 15:26:13 -0400 Subject: [PATCH 18/28] libvirt-9.2.0-1 Update to version 9.2.0 --- libvirt.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libvirt.spec b/libvirt.spec index f685c30..152d637 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -228,7 +228,7 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 9.1.0 +Version: 9.2.0 Release: 1%{?dist} 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/ @@ -236,7 +236,7 @@ URL: https://libvirt.org/ %if %(echo %{version} | grep -q "\.0$"; echo $?) == 1 %define mainturl stable_updates/ %endif -Source: https://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz +Source: https://download.libvirt.org/%{?mainturl}libvirt-%{version}.tar.xz Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -765,6 +765,7 @@ Requires: numad %endif %if (0%{?fedora} >= 36) || (0%{?rhel} >= 9) Recommends: passt +Recommends: passt-selinux %endif %description daemon-driver-qemu @@ -2454,6 +2455,9 @@ exit 0 %changelog +* Wed Apr 05 2023 Cole Robinson - 9.2.0-1 +- Update to version 9.2.0 + * Wed Mar 01 2023 Cole Robinson - 9.1.0-1 - Update to version 9.1.0 diff --git a/sources b/sources index 6d98308..73e6d44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-9.1.0.tar.xz) = f4c11ef4e5d29ffde9b91aed1f4fa466f827471d8cbdf6208b54e58b9f1f5cd8dd4fe8ca128aeea1d984f42f47b1ed7d99bbf2a5bb7264ab3943641310f36cd6 +SHA512 (libvirt-9.2.0.tar.xz) = 9afd4fcccb9ef39c1ed50eb0db94cd8b06cc5b60041cdb9aa5fe7b27e5ab11855f4b538d6868413725d603dc1a6090e0983207137dcd43ed2bbcfbeb6fc69c58 From 2333a80c1aeafa99adf2e23ddc8e7b344815b0c9 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 2 May 2023 09:47:09 -0400 Subject: [PATCH 19/28] libvirt-9.3.0-1 Update to version 9.3.0 --- libvirt.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libvirt.spec b/libvirt.spec index 152d637..1459e1a 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -228,7 +228,7 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 9.2.0 +Version: 9.3.0 Release: 1%{?dist} 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/ @@ -2455,6 +2455,9 @@ exit 0 %changelog +* Tue May 02 2023 Cole Robinson - 9.3.0-1 +- Update to version 9.3.0 + * Wed Apr 05 2023 Cole Robinson - 9.2.0-1 - Update to version 9.2.0 diff --git a/sources b/sources index 73e6d44..e76c4ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-9.2.0.tar.xz) = 9afd4fcccb9ef39c1ed50eb0db94cd8b06cc5b60041cdb9aa5fe7b27e5ab11855f4b538d6868413725d603dc1a6090e0983207137dcd43ed2bbcfbeb6fc69c58 +SHA512 (libvirt-9.3.0.tar.xz) = b9349dcd7798c76d75bb20afad67d6e676758cb201acaf7aed5109f0e91422b2bcca964a2f19aa8dc4fd0eca2923902474e16e3839bf8b15aca827028e88ddb7 From 6d908194bf524809c2c2c91042043437fae09c9a Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 23 May 2023 12:53:06 -0400 Subject: [PATCH 20/28] Drop numad usage, it is removed from f39 https://src.fedoraproject.org/rpms/numad/c/a6bb891e8447e3b2a4c63774da94ad0d9b4ee50a?branch=rawhide https://pagure.io/releng/failed-composes/issue/4990#comment-857670 Signed-off-by: Cole Robinson --- libvirt.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libvirt.spec b/libvirt.spec index 1459e1a..cf3a9cd 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -173,6 +173,10 @@ %define with_numad 0%{!?_without_numad:1} %endif %endif +%if 0%{?fedora} >= 39 + # numad is retired in fedora 39+, upstream is dead + %define with_numad 0 +%endif %ifarch %{arches_dmidecode} %define with_dmidecode 0%{!?_without_dmidecode:1} From d4bb64489a7e454f73ef467335440734af94e556 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 23 May 2023 12:55:22 -0400 Subject: [PATCH 21/28] Bump release Signed-off-by: Cole Robinson --- libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt.spec b/libvirt.spec index cf3a9cd..d230ca6 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -233,7 +233,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 9.3.0 -Release: 1%{?dist} +Release: 2%{?dist} 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/ @@ -2459,6 +2459,9 @@ exit 0 %changelog +* Tue May 23 2023 Cole Robinson - 9.3.0-2 +- Drop numad usage, it is removed from f39 + * Tue May 02 2023 Cole Robinson - 9.3.0-1 - Update to version 9.3.0 From 3e211fa0f640d29d4a519752c59d9b9468ec7d73 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 25 May 2023 01:23:45 -0400 Subject: [PATCH 22/28] Disable numad also in RHEL 10+ builds As a result of numad being retired in F39+, it is also removed from ELN, and hence would be dropped from RHEL 10. Signed-off-by: Yaakov Selkowitz --- libvirt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec b/libvirt.spec index d230ca6..e47e639 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -173,7 +173,7 @@ %define with_numad 0%{!?_without_numad:1} %endif %endif -%if 0%{?fedora} >= 39 +%if 0%{?fedora} >= 39 || 0%{?rhel} >= 10 # numad is retired in fedora 39+, upstream is dead %define with_numad 0 %endif From 507eb37491c3c6f40359a2109c36e598c705dc95 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Wed, 28 Jun 2023 14:14:37 -0400 Subject: [PATCH 23/28] libvirt-9.4.0-1 Update to version 9.4.0 --- libvirt.spec | 10 +++++++--- sources | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libvirt.spec b/libvirt.spec index e47e639..4b05052 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -232,8 +232,8 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 9.3.0 -Release: 2%{?dist} +Version: 9.4.0 +Release: 1%{?dist} 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/ @@ -314,7 +314,7 @@ BuildRequires: util-linux %if %{with_qemu} # For managing ACLs BuildRequires: libacl-devel -# From QEMU RPMs +# From QEMU RPMs, used by virstoragetest BuildRequires: /usr/bin/qemu-img %endif # For LVM drivers @@ -1217,6 +1217,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec) %meson \ -Drunstatedir=%{_rundir} \ + -Dinitconfdir=%{_sysconfdir}/sysconfig \ %{?arg_qemu} \ %{?arg_openvz} \ %{?arg_lxc} \ @@ -2459,6 +2460,9 @@ exit 0 %changelog +* Wed Jun 28 2023 Cole Robinson - 9.4.0-1 +- Update to version 9.4.0 + * Tue May 23 2023 Cole Robinson - 9.3.0-2 - Drop numad usage, it is removed from f39 diff --git a/sources b/sources index e76c4ab..0f74d78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-9.3.0.tar.xz) = b9349dcd7798c76d75bb20afad67d6e676758cb201acaf7aed5109f0e91422b2bcca964a2f19aa8dc4fd0eca2923902474e16e3839bf8b15aca827028e88ddb7 +SHA512 (libvirt-9.4.0.tar.xz) = 8a8e3983c47c5ed5f4b50d90cb04e435717afddd27e16112ceeddda458d45c693daf65575f5d50274cfffcd1c83cbdd290819d8ece63f3bf9441b6bdaa309852 From eb9ceebe380d25ca7a6fe7c78704fa4c06b27d49 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Wed, 5 Jul 2023 10:23:08 -0400 Subject: [PATCH 24/28] spec: re-enable numad for fedora and eln numad was added back to the distro Signed-off-by: Cole Robinson --- libvirt.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libvirt.spec b/libvirt.spec index 4b05052..af2bcd8 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -173,10 +173,6 @@ %define with_numad 0%{!?_without_numad:1} %endif %endif -%if 0%{?fedora} >= 39 || 0%{?rhel} >= 10 - # numad is retired in fedora 39+, upstream is dead - %define with_numad 0 -%endif %ifarch %{arches_dmidecode} %define with_dmidecode 0%{!?_without_dmidecode:1} From cbf07f0551b291bfaeb2901429c298c62334c550 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Wed, 5 Jul 2023 10:24:18 -0400 Subject: [PATCH 25/28] libvirt-9.5.0-1 Update to version 9.5.0 --- libvirt.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libvirt.spec b/libvirt.spec index af2bcd8..e1d13ed 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -228,7 +228,7 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 9.4.0 +Version: 9.5.0 Release: 1%{?dist} 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/ @@ -2456,6 +2456,9 @@ exit 0 %changelog +* Wed Jul 05 2023 Cole Robinson - 9.5.0-1 +- Update to version 9.5.0 + * Wed Jun 28 2023 Cole Robinson - 9.4.0-1 - Update to version 9.4.0 diff --git a/sources b/sources index 0f74d78..d95bcb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-9.4.0.tar.xz) = 8a8e3983c47c5ed5f4b50d90cb04e435717afddd27e16112ceeddda458d45c693daf65575f5d50274cfffcd1c83cbdd290819d8ece63f3bf9441b6bdaa309852 +SHA512 (libvirt-9.5.0.tar.xz) = d8c40281856a60ba2a22a7a64721c4baee1803235227a973a22465aacfb26f674dc65045b87d0dcd183be324cb65408f253b4d72c2ed494fb809e98772eea2e3 From 200f2942a9d904f3aac09392401ccc2fdd5db997 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 12:28:15 +0000 Subject: [PATCH 26/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt.spec b/libvirt.spec index e1d13ed..3508ea2 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -229,7 +229,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 9.5.0 -Release: 1%{?dist} +Release: 2%{?dist} 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/ @@ -2456,6 +2456,9 @@ exit 0 %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 9.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jul 05 2023 Cole Robinson - 9.5.0-1 - Update to version 9.5.0 From adaeee1c2c4a23cdb7461fc1d36c3f2acf38829f Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 1 Aug 2023 08:10:39 -0400 Subject: [PATCH 27/28] libvirt-9.6.0-1 Update to version 9.6.0 --- libvirt.spec | 460 ++++++++++++++++++++++++++------------------------- sources | 2 +- 2 files changed, 238 insertions(+), 224 deletions(-) diff --git a/libvirt.spec b/libvirt.spec index 3508ea2..9e795da 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -4,7 +4,7 @@ # 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 33 +%define min_fedora 37 %define arches_qemu_kvm %{ix86} x86_64 %{power64} %{arm} aarch64 s390x %if 0%{?rhel} @@ -21,8 +21,8 @@ %define arches_systemtap_64bit %{arches_64bit} %define arches_dmidecode %{arches_x86} %define arches_xen %{arches_x86} aarch64 -%if 0%{?fedora} >= 36 - %define arches_xen x86_64 aarch64 +%if 0%{?fedora} + %define arches_xen x86_64 aarch64 %endif %define arches_vbox %{arches_x86} %define arches_ceph %{arches_64bit} @@ -134,7 +134,7 @@ %define with_firewalld_zone 0%{!?_without_firewalld_zone:1} -%if (0%{?fedora} && 0%{?fedora} < 34) || (0%{?rhel} && 0%{?rhel} < 9) +%if 0%{?rhel} && 0%{?rhel} < 9 %define with_netcf 0%{!?_without_netcf:1} %endif @@ -179,7 +179,7 @@ %endif %define with_modular_daemons 0 -%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9 +%if 0%{?fedora} || 0%{?rhel} >= 9 %define with_modular_daemons 1 %endif @@ -228,8 +228,8 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 9.5.0 -Release: 2%{?dist} +Version: 9.6.0 +Release: 1%{?dist} 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/ @@ -347,7 +347,7 @@ BuildRequires: libssh2-devel >= 1.3.0 %if %{with_netcf} BuildRequires: netcf-devel >= 0.2.2 %endif -%if (0%{?fedora} >= 36) || (0%{?rhel} >= 9) +%if 0%{?fedora} || 0%{?rhel} >= 9 BuildRequires: passt %endif %if %{with_esx} @@ -461,13 +461,14 @@ Requires: polkit >= 0.112 Requires: dmidecode %endif # For service management -Requires(post): /usr/bin/systemctl +Requires(posttrans): /usr/bin/systemctl +Requires(preun): /usr/bin/systemctl # libvirtd depends on 'messagebus' service Requires: dbus # For uid creation during pre Requires(pre): shadow-utils # Needed by /usr/libexec/libvirt-guests.sh script. -%if 0%{?fedora} >= 37 +%if 0%{?fedora} Requires: gettext-runtime %else Requires: gettext @@ -686,7 +687,7 @@ Requires: libvirt-libs = %{version}-%{release} %if 0%{?fedora} Requires: glusterfs-client >= 2.0.1 %endif - %if (0%{?fedora} || 0%{?with_storage_gluster}) + %if 0%{?fedora} || 0%{?with_storage_gluster} Requires: /usr/sbin/gluster %endif @@ -763,7 +764,7 @@ Requires: swtpm-tools %if %{with_numad} Requires: numad %endif - %if (0%{?fedora} >= 36) || (0%{?rhel} >= 9) + %if 0%{?fedora} || 0%{?rhel} >= 9 Recommends: passt Recommends: passt-selinux %endif @@ -1456,259 +1457,289 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh # raising the test timeout VIR_TEST_DEBUG=1 %meson_test --no-suite syntax-check --timeout-multiplier 10 -%define libvirt_daemon_schedule_restart() mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || : \ -/bin/systemctl is-active %1.service 1>/dev/null 2>&1 && \ - touch %{_localstatedir}/lib/rpm-state/libvirt/restart-%1 || : +%define libvirt_rpmstatedir %{_localstatedir}/lib/rpm-state/libvirt -%define libvirt_daemon_finish_restart() rm -f %{_localstatedir}/lib/rpm-state/libvirt/restart-%1 \ -rmdir %{_localstatedir}/lib/rpm-state/libvirt 2>/dev/null || : +# Mark units such that presets will later be applied to them. Meant +# to be called during %pre. Units that already exist on the system +# will not be marked, with the assumption that presets have already +# been applied at some point in the past. This makes it safe to call +# this macro for all units each time %pre runs. +%define libvirt_systemd_schedule_preset() \ + mkdir -p %{libvirt_rpmstatedir} || : \ + for unit in %{?*}; do \ + if ! test -e %{_unitdir}/$unit; then \ + touch %{libvirt_rpmstatedir}/preset-$unit || : \ + fi \ + done \ + %{nil} -%define libvirt_daemon_needs_restart() -f %{_localstatedir}/lib/rpm-state/libvirt/restart-%1 +# Apply presets for units that have previously been marked. Meant to +# be called during %posttrans. Note that foo.service must be passed +# as the first argument, before all the various foo*.socket +# associated with it, for things to work correctly. This is necessary +# because Also=foo.socket is usually present in foo.service's +# [Install] section, and we want that configuration to take +# precedence over foo.socket's own presets. +%define libvirt_systemd_perform_preset() \ + %{?7:%{error:Too many arguments}} \ + for unit in %{?2} %{?3} %{?4} %{?5} %{?6} %1; do \ + if test -e %{libvirt_rpmstatedir}/preset-$unit; then \ + /usr/bin/systemctl --no-reload preset $unit || : \ + fi \ + rm -f %{libvirt_rpmstatedir}/preset-$unit \ + done \ + rmdir %{libvirt_rpmstatedir} 2>/dev/null || : \ + %{nil} -%define libvirt_daemon_perform_restart() if test %libvirt_daemon_needs_restart %1 \ -then \ - /bin/systemctl try-restart %1.service >/dev/null 2>&1 || : \ -fi \ -%libvirt_daemon_finish_restart %1 +# Mark a single unit for restart. Meant to be called during %pre. +%define libvirt_systemd_schedule_restart() \ + mkdir -p %{libvirt_rpmstatedir} || : \ + touch %{libvirt_rpmstatedir}/restart-%1 || : \ + %{nil} + +# Restart a unit that was previously marked. Meant to be called +# during %posttrans. If systemd is not running, no action will be +# performed. +%define libvirt_systemd_perform_restart() \ + if test -d /run/systemd/system && \ + test -e %{libvirt_rpmstatedir}/restart-%1; then \ + /usr/bin/systemctl try-restart %1 >/dev/null 2>&1 || : \ + fi \ + rm -f %{libvirt_rpmstatedir}/restart-%1 \ + rmdir %{libvirt_rpmstatedir} 2>/dev/null || : \ + %{nil} + +# Mark a single unit for reload. Meant to be called during %pre. +%define libvirt_systemd_schedule_reload() \ + mkdir -p %{libvirt_rpmstatedir} || : \ + touch %{libvirt_rpmstatedir}/reload-%1 || : \ + %{nil} + +# Reload a unit that was previously marked. Meant to be called during +# %posttrans. If systemd is not running, no action will be performed. +%define libvirt_systemd_perform_reload() \ + if test -d /run/systemd/system && \ + test -e %{libvirt_rpmstatedir}/reload-%1; then \ + /usr/bin/systemctl try-reload-or-restart %1 >/dev/null 2>&1 || : \ + fi \ + rm -f %{libvirt_rpmstatedir}/reload-%1 \ + rmdir %{libvirt_rpmstatedir} 2>/dev/null || : \ + %{nil} + +# Disable a single unit, optionally stopping it if systemd is +# running. Meant to be called during %preun. +%define libvirt_systemd_disable() \ + if test -d /run/systemd/system; then \ + /usr/bin/systemctl --no-reload disable --now %{?*} || : \ + else \ + /usr/bin/systemctl --no-reload disable %{?*} || : \ + fi \ + %{nil} + +# %pre implementation for services that should be restarted on +# upgrade. Note that foo.service must be passed as the first +# argument, before all the various foo*.socket associated with it. +%define libvirt_systemd_restart_pre() \ + %libvirt_systemd_schedule_preset %{?*} \ + %libvirt_systemd_schedule_restart %1 \ + %{nil} + +# %pre implementation for services that should be reloaded on +# upgrade. Note that foo.service must be passed as the first +# argument, before all the various foo*.socket associated with it. +%define libvirt_systemd_reload_pre() \ + %libvirt_systemd_schedule_preset %{?*} \ + %libvirt_systemd_schedule_reload %1 \ + %{nil} + +# %pre implementation for services that should be neither restarted +# nor reloaded on upgrade. +%define libvirt_systemd_noaction_pre() \ + %libvirt_systemd_schedule_preset %{?*} \ + %{nil} + +# %posttrans implementation for all services. We can use a single +# macro to cover all scenarios, because each operation will only be +# performed if it had previously been scheduled. Note that +# foo.service must be passed as the first argument, before all the +# various foo*.socket associated with it. +%define libvirt_systemd_posttrans() \ + %libvirt_systemd_perform_preset %{?*} \ + %libvirt_systemd_perform_reload %1 \ + %libvirt_systemd_perform_restart %1 \ + %{nil} + +# %preun implementation for all services. +%define libvirt_systemd_preun() \ + if [ $1 -lt 1 ]; then \ + %libvirt_systemd_disable %{?*} \ + fi \ + %{nil} # For daemons with only UNIX sockets -%define libvirt_daemon_systemd_post() %systemd_post %1.socket %1-ro.socket %1-admin.socket %1.service -%define libvirt_daemon_systemd_preun() %systemd_preun %1.service %1-ro.socket %1-admin.socket %1.socket + +%define libvirt_systemd_unix_pre() %libvirt_systemd_restart_pre %1.service %1.socket %1-ro.socket %1-admin.socket +%define libvirt_systemd_unix_posttrans() %libvirt_systemd_posttrans %1.service %1.socket %1-ro.socket %1-admin.socket +%define libvirt_systemd_unix_preun() %libvirt_systemd_preun %1.service %1.socket %1-ro.socket %1-admin.socket # For daemons with UNIX and INET sockets -%define libvirt_daemon_systemd_post_inet() %systemd_post %1.socket %1-ro.socket %1-admin.socket %1-tls.socket %1-tcp.socket %1.service -%define libvirt_daemon_systemd_preun_inet() %systemd_preun %1.service %1-ro.socket %1-admin.socket %1-tls.socket %1-tcp.socket %1.socket +%define libvirt_systemd_inet_pre() %libvirt_systemd_restart_pre %1.service %1.socket %1-ro.socket %1-admin.socket %1-tls.socket %1-tcp.socket +%define libvirt_systemd_inet_posttrans() %libvirt_systemd_posttrans %1.service %1.socket %1-ro.socket %1-admin.socket %1-tls.socket %1-tcp.socket +%define libvirt_systemd_inet_preun() %libvirt_systemd_preun %1.service %1.socket %1-ro.socket %1-admin.socket %1-tls.socket %1-tcp.socket # For daemons with only UNIX sockets and no unprivileged read-only access -%define libvirt_daemon_systemd_post_priv() %systemd_post %1.socket %1-admin.socket %1.service -%define libvirt_daemon_systemd_preun_priv() %systemd_preun %1.service %1-admin.socket %1.socket +%define libvirt_systemd_privileged_pre() %libvirt_systemd_reload_pre %1.service %1.socket %1-admin.socket +%define libvirt_systemd_privileged_posttrans() %libvirt_systemd_posttrans %1.service %1.socket %1-admin.socket +%define libvirt_systemd_privileged_preun() %libvirt_systemd_preun %1.service %1.socket %1-admin.socket + +# For one-shot daemons that have no associated sockets and should never be restarted +%define libvirt_systemd_oneshot_pre() %libvirt_systemd_noaction_pre %1.service +%define libvirt_systemd_oneshot_posttrans() %libvirt_systemd_posttrans %1.service +%define libvirt_systemd_oneshot_preun() %libvirt_systemd_preun %1.service + +# For packages that install configuration for other daemons +%define libvirt_systemd_config_pre() %libvirt_systemd_schedule_restart %1.service +%define libvirt_systemd_config_posttrans() %libvirt_systemd_perform_restart %1.service %pre daemon %libvirt_sysconfig_pre libvirtd - -%post daemon -%if ! %{with_modular_daemons} -%libvirt_daemon_systemd_post_inet libvirtd -%endif -%libvirt_daemon_schedule_restart libvirtd - -%preun daemon -%libvirt_daemon_systemd_preun_inet libvirtd +%libvirt_systemd_inet_pre libvirtd %posttrans daemon %libvirt_sysconfig_posttrans libvirtd -if test %libvirt_daemon_needs_restart libvirtd -then - # See if user has previously modified their install to - # tell libvirtd to use --listen - grep -E '^LIBVIRTD_ARGS=.*--listen' /etc/sysconfig/libvirtd 1>/dev/null 2>&1 - if test $? = 0 - then - # Then lets keep honouring --listen and *not* use - # systemd socket activation, because switching things - # might confuse mgmt tool like puppet/ansible that - # expect the old style libvirtd - /bin/systemctl mask \ - libvirtd.socket \ - libvirtd-ro.socket \ - libvirtd-admin.socket \ - libvirtd-tls.socket \ - libvirtd-tcp.socket >/dev/null 2>&1 || : - /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || : - else - # Old libvirtd owns the sockets and will delete them on - # shutdown. Can't use a try-restart as libvirtd will simply - # own the sockets again when it comes back up. Thus we must - # do this particular ordering, so that we get libvirtd - # running with socket activation in use - /bin/systemctl stop libvirtd.service >/dev/null 2>&1 || : - /bin/systemctl try-restart \ - libvirtd.socket \ - libvirtd-ro.socket \ - libvirtd-admin.socket >/dev/null 2>&1 || : - /bin/systemctl start libvirtd.service >/dev/null 2>&1 || : - fi -fi -%libvirt_daemon_finish_restart libvirtd +%libvirt_systemd_inet_posttrans libvirtd + +%preun daemon +%libvirt_systemd_inet_preun libvirtd %pre daemon-common %libvirt_sysconfig_pre libvirt-guests +%libvirt_systemd_oneshot_pre libvirt-guests # 'libvirt' group is just to allow password-less polkit access to libvirt # daemons. The uid number is irrelevant, so we use dynamic allocation. getent group libvirt >/dev/null || groupadd -r libvirt exit 0 -%post daemon-common -%systemd_post libvirt-guests.service - -%preun daemon-common -%systemd_preun libvirt-guests.service - -%postun daemon-common -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -%systemd_postun libvirt-guests.service - %posttrans daemon-common %libvirt_sysconfig_posttrans libvirt-guests +%libvirt_systemd_oneshot_posttrans libvirt-guests + +%preun daemon-common +%libvirt_systemd_oneshot_preun libvirt-guests %pre daemon-lock %libvirt_sysconfig_pre virtlockd - -%post daemon-lock -%libvirt_daemon_systemd_post_priv virtlockd - -%preun daemon-lock -%libvirt_daemon_systemd_preun_priv virtlockd - -%postun daemon-lock -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - /bin/systemctl reload-or-try-restart virtlockd.service >/dev/null 2>&1 || : -fi +%libvirt_systemd_privileged_pre virtlockd %posttrans daemon-lock %libvirt_sysconfig_posttrans virtlockd +%libvirt_systemd_privileged_posttrans virtlockd + +%preun daemon-lock +%libvirt_systemd_privileged_preun virtlockd %pre daemon-log %libvirt_sysconfig_pre virtlogd - -%post daemon-log -%libvirt_daemon_systemd_post_priv virtlogd - -%preun daemon-log -%libvirt_daemon_systemd_preun_priv virtlogd - -%postun daemon-log -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - /bin/systemctl reload-or-try-restart virtlogd.service >/dev/null 2>&1 || : -fi +%libvirt_systemd_privileged_pre virtlogd %posttrans daemon-log %libvirt_sysconfig_posttrans virtlogd +%libvirt_systemd_privileged_posttrans virtlogd + +%preun daemon-log +%libvirt_systemd_privileged_preun virtlogd %pre daemon-proxy %libvirt_sysconfig_pre virtproxyd - -%post daemon-proxy -%if %{with_modular_daemons} -%libvirt_daemon_systemd_post_inet virtproxyd -%endif - -%preun daemon-proxy -%libvirt_daemon_systemd_preun_inet virtproxyd +%libvirt_systemd_inet_pre virtproxyd %posttrans daemon-proxy %libvirt_sysconfig_posttrans virtproxyd +%libvirt_systemd_inet_posttrans virtproxyd + +%preun daemon-proxy +%libvirt_systemd_inet_preun virtproxyd %pre daemon-driver-network %libvirt_sysconfig_pre virtnetworkd +%libvirt_systemd_unix_pre virtnetworkd %post daemon-driver-network %if %{with_firewalld_zone} %firewalld_reload %endif -%if %{with_modular_daemons} -%libvirt_daemon_systemd_post virtnetworkd -%endif -%libvirt_daemon_schedule_restart virtnetworkd +%posttrans daemon-driver-network +%libvirt_sysconfig_posttrans virtnetworkd +%libvirt_systemd_unix_posttrans virtnetworkd %preun daemon-driver-network -%libvirt_daemon_systemd_preun virtnetworkd +%libvirt_systemd_unix_preun virtnetworkd %postun daemon-driver-network %if %{with_firewalld_zone} %firewalld_reload %endif -%posttrans daemon-driver-network -%libvirt_sysconfig_posttrans virtnetworkd -%libvirt_daemon_perform_restart virtnetworkd - %pre daemon-driver-nwfilter %libvirt_sysconfig_pre virtnwfilterd - -%post daemon-driver-nwfilter -%if %{with_modular_daemons} -%libvirt_daemon_systemd_post virtnwfilterd -%endif -%libvirt_daemon_schedule_restart virtnwfilterd - -%preun daemon-driver-nwfilter -%libvirt_daemon_systemd_preun virtnwfilterd +%libvirt_systemd_unix_pre virtnwfilterd %posttrans daemon-driver-nwfilter %libvirt_sysconfig_posttrans virtnwfilterd -%libvirt_daemon_perform_restart virtnwfilterd +%libvirt_systemd_unix_posttrans virtnwfilterd + +%preun daemon-driver-nwfilter +%libvirt_systemd_unix_preun virtnwfilterd %pre daemon-driver-nodedev %libvirt_sysconfig_pre virtnodedevd - -%post daemon-driver-nodedev -%if %{with_modular_daemons} -%libvirt_daemon_systemd_post virtnodedevd -%endif -%libvirt_daemon_schedule_restart virtnodedevd - -%preun daemon-driver-nodedev -%libvirt_daemon_systemd_preun virtnodedevd +%libvirt_systemd_unix_pre virtnodedevd %posttrans daemon-driver-nodedev %libvirt_sysconfig_posttrans virtnodedevd -%libvirt_daemon_perform_restart virtnodedevd +%libvirt_systemd_unix_posttrans virtnodedevd + +%preun daemon-driver-nodedev +%libvirt_systemd_unix_preun virtnodedevd %pre daemon-driver-interface %libvirt_sysconfig_pre virtinterfaced - -%post daemon-driver-interface -%if %{with_modular_daemons} -%libvirt_daemon_systemd_post virtinterfaced -%endif -%libvirt_daemon_schedule_restart virtinterfaced - -%preun daemon-driver-interface -%libvirt_daemon_systemd_preun virtinterfaced +%libvirt_systemd_unix_pre virtinterfaced %posttrans daemon-driver-interface %libvirt_sysconfig_posttrans virtinterfaced -%libvirt_daemon_perform_restart virtinterfaced +%libvirt_systemd_unix_posttrans virtinterfaced + +%preun daemon-driver-interface +%libvirt_systemd_unix_preun virtinterfaced %pre daemon-driver-secret %libvirt_sysconfig_pre virtsecretd - -%post daemon-driver-secret -%if %{with_modular_daemons} -%libvirt_daemon_systemd_post virtsecretd -%endif -%libvirt_daemon_schedule_restart virtsecretd - -%preun daemon-driver-secret -%libvirt_daemon_systemd_preun virtsecretd +%libvirt_systemd_unix_pre virsecretd %posttrans daemon-driver-secret %libvirt_sysconfig_posttrans virtsecretd -%libvirt_daemon_perform_restart virtsecretd +%libvirt_systemd_unix_posttrans virsecretd + +%preun daemon-driver-secret +%libvirt_systemd_unix_preun virsecretd %pre daemon-driver-storage-core %libvirt_sysconfig_pre virtstoraged - -%post daemon-driver-storage-core -%if %{with_modular_daemons} -%libvirt_daemon_systemd_post virtstoraged -%endif -%libvirt_daemon_schedule_restart virtstoraged - -%preun daemon-driver-storage-core -%libvirt_daemon_systemd_preun virtstoraged +%libvirt_systemd_unix_pre virtstoraged %posttrans daemon-driver-storage-core %libvirt_sysconfig_posttrans virtstoraged -%libvirt_daemon_perform_restart virtstoraged +%libvirt_systemd_unix_posttrans virtstoraged + +%preun daemon-driver-storage-core +%libvirt_systemd_unix_preun virtstoraged %if %{with_qemu} %pre daemon-driver-qemu %libvirt_sysconfig_pre virtqemud +%libvirt_systemd_unix_pre virtqemud # We want soft static allocation of well-known ids, as disk images # are commonly shared across NFS mounts by id rather than name; see # https://fedoraproject.org/wiki/Packaging:UsersAndGroups @@ -1723,74 +1754,57 @@ if ! getent passwd qemu >/dev/null; then fi exit 0 -%post daemon-driver-qemu - %if %{with_modular_daemons} -%libvirt_daemon_systemd_post virtqemud - %endif -%libvirt_daemon_schedule_restart virtqemud - -%preun daemon-driver-qemu -%libvirt_daemon_systemd_preun virtqemud - %posttrans daemon-driver-qemu %libvirt_sysconfig_posttrans virtqemud -%libvirt_daemon_perform_restart virtqemud +%libvirt_systemd_unix_posttrans virtqemud + +%preun daemon-driver-qemu +%libvirt_systemd_unix_preun virtqemud %endif %if %{with_lxc} %pre daemon-driver-lxc %libvirt_sysconfig_pre virtlxcd - -%post daemon-driver-lxc - %if %{with_modular_daemons} -%libvirt_daemon_systemd_post virtlxcd - %endif -%libvirt_daemon_schedule_restart virtlxcd - -%preun daemon-driver-lxc -%libvirt_daemon_systemd_preun virtlxcd +%libvirt_systemd_unix_pre virtlxcd %posttrans daemon-driver-lxc %libvirt_sysconfig_posttrans virtlxcd -%libvirt_daemon_perform_restart virtlxcd +%libvirt_systemd_unix_posttrans virtlxcd + +%preun daemon-driver-lxc +%libvirt_systemd_unix_preun virtlxcd %endif %if %{with_vbox} -%post daemon-driver-vbox - %if %{with_modular_daemons} -%libvirt_daemon_systemd_post virtvboxd - %endif -%libvirt_daemon_schedule_restart virtvboxd - %pre daemon-driver-vbox %libvirt_sysconfig_pre virtvboxd - -%preun daemon-driver-vbox -%libvirt_daemon_systemd_preun virtvboxd +%libvirt_systemd_unix_pre virtvboxd %posttrans daemon-driver-vbox %libvirt_sysconfig_posttrans virtvboxd -%libvirt_daemon_perform_restart virtvboxd +%libvirt_systemd_unix_posttrans virtvboxd + +%preun daemon-driver-vbox +%libvirt_systemd_unix_preun virtvboxd %endif %if %{with_libxl} -%post daemon-driver-libxl - %if %{with_modular_daemons} -%libvirt_daemon_systemd_post virtxend - %endif -%libvirt_daemon_schedule_restart virtxend - %pre daemon-driver-libxl %libvirt_sysconfig_pre virtxend - -%preun daemon-driver-libxl -%libvirt_daemon_systemd_preun virtxend +%libvirt_systemd_unix_pre virtxend %posttrans daemon-driver-libxl %libvirt_sysconfig_posttrans virtxend -%libvirt_daemon_perform_restart virtxend +%libvirt_systemd_unix_posttrans virtxend + +%preun daemon-driver-libxl +%libvirt_systemd_unix_preun virtxend %endif +%pre daemon-config-network +%libvirt_systemd_config_pre libvirtd +%libvirt_systemd_config_pre virtnetworkd + %post daemon-config-network if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; then # see if the network used by default network creates a conflict, @@ -1827,15 +1841,15 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml # libvirt saves this file with mode 0600 chmod 0600 %{_sysconfdir}/libvirt/qemu/networks/default.xml - - # Make sure libvirt picks up the new network defininiton - %libvirt_daemon_schedule_restart libvirtd - %libvirt_daemon_schedule_restart virtnetworkd fi %posttrans daemon-config-network -%libvirt_daemon_perform_restart libvirtd -%libvirt_daemon_perform_restart virtnetworkd +%libvirt_systemd_config_posttrans libvirtd +%libvirt_systemd_config_posttrans virtnetworkd + +%pre daemon-config-nwfilter +%libvirt_systemd_config_pre libvirtd +%libvirt_systemd_config_pre virtnwfilterd %post daemon-config-nwfilter for datadir_file in %{_datadir}/libvirt/nwfilter/*.xml; do @@ -1845,13 +1859,10 @@ for datadir_file in %{_datadir}/libvirt/nwfilter/*.xml; do install -m 0600 "$datadir_file" "$sysconfdir_file" fi done -# Make sure libvirt picks up the new nwfilter defininitons -%libvirt_daemon_schedule_restart libvirtd -%libvirt_daemon_schedule_restart virtnwfilterd %posttrans daemon-config-nwfilter -%libvirt_daemon_perform_restart libvirtd -%libvirt_daemon_perform_restart virtnwfilterd +%libvirt_systemd_config_posttrans libvirtd +%libvirt_systemd_config_posttrans virtnwfilterd %if %{with_lxc} %pre login-shell @@ -2456,6 +2467,9 @@ exit 0 %changelog +* Tue Aug 01 2023 Cole Robinson - 9.6.0-1 +- Update to version 9.6.0 + * Thu Jul 20 2023 Fedora Release Engineering - 9.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index d95bcb2..1f43dbb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-9.5.0.tar.xz) = d8c40281856a60ba2a22a7a64721c4baee1803235227a973a22465aacfb26f674dc65045b87d0dcd183be324cb65408f253b4d72c2ed494fb809e98772eea2e3 +SHA512 (libvirt-9.6.0.tar.xz) = 654d22cc71926715e103313f01a4f117a19dfcf3087ffe714cf2114dbc88e42ac33cc6c100c61e60f76f13468ff5f369b157748ca6cd69c4d504d4de6b6e44b4 From 5828ec5da6d0d2496a964e09f492672b254870c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Fri, 1 Sep 2023 12:27:46 +0100 Subject: [PATCH 28/28] Update to 9.7.0 release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- libvirt.spec | 18 ++++++++++++------ sources | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/libvirt.spec b/libvirt.spec index 9e795da..a648aeb 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -228,7 +228,7 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 9.6.0 +Version: 9.7.0 Release: 1%{?dist} 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/ @@ -830,6 +830,7 @@ Requires: libvirt-daemon-log = %{version}-%{release} Requires: libvirt-daemon-lock = %{version}-%{release} Requires: libvirt-daemon-plugin-lockd = %{version}-%{release} Requires: libvirt-daemon-proxy = %{version}-%{release} +Recommends: libvirt-daemon = %{version}-%{release} %else Requires: libvirt-daemon = %{version}-%{release} %endif @@ -857,6 +858,7 @@ Requires: libvirt-daemon-log = %{version}-%{release} Requires: libvirt-daemon-lock = %{version}-%{release} Requires: libvirt-daemon-plugin-lockd = %{version}-%{release} Requires: libvirt-daemon-proxy = %{version}-%{release} +Recommends: libvirt-daemon = %{version}-%{release} %else Requires: libvirt-daemon = %{version}-%{release} %endif @@ -881,6 +883,7 @@ Summary: Server side daemon & driver required to run LXC guests %if %{with_modular_daemons} Requires: libvirt-daemon-common = %{version}-%{release} Requires: libvirt-daemon-proxy = %{version}-%{release} +Recommends: libvirt-daemon = %{version}-%{release} %else Requires: libvirt-daemon = %{version}-%{release} %endif @@ -906,6 +909,7 @@ Requires: libvirt-daemon-common = %{version}-%{release} Requires: libvirt-daemon-lock = %{version}-%{release} Requires: libvirt-daemon-plugin-lockd = %{version}-%{release} Requires: libvirt-daemon-proxy = %{version}-%{release} +Recommends: libvirt-daemon = %{version}-%{release} %else Requires: libvirt-daemon = %{version}-%{release} %endif @@ -930,6 +934,7 @@ Summary: Server side daemon & driver required to run VirtualBox guests %if %{with_modular_daemons} Requires: libvirt-daemon-common = %{version}-%{release} Requires: libvirt-daemon-proxy = %{version}-%{release} +Recommends: libvirt-daemon = %{version}-%{release} %else Requires: libvirt-daemon = %{version}-%{release} %endif @@ -1716,14 +1721,14 @@ exit 0 %pre daemon-driver-secret %libvirt_sysconfig_pre virtsecretd -%libvirt_systemd_unix_pre virsecretd +%libvirt_systemd_unix_pre virtsecretd %posttrans daemon-driver-secret %libvirt_sysconfig_posttrans virtsecretd -%libvirt_systemd_unix_posttrans virsecretd +%libvirt_systemd_unix_posttrans virtsecretd %preun daemon-driver-secret -%libvirt_systemd_unix_preun virsecretd +%libvirt_systemd_unix_preun virtsecretd %pre daemon-driver-storage-core %libvirt_sysconfig_pre virtstoraged @@ -2135,8 +2140,6 @@ exit 0 %ghost %dir %{_rundir}/libvirt/qemu/slirp/ %ghost %dir %{_rundir}/libvirt/qemu/swtpm/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ -%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/ -%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/checkpoint/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/dump/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/nvram/ @@ -2467,6 +2470,9 @@ exit 0 %changelog +* Fri Sep 1 2023 Daniel P. Berrangé - 9.7.0-1 +- Update to version 9.7.0 + * Tue Aug 01 2023 Cole Robinson - 9.6.0-1 - Update to version 9.6.0 diff --git a/sources b/sources index 1f43dbb..502c1a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-9.6.0.tar.xz) = 654d22cc71926715e103313f01a4f117a19dfcf3087ffe714cf2114dbc88e42ac33cc6c100c61e60f76f13468ff5f369b157748ca6cd69c4d504d4de6b6e44b4 +SHA512 (libvirt-9.7.0.tar.xz) = dd771822c0fa0861a32cab9d7f82235b101867fa0a4e8cf9a857ddfb2347e41b625b1e6f8791c4b3543fec836a1a23cae1fac4ce4b40debd51f2097bae46c949