- updated to 9.10.0

diff --git a/libvirt-path-options.patch b/libvirt-path-options.patch
index 1b575ea7c64fe48b8f349af1187735c535a06da1..9761857387c562b5b2057d0ef31ab543f63ab2c0 100644 (file)
--- a/libvirt-path-options.patch
+++ b/libvirt-path-options.patch
@@ -1,6 +1,6 @@
---- libvirt-8.10.0/meson.build.orig    2020-12-01 09:51:29.000000000 +0100
-+++ libvirt-8.10.0/meson.build 2022-06-15 21:02:52.949418900 +0200
-@@ -832,16 +832,19 @@ optional_programs = [
+--- 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 = [
  ]
  
  foreach name : optional_programs
@@ -22,60 +22,24 @@
  endforeach
  
  
-@@ -1684,6 +1687,8 @@ if not get_option('driver_qemu').disable
+@@ -1675,6 +1678,8 @@ if not get_option('driver_qemu').disable
      conf.set_quoted('QEMU_USER', qemu_user)
      conf.set_quoted('QEMU_GROUP', qemu_group)
  
-+  qemu_bridge_path = get_option('qemu_bridge_path')
-+  if qemu_bridge_path == ''
-     qemu_bridge_prog = find_program(
-       'qemu-bridge-helper',
-       dirs: [ '/usr/libexec', '/usr/lib/qemu', '/usr/lib' ],
-@@ -1694,8 +1699,11 @@ if not get_option('driver_qemu').disable
-     else
-       qemu_bridge_path = '/usr/libexec/qemu-bridge-helper'
-     endif
-+  endif
-     conf.set_quoted('QEMU_BRIDGE_HELPER', qemu_bridge_path)
- 
-+  qemu_pr_path = get_option('qemu_pr_path')
-+  if qemu_pr_path == ''
-     qemu_pr_prog = find_program(
-       'qemu-pr-helper',
-       dirs: [ '/usr/bin', '/usr/libexec' ],
-@@ -1706,8 +1714,11 @@ if not get_option('driver_qemu').disable
-     else
-       qemu_pr_path = '/usr/bin/qemu-pr-helper'
-     endif
-+  endif
-     conf.set_quoted('QEMU_PR_HELPER', qemu_pr_path)
- 
 +  qemu_slirp_path = get_option('qemu_slirp_path')
 +  if qemu_slirp_path == ''
      qemu_slirp_prog = find_program(
        'slirp-helper',
        dirs: [ '/usr/bin', '/usr/libexec' ],
-@@ -1718,8 +1729,11 @@ if not get_option('driver_qemu').disable
+@@ -1685,6 +1690,7 @@ if not get_option('driver_qemu').disable
      else
        qemu_slirp_path = '/usr/bin/slirp-helper'
      endif
 +  endif
      conf.set_quoted('QEMU_SLIRP_HELPER', qemu_slirp_path)
- 
-+  qemu_dbus_daemon_path = get_option('qemu_dbus_daemon_path')
-+  if qemu_dbus_daemon_path == ''
-     qemu_dbus_daemon_prog = find_program(
-       'dbus-daemon',
-       dirs: [ '/usr/bin', '/usr/libexec' ],
-@@ -1730,6 +1744,7 @@ if not get_option('driver_qemu').disable
-     else
-       qemu_dbus_daemon_path = '/usr/bin/dbus-daemon'
-     endif
-+  endif
-     conf.set_quoted('QEMU_DBUS_DAEMON', qemu_dbus_daemon_path)
    endif
  endif
-@@ -1809,11 +1824,29 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1764,11 +1770,29 @@ if conf.has('WITH_LIBVIRTD')
      endif
  
      if fs_enable
@@ -106,7 +70,7 @@
          fs_enable = false
        endif
      endif
-@@ -1822,15 +1855,17 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1777,15 +1801,17 @@ if conf.has('WITH_LIBVIRTD')
        use_storage = true
  
        conf.set('WITH_STORAGE_FS', 1)
@@ -128,7 +92,7 @@
        conf.set_quoted('SHOWMOUNT', showmount_path)
      endif
    endif
-@@ -1842,7 +1877,7 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1797,7 +1823,7 @@ if conf.has('WITH_LIBVIRTD')
      error('Need glusterfs (libgfapi) for gluster storage driver')
    endif
  
@@ -137,7 +101,7 @@
      use_storage = true
      conf.set('WITH_STORAGE_ISCSI', 1)
    elif get_option('storage_iscsi').enabled()
-@@ -1865,11 +1900,17 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1820,11 +1846,17 @@ if conf.has('WITH_LIBVIRTD')
        'pvs', 'vgs', 'lvs',
      ]
      foreach name : lvm_progs
@@ -158,7 +122,7 @@
          lvm_enable = false
        endif
      endforeach
-@@ -1879,7 +1920,7 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1834,7 +1866,7 @@ if conf.has('WITH_LIBVIRTD')
        conf.set('WITH_STORAGE_LVM', 1)
  
        foreach name : lvm_progs
@@ -167,7 +131,7 @@
        endforeach
      endif
    endif
-@@ -2030,10 +2071,16 @@ if not get_option('nss').disabled()
+@@ -1985,10 +2017,16 @@ if not get_option('nss').disabled()
  endif
  
  if not get_option('numad').disabled() and numactl_dep.found()
@@ -185,51 +149,51 @@
    endif
  elif get_option('numad').enabled()
    error('You must have numactl enabled for numad support.')
---- libvirt-8.10.0/build-aux/meson.build.orig  2020-12-01 09:51:29.000000000 +0100
-+++ libvirt-8.10.0/build-aux/meson.build       2022-06-15 21:13:56.995821452 +0200
-@@ -1,8 +1,3 @@
--flake8_path = ''
--if flake8_prog.found()
--  flake8_path = flake8_prog.full_path()
--endif
--
- if host_machine.system() == 'freebsd' or host_machine.system() == 'darwin'
-   make_prog = find_program('gmake')
-   sed_prog = find_program('gsed')
---- libvirt-8.10.0/src/meson.build.orig        2020-12-01 09:51:29.000000000 +0100
-+++ libvirt-8.10.0/src/meson.build     2022-06-15 21:23:22.326092128 +0200
-@@ -989,11 +989,11 @@ test(
-   env: runutf8,
- )
- 
--if augparse_prog.found()
-+if find_program('augparse', required: false).found()
-   foreach data : augeas_test_data
+--- libvirt-9.10.0/scripts/rpcgen/meson.build.orig     2023-12-01 16:11:26.000000000 +0100
++++ libvirt-9.10.0/scripts/rpcgen/meson.build  2024-04-06 18:12:56.287832133 +0200
+@@ -3,7 +3,7 @@ subdir('rpcgen')
+ if tests_enabled[0]
+   subdir('tests')
+ 
+-  if pytest_prog.found() and host_machine.system() != 'darwin'
++  if pytest_path != '' and host_machine.system() != 'darwin'
      test(
-       'check-augeas-@0@'.format(data['name']),
--      augparse_prog,
-+      find_program('augparse'),
-       args: [
-         '-I', data['srcdir'],
-         '-I', data['builddir'],
-@@ -1003,7 +1003,7 @@ if augparse_prog.found()
-   endforeach
- endif
+       'rpcgen-pytest',
+       python3_prog,
+--- libvirt-9.10.0/src/meson.build.orig        2024-04-05 22:18:26.619433380 +0200
++++ libvirt-9.10.0/src/meson.build     2024-04-06 08:12:28.779676565 +0200
+@@ -1029,11 +1029,11 @@ if tests_enabled[0]
+     suite: 'script'
+   )
+ 
+-  if augparse_prog.found()
++  if find_program('augparse', required: false).found()
+     foreach data : augeas_test_data
+       test(
+         'check-augeas-@0@'.format(data['name']),
+-        augparse_prog,
++        find_program('augparse'),
+         args: [
+           '-I', data['srcdir'],
+           '-I', data['builddir'],
+@@ -1044,7 +1044,7 @@ if tests_enabled[0]
+     endforeach
+   endif
  
--if pdwtags_prog.found() and cc.get_id() != 'clang'
-+if pdwtags_path != '' and cc.get_id() != 'clang'
-   foreach proto : check_protocols
-     lib = proto['lib']
-     test(
-@@ -1014,7 +1014,7 @@ if pdwtags_prog.found() and cc.get_id()
-         proto['name'],
-         lib.name(),
-         lib.full_path(),
--        pdwtags_prog.full_path(),
-+        pdwtags_path,
-         files('@0@-structs'.format(proto['name'])),
-       ],
-       env: runutf8,
+-  if pdwtags_prog.found() and cc.get_id() != 'clang'
++  if pdwtags_path != '' and cc.get_id() != 'clang'
+     foreach proto : check_protocols
+       lib = proto['lib']
+       test(
+@@ -1055,7 +1055,7 @@ if tests_enabled[0]
+           proto['name'],
+           lib.name(),
+           lib.full_path(),
+-          pdwtags_prog.full_path(),
++          pdwtags_path,
+           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:
@@ -239,6 +203,7 @@
 +
 +option('addr2line_path', type: 'string', value: '', description: 'executable path')
 +option('augparse_path', type: 'string', value: '', description: 'executable path')
++option('black_path', type: 'string', value: '', description: 'executable path')
 +option('dmidecode_path', type: 'string', value: '', description: 'executable path')
 +option('dnsmasq_path', type: 'string', value: '', description: 'executable path')
 +option('ebtables_path', type: 'string', value: '', description: 'executable path')
@@ -259,13 +224,12 @@
 +option('numad_path', type: 'string', value: '', description: 'executable path')
 +option('ovs_vsctl_path', type: 'string', value: '', description: 'executable path')
 +option('parted_path', type: 'string', value: '', description: 'executable path')
++option('passt_path', type: 'string', value: '', description: 'executable path')
 +option('pdwtags_path', type: 'string', value: '', description: 'executable path')
 +option('pvcreate_path', type: 'string', value: '', description: 'executable path')
 +option('pvremove_path', type: 'string', value: '', description: 'executable path')
 +option('pvs_path', type: 'string', value: '', description: 'executable path')
-+option('qemu_bridge_path', type: 'string', value: '', description: 'executable path')
-+option('qemu_dbus_daemon_path', type: 'string', value: '', description: 'executable path')
-+option('qemu_pr_path', type: 'string', value: '', description: 'executable path')
++option('pytest_path', type: 'string', value: '', description: 'executable path')
 +option('qemu_slirp_path', type: 'string', value: '', description: 'executable path')
 +option('radvd_path', type: 'string', value: '', description: 'executable path')
 +option('rmmod_path', type: 'string', value: '', description: 'executable path')

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index ddbdf8678a36e3040f216951359f8415127e3609..e260cdabc720cc3073e450801113834e93c707df 100644 (file)
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -10,30 +10,28 @@ diff -ur libvirt-8.4.0/docs/auth.rst libvirt-8.4.0-sasl/docs/auth.rst
  parameter to ``scram-sha-256``.
  
  **Note:** previous versions of libvirt suggested ``DIGEST-MD5`` and
-diff -ur libvirt-8.4.0/libvirt.spec libvirt-8.4.0-sasl/libvirt.spec
---- libvirt-8.4.0/libvirt.spec 2022-06-01 09:28:50.874389600 +0200
-+++ libvirt-8.4.0-sasl/libvirt.spec    2022-06-19 22:04:15.936263095 +0200
-@@ -1675,7 +1675,7 @@
- %config(noreplace) %{_sysconfdir}/libvirt/virtproxyd.conf
- %config(noreplace) %{_sysconfdir}/libvirt/virtlogd.conf
- %config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf
+--- libvirt-9.10.0/libvirt.spec.orig   2024-04-05 22:06:11.920080254 +0200
++++ libvirt-9.10.0/libvirt.spec        2024-04-05 22:10:45.821929734 +0200
+@@ -1980,7 +1980,7 @@ exit 0
+ %files daemon-common
+ %{_unitdir}/virt-guest-shutdown.target
+ %{_unitdir}/libvirt-guests.service
 -%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
 +%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf
- %config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf
- 
- %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
-diff -ur libvirt-8.4.0/libvirt.spec.in libvirt-8.4.0-sasl/libvirt.spec.in
---- libvirt-8.4.0/libvirt.spec.in      2022-06-01 09:28:24.000000000 +0200
-+++ libvirt-8.4.0-sasl/libvirt.spec.in 2022-06-19 22:04:15.936263095 +0200
-@@ -1675,7 +1675,7 @@
- %config(noreplace) %{_sysconfdir}/libvirt/virtproxyd.conf
- %config(noreplace) %{_sysconfdir}/libvirt/virtlogd.conf
- %config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf
+ %dir %{_datadir}/libvirt/
+ %ghost %dir %{_rundir}/libvirt/
+ %ghost %dir %{_rundir}/libvirt/common/
+--- libvirt-9.10.0/libvirt.spec.in.orig        2024-04-05 22:06:11.953413407 +0200
++++ libvirt-9.10.0/libvirt.spec.in     2024-04-05 22:10:58.908525504 +0200
+@@ -1980,7 +1980,7 @@ exit 0
+ %files daemon-common
+ %{_unitdir}/virt-guest-shutdown.target
+ %{_unitdir}/libvirt-guests.service
 -%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
 +%config(noreplace) %{_sysconfdir}/sasl/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/
 diff -ur libvirt-8.4.0/src/qemu/qemu.conf.in libvirt-8.4.0-sasl/src/qemu/qemu.conf.in
 --- libvirt-8.4.0/src/qemu/qemu.conf.in        2022-06-01 09:28:24.000000000 +0200
 +++ libvirt-8.4.0-sasl/src/qemu/qemu.conf.in   2022-06-19 22:04:16.306265553 +0200
@@ -134,87 +132,61 @@ diff -ur libvirt-8.4.0/src/remote/meson.build libvirt-8.4.0-sasl/src/remote/meso
      rename: [ 'libvirt.conf' ],
    )
  endif
-diff -ur libvirt-8.4.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args libvirt-8.4.0-sasl/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args
---- libvirt-8.4.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args        2022-06-01 09:28:24.000000000 +0200
-+++ libvirt-8.4.0-sasl/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args   2022-06-19 22:04:16.769601963 +0200
-@@ -6,7 +6,7 @@
- XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
- XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
- XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
--SASL_CONF_PATH=/root/.sasl2 \
-+SASL_CONF_PATH=/root/.sasl \
+--- 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
+@@ -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 \
+ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+-SASL_CONF_PATH=/etc/sasl2 \
++SASL_CONF_PATH=/etc/sasl \
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args libvirt-8.4.0-sasl/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args
---- libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args  2022-06-01 09:28:24.000000000 +0200
-+++ libvirt-8.4.0-sasl/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args     2022-06-19 22:04:16.772935320 +0200
-@@ -6,7 +6,7 @@
- XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
- XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
- XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
--SASL_CONF_PATH=/root/.sasl2 \
-+SASL_CONF_PATH=/root/.sasl \
+--- 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
+@@ -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 \
+ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+-SASL_CONF_PATH=/etc/sasl2 \
++SASL_CONF_PATH=/etc/sasl \
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args libvirt-8.4.0-sasl/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
---- libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args     2022-06-01 09:28:24.000000000 +0200
-+++ libvirt-8.4.0-sasl/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args        2022-06-19 22:04:16.772935320 +0200
-@@ -6,7 +6,7 @@
- XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
- XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
- XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
--SASL_CONF_PATH=/root/.sasl2 \
-+SASL_CONF_PATH=/root/.sasl \
+--- 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
+@@ -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 \
+ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+-SASL_CONF_PATH=/etc/sasl2 \
++SASL_CONF_PATH=/etc/sasl \
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-8.4.0-sasl/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
---- libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args    2022-06-01 09:28:24.000000000 +0200
-+++ libvirt-8.4.0-sasl/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args       2022-06-19 22:04:16.772935320 +0200
-@@ -6,7 +6,7 @@
- XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
- XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
- XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
--SASL_CONF_PATH=/root/.sasl2 \
-+SASL_CONF_PATH=/root/.sasl \
+--- 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
+@@ -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 \
+ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+-SASL_CONF_PATH=/etc/sasl2 \
++SASL_CONF_PATH=/etc/sasl \
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-8.4.0-sasl/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
---- libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args   2022-06-01 09:28:24.000000000 +0200
-+++ libvirt-8.4.0-sasl/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args      2022-06-19 22:04:16.772935320 +0200
-@@ -6,7 +6,7 @@
- XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
- XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
- XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
--SASL_CONF_PATH=/root/.sasl2 \
-+SASL_CONF_PATH=/root/.sasl \
+--- 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
+@@ -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 \
+ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+-SASL_CONF_PATH=/etc/sasl2 \
++SASL_CONF_PATH=/etc/sasl \
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-8.4.0/tests/qemuxml2argvtest.c libvirt-8.4.0-sasl/tests/qemuxml2argvtest.c
---- libvirt-8.4.0/tests/qemuxml2argvtest.c     2022-06-01 09:28:24.000000000 +0200
-+++ libvirt-8.4.0-sasl/tests/qemuxml2argvtest.c        2022-06-19 22:04:16.872935984 +0200
-@@ -1509,7 +1509,7 @@
- 
-     driver.config->vncSASL = 1;
-     VIR_FREE(driver.config->vncSASLdir);
--    driver.config->vncSASLdir = g_strdup("/root/.sasl2");
-+    driver.config->vncSASLdir = g_strdup("/root/.sasl");
-     DO_TEST_CAPS_LATEST("graphics-vnc-sasl");
-     driver.config->vncTLS = 1;
-     driver.config->vncTLSx509verify = 1;
-@@ -1531,7 +1531,7 @@
-     DO_TEST_CAPS_LATEST("graphics-spice");
-     DO_TEST_CAPS_LATEST("graphics-spice-no-args");
-     driver.config->spiceSASL = 1;
--    driver.config->spiceSASLdir = g_strdup("/root/.sasl2");
-+    driver.config->spiceSASLdir = g_strdup("/root/.sasl");
-     DO_TEST_CAPS_LATEST("graphics-spice-sasl");
-     VIR_FREE(driver.config->spiceSASLdir);
-     driver.config->spiceSASL = 0;
 diff -ur libvirt-8.4.0/tests/virconfdata/libvirtd.conf libvirt-8.4.0-sasl/tests/virconfdata/libvirtd.conf
 --- libvirt-8.4.0/tests/virconfdata/libvirtd.conf      2022-06-01 09:28:24.000000000 +0200
 +++ libvirt-8.4.0-sasl/tests/virconfdata/libvirtd.conf 2022-06-19 22:04:16.999603490 +0200

diff --git a/libvirt.spec b/libvirt.spec
index aeb2675d777bcb4c2304fc910e198af85e592d2d..aa08e84988d6f9e0d893995194a315516bce1238 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:       8.10.0
-Release:       2
+Version:       9.10.0
+Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       https://download.libvirt.org/%{name}-%{version}.tar.xz
-# Source0-md5: 47feb4bed510cb7ed8fdc5be6b9d6d04
+# Source0-md5: c546d8745508bd95147bc749dea82ff1
 Source1:       %{name}.init
 Source2:       %{name}.tmpfiles
 Patch0:                %{name}-sasl.patch
@@ -60,7 +60,6 @@ Patch3:               %{name}-path-options.patch
 Patch4:                %{name}-udevadm-settle.patch
 Patch5:                vserver.patch
 Patch6:                bashisms.patch
-Patch7:                missing-includes.patch
 URL:           https://www.libvirt.org/
 BuildRequires: acl-devel
 BuildRequires: attr-devel
@@ -80,12 +79,13 @@ BuildRequires:      gettext-tools >= 0.17
 BuildRequires: glib2-devel >= 1:2.56.0
 %{?with_glusterfs:BuildRequires:       glusterfs-devel >= 3.4.1}
 BuildRequires: gnutls-devel >= 3.6.0
-BuildRequires: libapparmor-devel
+BuildRequires: libapparmor-devel >= 3.0.0
 BuildRequires: libblkid-devel >= 2.17
 BuildRequires: libcap-ng-devel >= 0.4.0
 BuildRequires: libfuse3-devel >= 3.1.0
 BuildRequires: libgcrypt-devel
 BuildRequires: libiscsi-devel >= 1.18.0
+BuildRequires: libnbd-devel >= 1.0
 BuildRequires: libnl-devel >= 3.2
 BuildRequires: libpcap-devel >= 1.5.0
 BuildRequires: libselinux-devel >= 2.5
@@ -119,7 +119,7 @@ BuildRequires:      systemd-devel
 BuildRequires: tar >= 1:1.22
 BuildRequires: udev-devel >= 1:219
 %{?with_wireshark:BuildRequires:       wireshark-devel >= 2.6.0}
-%{?with_libxl:BuildRequires:   xen-devel >= 4.9}
+%{?with_libxl:BuildRequires:   xen-devel >= 4.13}
 # For disk driver
 BuildRequires: xorg-lib-libpciaccess-devel >= 0.10.0
 BuildRequires: xz
@@ -129,6 +129,7 @@ Requires:   cyrus-sasl-libs >= 2.1.26
 Requires:      device-mapper-libs >= 1.0.0
 Requires:      glib2 >= 1:2.56.0
 Requires:      gnutls-libs >= 3.6.0
+Requires:      libapparmor >= 3.0.0
 Requires:      libcap-ng >= 0.4.0
 Requires:      libnl >= 3.2
 Requires:      libpcap >= 1.5.0
@@ -336,7 +337,7 @@ Summary:    Server side driver required to run XEN guests (xenlight)
 Summary(pl.UTF-8):     Sterownik wymagany po stronie serwera do uruchamiania gości XEN (xenlight)
 Group:         Libraries
 Requires:      %{name}-daemon = %{version}-%{release}
-Requires:      xen >= 4.9
+Requires:      xen >= 4.13
 Provides:      libvirt(hypervisor)
 Obsoletes:     libvirt-daemon-xen < 4.3.0
 
@@ -372,6 +373,7 @@ Requires:   %{name}-daemon = %{version}-%{release}
 Requires:      /usr/bin/qemu-img
 Requires:      bzip2
 Requires:      gzip
+Requires:      libnbd >= 1.0
 Requires:      lzop
 Requires:      qemu-system-x86 >= 4.2
 Requires:      xz
@@ -506,13 +508,15 @@ Moduł sekcji Wiresharka do pakietów libvirt.
 %patch4 -p1
 %{?with_vserver:%patch5 -p1}
 %patch6 -p1
-%patch7 -p1
 
 %if %{with static_libs}
 %{__sed} -i '/^libvirt\(_admin\|_lxc\|_qemu\)\?_lib = / s/shared_library/library/' src/meson.build
 %endif
 
-%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' tools/virt-qemu-qmp-proxy
+%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' tools/{virt-qemu-qmp-proxy,virt-qemu-sev-validate}
+
+%{__sed} -i -e 's,/usr/lib/qemu,/usr/%{_lib}/qemu,' -e 's,/usr/lib",/usr/%{_lib}/",' src/qemu/qemu_interface.c
+%{__sed} -i -e 's,/usr/libexec",%{_libexecdir}",' src/qemu/qemu_process.c
 
 %build
 %meson build \
@@ -563,9 +567,6 @@ Moduł sekcji Wiresharka do pakietów libvirt.
        -Dpvcreate_path=/sbin/pvcreate \
        -Dpvremove_path=/sbin/pvremove \
        -Dpvs_path=/sbin/pvs \
-       -Dqemu_bridge_path=%{_libexecdir}/qemu-bridge-helper \
-       -Dqemu_dbus_daemon_path=/usr/bin/dbus-daemon \
-       -Dqemu_pr_path=/usr/bin/qemu-pr-helper \
        -Dradvd_path=/usr/sbin/radvd \
        -Drmmod_path=/sbin/rmmod \
        -Dscrub_path=/usr/bin/scrub \
@@ -715,7 +716,6 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/abstractions/libvirt-lxc
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/abstractions/libvirt-qemu
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/libvirt
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/local/usr.lib.libvirt.virt-aa-helper
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/usr.lib.libvirt.virt-aa-helper
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/usr.sbin.libvirtd
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/usr.sbin.virtqemud

diff --git a/missing-includes.patch b/missing-includes.patch
deleted file mode 100644 (file)
index 2ddacb9..0000000
--- a/missing-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libvirt-8.10.0/src/util/virxml.c.orig      2022-12-01 10:55:15.000000000 +0100
-+++ libvirt-8.10.0/src/util/virxml.c   2023-11-19 13:02:22.189721157 +0100
-@@ -24,6 +24,7 @@
- #include <math.h>               /* for isnan() */
- #include <sys/stat.h>
- 
-+#include <libxml/xmlsave.h>
- #include <libxml/xpathInternals.h>
- 
- #include "virerror.h"