From 5c29505bcc2663be27bcef0187e6405b42466a1f162d0bc3475dbba0c34c3df1 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Wed, 2 Aug 2023 22:57:24 +0000 Subject: [PATCH 1/3] - Update to libvirt 9.6.0 - Many incremental improvements and bug fixes, see https://libvirt.org/news.html#v9-6-0-2023-08-01 - spec: Unconditionally enable modular daemons - spec: Remove logic handling package upgrade from old libvirtd OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=993 --- libvirt-9.5.0.tar.xz | 3 - libvirt-9.6.0.tar.xz | 3 + libvirt.changes | 9 +++ libvirt.spec | 129 ++++++++----------------------------------- 4 files changed, 35 insertions(+), 109 deletions(-) delete mode 100644 libvirt-9.5.0.tar.xz create mode 100644 libvirt-9.6.0.tar.xz diff --git a/libvirt-9.5.0.tar.xz b/libvirt-9.5.0.tar.xz deleted file mode 100644 index 832538d..0000000 --- a/libvirt-9.5.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73b07462476842cfaea1bf375d31f2938ae20196dc389e54d378514df0811602 -size 9604788 diff --git a/libvirt-9.6.0.tar.xz b/libvirt-9.6.0.tar.xz new file mode 100644 index 0000000..d87765d --- /dev/null +++ b/libvirt-9.6.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02e7463892b0c066d7fc216deadca53848c6bf56aeef161922b32e2fd91a6b8e +size 9622992 diff --git a/libvirt.changes b/libvirt.changes index 33dfc3d..f3493ac 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Aug 2 22:42:41 UTC 2023 - James Fehlig + +- Update to libvirt 9.6.0 + - Many incremental improvements and bug fixes, see + https://libvirt.org/news.html#v9-6-0-2023-08-01 +- spec: Unconditionally enable modular daemons +- spec: Remove logic handling package upgrade from old libvirtd + ------------------------------------------------------------------- Thu Jul 20 21:44:18 UTC 2023 - James Fehlig diff --git a/libvirt.spec b/libvirt.spec index d03c535..54d6179 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -46,6 +46,7 @@ %define with_wireshark 1 %define with_libssh2 1 %define with_numactl 1 +%define with_modular_daemons 1 # A few optional bits off by default, we enable later %define with_numad 0 @@ -123,11 +124,6 @@ %endif %endif -%define with_modular_daemons 0 -%if 0%{?suse_version} > 1500 - %define with_modular_daemons 1 -%endif - # Force QEMU to run as qemu:qemu %define qemu_user qemu %define qemu_group qemu @@ -144,7 +140,7 @@ Name: libvirt URL: https://libvirt.org/ -Version: 9.5.0 +Version: 9.6.0 Release: 0 Summary: Library providing a virtualization API License: LGPL-2.1-or-later @@ -1168,27 +1164,20 @@ VIR_TEST_DEBUG=1 %meson_test -t 5 --no-suite syntax-check %define libvirt_daemon_systemd_postun_priv_restart() %service_del_postun %1.service %1-admin.socket %1.socket %pre daemon -%if ! %{with_modular_daemons} %libvirt_daemon_systemd_pre_inet libvirtd -%endif %libvirt_logrotate_pre libvirtd %post daemon %if %{with_apparmor} %apparmor_reload /etc/apparmor.d/usr.sbin.libvirtd %endif -%if ! %{with_modular_daemons} %libvirt_daemon_systemd_post_inet libvirtd -%endif %preun daemon %libvirt_daemon_systemd_preun_inet libvirtd %postun daemon -# Handle restart/reload in posttrans -%if ! %{with_modular_daemons} %libvirt_daemon_systemd_postun_inet libvirtd -%endif %posttrans daemon %libvirt_logrotate_posttrans libvirtd @@ -1197,37 +1186,8 @@ VIR_TEST_DEBUG=1 %meson_test -t 5 --no-suite syntax-check test -f %{_sysconfdir}/sysconfig/services && \ test -z "$DISABLE_RESTART_ON_UPDATE" && . %{_sysconfdir}/sysconfig/services if test "$DISABLE_RESTART_ON_UPDATE" != yes && \ - test "$DISABLE_RESTART_ON_UPDATE" != 1; then - # See if user has previously modified their install to - # tell libvirtd to use --listen - if grep -q -s -E '^LIBVIRTD_ARGS=.*--listen' %{_sysconfdir}/sysconfig/libvirtd; then - # Keep honouring --listen and *not* use systemd socket activation. - # Switching things might confuse management tools that expect the old - # style libvirtd - %{_bindir}/systemctl mask \ - libvirtd.socket \ - libvirtd-ro.socket \ - libvirtd-admin.socket \ - libvirtd-tls.socket \ - libvirtd-tcp.socket >/dev/null 2>&1 || : - %{_bindir}/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 - if %{_bindir}/systemctl -q is-active libvirtd.service; then - %{_bindir}/systemctl stop libvirtd.service >/dev/null 2>&1 || : - - %{_bindir}/systemctl try-restart \ - libvirtd.socket \ - libvirtd-ro.socket \ - libvirtd-admin.socket >/dev/null 2>&1 || : - - %{_bindir}/systemctl start libvirtd.service >/dev/null 2>&1 || : - fi - fi + test "$DISABLE_RESTART_ON_UPDATE" != 1; then + %{_bindir}/systemctl try-restart libvirtd.service >/dev/null 2>&1 || : fi %pre daemon-common @@ -1248,23 +1208,16 @@ fi %service_del_postun_without_restart libvirt-guests.service %pre daemon-proxy -%if %{with_modular_daemons} %libvirt_daemon_systemd_pre_inet virtproxyd -%endif %post daemon-proxy -%if %{with_modular_daemons} - %libvirt_daemon_systemd_post_inet virtproxyd -%endif +%libvirt_daemon_systemd_post_inet virtproxyd %preun daemon-proxy %libvirt_daemon_systemd_preun_inet virtproxyd %postun daemon-proxy -# Handle restart/reload in posttrans -%if %{with_modular_daemons} %libvirt_daemon_systemd_postun_inet virtproxyd -%endif %pre daemon-lock %libvirt_daemon_systemd_pre_priv virtlockd @@ -1307,9 +1260,7 @@ fi %if %{with_firewalld_zone} %firewalld_reload %endif -%if %{with_modular_daemons} - %libvirt_daemon_systemd_post virtnetworkd -%endif +%libvirt_daemon_systemd_post virtnetworkd %preun daemon-driver-network %libvirt_daemon_systemd_preun virtnetworkd @@ -1318,9 +1269,7 @@ fi %if %{with_firewalld_zone} %firewalld_reload %endif -%if %{with_modular_daemons} - %libvirt_daemon_systemd_postun_restart virtnetworkd -%endif +%libvirt_daemon_systemd_postun_restart virtnetworkd %post daemon-config-network # Install the default network if one doesn't exist @@ -1334,81 +1283,61 @@ fi %libvirt_daemon_systemd_pre virtnwfilterd %post daemon-driver-nwfilter -%if %{with_modular_daemons} - %libvirt_daemon_systemd_post virtnwfilterd -%endif +%libvirt_daemon_systemd_post virtnwfilterd %preun daemon-driver-nwfilter %libvirt_daemon_systemd_preun virtnwfilterd %postun daemon-driver-nwfilter -%if %{with_modular_daemons} - %libvirt_daemon_systemd_postun_restart virtnwfilterd -%endif +%libvirt_daemon_systemd_postun_restart virtnwfilterd %pre daemon-driver-storage-core %libvirt_daemon_systemd_pre virtstoraged %post daemon-driver-storage-core -%if %{with_modular_daemons} - %libvirt_daemon_systemd_post virtstoraged -%endif +%libvirt_daemon_systemd_post virtstoraged %preun daemon-driver-storage-core %libvirt_daemon_systemd_preun virtstoraged %postun daemon-driver-storage-core -%if %{with_modular_daemons} - %libvirt_daemon_systemd_postun_restart virtstoraged -%endif +%libvirt_daemon_systemd_postun_restart virtstoraged %pre daemon-driver-interface %libvirt_daemon_systemd_pre virtinterfaced %post daemon-driver-interface -%if %{with_modular_daemons} - %libvirt_daemon_systemd_post virtinterfaced -%endif +%libvirt_daemon_systemd_post virtinterfaced %preun daemon-driver-interface %libvirt_daemon_systemd_preun virtinterfaced %postun daemon-driver-interface -%if %{with_modular_daemons} - %libvirt_daemon_systemd_postun_restart virtinterfaced -%endif +%libvirt_daemon_systemd_postun_restart virtinterfaced %pre daemon-driver-nodedev %libvirt_daemon_systemd_pre virtnodedevd %post daemon-driver-nodedev -%if %{with_modular_daemons} - %libvirt_daemon_systemd_post virtnodedevd -%endif +%libvirt_daemon_systemd_post virtnodedevd %preun daemon-driver-nodedev %libvirt_daemon_systemd_preun virtnodedevd %postun daemon-driver-nodedev -%if %{with_modular_daemons} - %libvirt_daemon_systemd_postun_restart virtnodedevd -%endif +%libvirt_daemon_systemd_postun_restart virtnodedevd %pre daemon-driver-secret %libvirt_daemon_systemd_pre virtsecretd %post daemon-driver-secret -%if %{with_modular_daemons} - %libvirt_daemon_systemd_post virtsecretd -%endif +%libvirt_daemon_systemd_post virtsecretd %preun daemon-driver-secret %libvirt_daemon_systemd_preun virtsecretd %postun daemon-driver-secret -%if %{with_modular_daemons} - %libvirt_daemon_systemd_postun_restart virtsecretd -%endif +%libvirt_daemon_systemd_postun_restart virtsecretd %pre daemon-driver-qemu %libvirt_daemon_systemd_pre virtqemud @@ -1418,17 +1347,13 @@ fi %if %{with_apparmor} %apparmor_reload /etc/apparmor.d/usr.sbin.virtqemud %endif -%if %{with_modular_daemons} - %libvirt_daemon_systemd_post virtqemud -%endif +%libvirt_daemon_systemd_post virtqemud %preun daemon-driver-qemu %libvirt_daemon_systemd_preun virtqemud %postun daemon-driver-qemu -%if %{with_modular_daemons} - %libvirt_daemon_systemd_postun_restart virtqemud -%endif +%libvirt_daemon_systemd_postun_restart virtqemud %posttrans daemon-driver-qemu %libvirt_logrotate_posttrans libvirtd.qemu @@ -1438,17 +1363,13 @@ fi %libvirt_logrotate_pre libvirtd.lxc %post daemon-driver-lxc -%if %{with_modular_daemons} - %libvirt_daemon_systemd_post virtlxcd -%endif +%libvirt_daemon_systemd_post virtlxcd %preun daemon-driver-lxc %libvirt_daemon_systemd_preun virtlxcd %postun daemon-driver-lxc -%if %{with_modular_daemons} - %libvirt_daemon_systemd_postun_restart virtlxcd -%endif +%libvirt_daemon_systemd_postun_restart virtlxcd %posttrans daemon-driver-lxc %libvirt_logrotate_posttrans libvirtd.lxc @@ -1461,17 +1382,13 @@ fi %if %{with_apparmor} %apparmor_reload /etc/apparmor.d/usr.sbin.virtxend %endif -%if %{with_modular_daemons} - %libvirt_daemon_systemd_post virtxend -%endif +%libvirt_daemon_systemd_post virtxend %preun daemon-driver-libxl %libvirt_daemon_systemd_preun virtxend %postun daemon-driver-libxl -%if %{with_modular_daemons} - %libvirt_daemon_systemd_postun_restart virtxend -%endif +%libvirt_daemon_systemd_postun_restart virtxend %posttrans daemon-driver-libxl %libvirt_logrotate_posttrans libvirtd.libxl From 499aeca923fe159743a1c72824b73162f759ee62bfe3b100f49ff72d9076727b Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Thu, 3 Aug 2023 16:21:16 +0000 Subject: [PATCH 2/3] add jira reference to changelog OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=994 --- libvirt.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.changes b/libvirt.changes index f3493ac..d58143e 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -4,6 +4,7 @@ Wed Aug 2 22:42:41 UTC 2023 - James Fehlig - Update to libvirt 9.6.0 - Many incremental improvements and bug fixes, see https://libvirt.org/news.html#v9-6-0-2023-08-01 + - jsc#PED-3725 - spec: Unconditionally enable modular daemons - spec: Remove logic handling package upgrade from old libvirtd From 45c11fa4b669090b56e8f750839bda939331e4938da27e9a9d5b6e6d284749f0 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Fri, 4 Aug 2023 16:38:27 +0000 Subject: [PATCH 3/3] Add upstream commit 3d2f3fb72b to fix max file limits in systemd services OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=995 --- libvirt-9.6.0.tar.xz | 4 ++-- libvirt.changes | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libvirt-9.6.0.tar.xz b/libvirt-9.6.0.tar.xz index d87765d..f523b1a 100644 --- a/libvirt-9.6.0.tar.xz +++ b/libvirt-9.6.0.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02e7463892b0c066d7fc216deadca53848c6bf56aeef161922b32e2fd91a6b8e -size 9622992 +oid sha256:158450159f7196bc1e75c3be00bf7e1f06d822bb932f90f55e2e83ef39644640 +size 9623016 diff --git a/libvirt.changes b/libvirt.changes index d58143e..e7a6fe4 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 4 16:34:38 UTC 2023 - James Fehlig + +- Add upstream commit 3d2f3fb72b to fix max file limits in systemd + services + ------------------------------------------------------------------- Wed Aug 2 22:42:41 UTC 2023 - James Fehlig