- updated to 10.2.0

diff --git a/libvirt-path-options.patch b/libvirt-path-options.patch
index 9761857387c562b5b2057d0ef31ab543f63ab2c0..bd23574cc4fad2caa5b93d8483962bcf56a7f935 100644 (file)
--- a/libvirt-path-options.patch
+++ b/libvirt-path-options.patch
@@ -1,8 +1,8 @@
---- libvirt-9.10.0/meson.build.orig    2023-12-01 16:11:26.000000000 +0100
-+++ libvirt-9.10.0/meson.build 2024-04-06 08:09:14.274063626 +0200
-@@ -824,16 +824,19 @@ optional_programs = [
- ]
+--- libvirt-10.2.0/meson.build.orig    2024-04-02 13:38:48.000000000 +0200
++++ libvirt-10.2.0/meson.build 2024-05-01 06:11:02.127427471 +0200
+@@ -833,8 +833,10 @@ optional_programs = [
  
+ missing_optional_programs = []
  foreach name : optional_programs
 + varname = name.underscorify()
 + prog_path = get_option('@0@_path'.format(varname))
@@ -12,7 +12,9 @@
    if prog.found()
      prog_path = prog.full_path()
    else
-     prog_path = name
+@@ -843,9 +845,10 @@ foreach name : optional_programs
+       missing_optional_programs += [ name ]
+     endif
    endif
 + endif
  
@@ -22,7 +24,7 @@
  endforeach
  
  
-@@ -1675,6 +1678,8 @@ if not get_option('driver_qemu').disable
+@@ -1697,6 +1700,8 @@ if not get_option('driver_qemu').disable
      conf.set_quoted('QEMU_USER', qemu_user)
      conf.set_quoted('QEMU_GROUP', qemu_group)
  
@@ -31,7 +33,7 @@
      qemu_slirp_prog = find_program(
        'slirp-helper',
        dirs: [ '/usr/bin', '/usr/libexec' ],
-@@ -1685,6 +1690,7 @@ if not get_option('driver_qemu').disable
+@@ -1707,6 +1712,7 @@ if not get_option('driver_qemu').disable
      else
        qemu_slirp_path = '/usr/bin/slirp-helper'
      endif
@@ -39,7 +41,7 @@
      conf.set_quoted('QEMU_SLIRP_HELPER', qemu_slirp_path)
    endif
  endif
-@@ -1764,11 +1770,29 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1786,11 +1792,29 @@ if conf.has('WITH_LIBVIRTD')
      endif
  
      if fs_enable
@@ -70,7 +72,7 @@
          fs_enable = false
        endif
      endif
-@@ -1777,15 +1801,17 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1799,15 +1823,17 @@ if conf.has('WITH_LIBVIRTD')
        use_storage = true
  
        conf.set('WITH_STORAGE_FS', 1)
@@ -92,7 +94,7 @@
        conf.set_quoted('SHOWMOUNT', showmount_path)
      endif
    endif
-@@ -1797,7 +1823,7 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1819,7 +1845,7 @@ if conf.has('WITH_LIBVIRTD')
      error('Need glusterfs (libgfapi) for gluster storage driver')
    endif
  
@@ -101,7 +103,7 @@
      use_storage = true
      conf.set('WITH_STORAGE_ISCSI', 1)
    elif get_option('storage_iscsi').enabled()
-@@ -1820,11 +1846,17 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1842,11 +1868,17 @@ if conf.has('WITH_LIBVIRTD')
        'pvs', 'vgs', 'lvs',
      ]
      foreach name : lvm_progs
@@ -122,7 +124,7 @@
          lvm_enable = false
        endif
      endforeach
-@@ -1834,7 +1866,7 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1856,7 +1888,7 @@ if conf.has('WITH_LIBVIRTD')
        conf.set('WITH_STORAGE_LVM', 1)
  
        foreach name : lvm_progs
@@ -131,7 +133,7 @@
        endforeach
      endif
    endif
-@@ -1985,10 +2017,16 @@ if not get_option('nss').disabled()
+@@ -2007,10 +2039,16 @@ if not get_option('nss').disabled()
  endif
  
  if not get_option('numad').disabled() and numactl_dep.found()
@@ -194,11 +196,11 @@
            files('@0@-structs'.format(proto['name'])),
          ],
          env: runutf8,
---- libvirt-8.8.0/meson_options.txt.orig       2020-12-01 09:51:29.000000000 +0100
-+++ libvirt-8.8.0/meson_options.txt    2022-06-15 21:47:27.468263121 +0200
-@@ -102,3 +102,50 @@ option('numad', type: 'feature', value:
- option('pm_utils', type: 'feature', value: 'auto', description: 'use pm-utils for power management')
+--- libvirt-10.2.0/meson_options.txt.orig      2024-05-01 06:12:22.153660598 +0200
++++ libvirt-10.2.0/meson_options.txt   2024-05-01 06:12:47.590189463 +0200
+@@ -110,3 +110,50 @@ option('pm_utils', type: 'feature', valu
  option('sysctl_config', type: 'feature', value: 'auto', description: 'Whether to install sysctl configs')
+ option('userfaultfd_sysctl', type: 'feature', value: 'auto', description: 'Whether to install sysctl config for enabling unprivileged userfaultfd')
  option('tls_priority', type: 'string', value: 'NORMAL', description: 'set the default TLS session priority string')
 +
 +option('addr2line_path', type: 'string', value: '', description: 'executable path')

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index e260cdabc720cc3073e450801113834e93c707df..ceb3855061ed45d90e9f756b96c20a675945c386 100644 (file)
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -132,8 +132,8 @@ diff -ur libvirt-8.4.0/src/remote/meson.build libvirt-8.4.0-sasl/src/remote/meso
      rename: [ 'libvirt.conf' ],
    )
  endif
---- libvirt-9.10.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args.orig  2024-04-05 22:06:12.593409940 +0200
-+++ libvirt-9.10.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args       2024-04-05 22:13:33.401021880 +0200
+--- libvirt-10.2.0/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args.orig   2024-04-05 22:06:12.593409940 +0200
++++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args        2024-04-05 22:13:33.401021880 +0200
 @@ -6,7 +6,7 @@ LOGNAME=test \
  XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
@@ -143,8 +143,8 @@ diff -ur libvirt-8.4.0/src/remote/meson.build libvirt-8.4.0-sasl/src/remote/meso
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
---- libvirt-9.10.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args.orig    2024-04-05 22:06:12.796742172 +0200
-+++ libvirt-9.10.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args 2024-04-05 22:13:53.787578103 +0200
+--- libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args.orig     2024-04-05 22:06:12.796742172 +0200
++++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args  2024-04-05 22:13:53.787578103 +0200
 @@ -6,7 +6,7 @@ LOGNAME=test \
  XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
@@ -154,8 +154,8 @@ diff -ur libvirt-8.4.0/src/remote/meson.build libvirt-8.4.0-sasl/src/remote/meso
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
---- libvirt-9.10.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args.orig       2024-04-05 22:06:12.800075487 +0200
-+++ libvirt-9.10.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args    2024-04-05 22:14:10.387488174 +0200
+--- libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args.orig        2024-04-05 22:06:12.800075487 +0200
++++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args     2024-04-05 22:14:10.387488174 +0200
 @@ -6,7 +6,7 @@ LOGNAME=test \
  XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
@@ -165,8 +165,8 @@ diff -ur libvirt-8.4.0/src/remote/meson.build libvirt-8.4.0-sasl/src/remote/meso
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
---- libvirt-9.10.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args.orig      2024-04-05 22:06:12.843408586 +0200
-+++ libvirt-9.10.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args   2024-04-05 22:14:23.584083348 +0200
+--- libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args.orig       2024-04-05 22:06:12.843408586 +0200
++++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args    2024-04-05 22:14:23.584083348 +0200
 @@ -6,7 +6,7 @@ LOGNAME=test \
  XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
@@ -176,8 +176,8 @@ diff -ur libvirt-8.4.0/src/remote/meson.build libvirt-8.4.0-sasl/src/remote/meso
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
---- libvirt-9.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args.orig     2024-04-05 22:06:12.853408531 +0200
-+++ libvirt-9.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args  2024-04-05 22:14:38.737334590 +0200
+--- libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args.orig      2024-04-05 22:06:12.853408531 +0200
++++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args   2024-04-05 22:14:38.737334590 +0200
 @@ -6,7 +6,7 @@ LOGNAME=test \
  XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \

diff --git a/libvirt.spec b/libvirt.spec
index aa08e84988d6f9e0d893995194a315516bce1238..1ab82e491360c3944b9adfa7609df05ed64c8251 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -45,12 +45,12 @@
 Summary:       Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):     Narzędzia współpracujące z funkcjami wirtualizacji
 Name:          libvirt
-Version:       9.10.0
+Version:       10.2.0
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       https://download.libvirt.org/%{name}-%{version}.tar.xz
-# Source0-md5: c546d8745508bd95147bc749dea82ff1
+# Source0-md5: f0856217199b32447704fb741d4a8edc
 Source1:       %{name}.init
 Source2:       %{name}.tmpfiles
 Patch0:                %{name}-sasl.patch