- updated to 10.2.0

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 779f6dd4748d184ea5ffad442b742bcb840c1a7c..67a3abc0135c3458ff2e208b3a3e6658104a7fa8 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -ur libvirt-9.5.0.orig/src/qemu/qemu_command.c libvirt-9.5.0/src/qemu/qemu_command.c
---- libvirt-9.5.0.orig/src/qemu/qemu_command.c 2023-07-20 17:19:16.014948742 +0200
-+++ libvirt-9.5.0/src/qemu/qemu_command.c      2023-07-20 17:19:30.957162714 +0200
-@@ -8057,6 +8057,10 @@
+diff -ur libvirt-10.2.0.orig/src/qemu/qemu_command.c libvirt-10.2.0/src/qemu/qemu_command.c
+--- libvirt-10.2.0.orig/src/qemu/qemu_command.c        2024-04-03 17:49:34.976744165 +0200
++++ libvirt-10.2.0/src/qemu/qemu_command.c     2024-04-03 17:49:53.468991419 +0200
+@@ -8201,6 +8201,10 @@

              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */


@@ -12,10 +12,10 @@ diff -ur libvirt-9.5.0.orig/src/qemu/qemu_command.c libvirt-9.5.0/src/qemu/qemu_
      }
  
      if (graphics->data.vnc.powerControl != VIR_TRISTATE_BOOL_ABSENT) {
      }
  
      if (graphics->data.vnc.powerControl != VIR_TRISTATE_BOOL_ABSENT) {

-diff -ur libvirt-9.5.0.orig/src/qemu/qemu_conf.c libvirt-9.5.0/src/qemu/qemu_conf.c
---- libvirt-9.5.0.orig/src/qemu/qemu_conf.c    2023-07-20 17:19:16.014948742 +0200
-+++ libvirt-9.5.0/src/qemu/qemu_conf.c 2023-07-20 17:19:30.958162728 +0200
-@@ -443,6 +443,8 @@
+diff -ur libvirt-10.2.0.orig/src/qemu/qemu_conf.c libvirt-10.2.0/src/qemu/qemu_conf.c
+--- libvirt-10.2.0.orig/src/qemu/qemu_conf.c   2024-04-03 17:49:34.976744165 +0200
++++ libvirt-10.2.0/src/qemu/qemu_conf.c        2024-04-03 17:49:53.472991473 +0200
+@@ -441,6 +441,8 @@

          return -1;
      if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
          return -1;
          return -1;
      if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
          return -1;


@@ -24,10 +24,10 @@ diff -ur libvirt-9.5.0.orig/src/qemu/qemu_conf.c libvirt-9.5.0/src/qemu/qemu_con
  
      if (cfg->vncPassword &&
          strlen(cfg->vncPassword) > 8) {
  
      if (cfg->vncPassword &&
          strlen(cfg->vncPassword) > 8) {

-diff -ur libvirt-9.5.0.orig/src/qemu/qemu_conf.h libvirt-9.5.0/src/qemu/qemu_conf.h
---- libvirt-9.5.0.orig/src/qemu/qemu_conf.h    2023-07-20 17:19:16.014948742 +0200
-+++ libvirt-9.5.0/src/qemu/qemu_conf.h 2023-07-20 17:19:30.958162728 +0200
-@@ -119,6 +119,7 @@
+diff -ur libvirt-10.2.0.orig/src/qemu/qemu_conf.h libvirt-10.2.0/src/qemu/qemu_conf.h
+--- libvirt-10.2.0.orig/src/qemu/qemu_conf.h   2024-04-03 17:49:34.980744218 +0200
++++ libvirt-10.2.0/src/qemu/qemu_conf.h        2024-04-03 17:49:53.472991473 +0200
+@@ -120,6 +120,7 @@

      bool vncTLSx509verify;
      bool vncTLSx509verifyPresent;
      bool vncSASL;
      bool vncTLSx509verify;
      bool vncTLSx509verifyPresent;
      bool vncSASL;


@@ -35,9 +35,9 @@ diff -ur libvirt-9.5.0.orig/src/qemu/qemu_conf.h libvirt-9.5.0/src/qemu/qemu_con
      char *vncTLSx509certdir;
      char *vncTLSx509secretUUID;
      char *vncListen;
      char *vncTLSx509certdir;
      char *vncTLSx509secretUUID;
      char *vncListen;

-diff -ur libvirt-9.5.0.orig/src/qemu/qemu.conf.in libvirt-9.5.0/src/qemu/qemu.conf.in
---- libvirt-9.5.0.orig/src/qemu/qemu.conf.in   2023-07-20 17:19:16.013948728 +0200
-+++ libvirt-9.5.0/src/qemu/qemu.conf.in        2023-07-20 17:19:30.958162728 +0200
+diff -ur libvirt-10.2.0.orig/src/qemu/qemu.conf.in libvirt-10.2.0/src/qemu/qemu.conf.in
+--- libvirt-10.2.0.orig/src/qemu/qemu.conf.in  2024-04-03 17:49:34.976744165 +0200
++++ libvirt-10.2.0/src/qemu/qemu.conf.in       2024-04-03 17:49:53.472991473 +0200

 @@ -147,6 +147,15 @@
  #vnc_sasl = 1
  
 @@ -147,6 +147,15 @@
  #vnc_sasl = 1
  

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 178b7eec07f8e53559257774ca2c49c0fdbc950c..2f23a6b4f60b0e64266c1b0138e6f404e8320020 100644 (file)
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,6 +1,6 @@
-diff -ur libvirt-9.5.0.orig/docs/auth.rst libvirt-9.5.0/docs/auth.rst
---- libvirt-9.5.0.orig/docs/auth.rst   2023-07-20 17:12:02.016734095 +0200
-+++ libvirt-9.5.0/docs/auth.rst        2023-07-20 17:12:35.936219809 +0200
+diff -ur libvirt-10.2.0.orig/docs/auth.rst libvirt-10.2.0/docs/auth.rst
+--- libvirt-10.2.0.orig/docs/auth.rst  2024-04-03 17:45:03.261111129 +0200
++++ libvirt-10.2.0/docs/auth.rst       2024-04-03 17:45:24.393393683 +0200

 @@ -225,7 +225,7 @@
  
  Since the libvirt SASL config file defaults to using ``GSSAPI`` (Kerberos), a
 @@ -225,7 +225,7 @@
  
  Since the libvirt SASL config file defaults to using ``GSSAPI`` (Kerberos), a


@@ -10,9 +10,9 @@ diff -ur libvirt-9.5.0.orig/docs/auth.rst libvirt-9.5.0/docs/auth.rst
  parameter to ``scram-sha-256``.
  
  **Note:** previous versions of libvirt suggested ``DIGEST-MD5`` and
  parameter to ``scram-sha-256``.
  
  **Note:** previous versions of libvirt suggested ``DIGEST-MD5`` and

-diff -ur libvirt-9.5.0.orig/src/qemu/qemu.conf.in libvirt-9.5.0/src/qemu/qemu.conf.in
---- libvirt-9.5.0.orig/src/qemu/qemu.conf.in   2023-07-20 17:12:02.114735498 +0200
-+++ libvirt-9.5.0/src/qemu/qemu.conf.in        2023-07-20 17:12:35.937219824 +0200
+diff -ur libvirt-10.2.0.orig/src/qemu/qemu.conf.in libvirt-10.2.0/src/qemu/qemu.conf.in
+--- libvirt-10.2.0.orig/src/qemu/qemu.conf.in  2024-04-03 17:45:03.365112520 +0200
++++ libvirt-10.2.0/src/qemu/qemu.conf.in       2024-04-03 17:45:24.457394538 +0200

 @@ -141,18 +141,18 @@
  # Examples include vinagre, virt-viewer and virt-manager
  # itself. UltraVNC, RealVNC, TightVNC do not support this
 @@ -141,18 +141,18 @@
  # Examples include vinagre, virt-viewer and virt-manager
  # itself. UltraVNC, RealVNC, TightVNC do not support this


@@ -56,9 +56,9 @@ diff -ur libvirt-9.5.0.orig/src/qemu/qemu.conf.in libvirt-9.5.0/src/qemu/qemu.co
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #

-diff -ur libvirt-9.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-9.5.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-9.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2023-07-20 17:12:02.121735598 +0200
-+++ libvirt-9.5.0/src/qemu/test_libvirtd_qemu.aug.in   2023-07-20 17:12:35.937219824 +0200
+diff -ur libvirt-10.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-10.2.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-10.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in     2024-04-03 17:45:03.369112573 +0200
++++ libvirt-10.2.0/src/qemu/test_libvirtd_qemu.aug.in  2024-04-03 17:45:24.457394538 +0200

 @@ -13,7 +13,7 @@
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
 @@ -13,7 +13,7 @@
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }


@@ -77,9 +77,9 @@ diff -ur libvirt-9.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-9.5.0/src
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }

-diff -ur libvirt-9.5.0.orig/src/remote/libvirtd.conf.in libvirt-9.5.0/src/remote/libvirtd.conf.in
---- libvirt-9.5.0.orig/src/remote/libvirtd.conf.in     2023-07-20 17:12:02.121735598 +0200
-+++ libvirt-9.5.0/src/remote/libvirtd.conf.in  2023-07-20 17:12:35.937219824 +0200
+diff -ur libvirt-10.2.0.orig/src/remote/libvirtd.conf.in libvirt-10.2.0/src/remote/libvirtd.conf.in
+--- libvirt-10.2.0.orig/src/remote/libvirtd.conf.in    2024-04-03 17:45:03.369112573 +0200
++++ libvirt-10.2.0/src/remote/libvirtd.conf.in 2024-04-03 17:45:24.457394538 +0200

 @@ -140,7 +140,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
 @@ -140,7 +140,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #


@@ -98,10 +98,10 @@ diff -ur libvirt-9.5.0.orig/src/remote/libvirtd.conf.in libvirt-9.5.0/src/remote
  #auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
  #auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.

-diff -ur libvirt-9.5.0.orig/src/remote/meson.build libvirt-9.5.0/src/remote/meson.build
---- libvirt-9.5.0.orig/src/remote/meson.build  2023-07-20 17:12:02.122735613 +0200
-+++ libvirt-9.5.0/src/remote/meson.build       2023-07-20 17:12:35.937219824 +0200
-@@ -302,7 +302,7 @@
+diff -ur libvirt-10.2.0.orig/src/remote/meson.build libvirt-10.2.0/src/remote/meson.build
+--- libvirt-10.2.0.orig/src/remote/meson.build 2024-04-03 17:45:03.369112573 +0200
++++ libvirt-10.2.0/src/remote/meson.build      2024-04-03 17:45:24.457394538 +0200
+@@ -328,7 +328,7 @@

  if conf.has('WITH_SASL')
    install_data(
      'libvirtd.sasl',
  if conf.has('WITH_SASL')
    install_data(
      'libvirtd.sasl',


@@ -110,9 +110,9 @@ diff -ur libvirt-9.5.0.orig/src/remote/meson.build libvirt-9.5.0/src/remote/meso
      rename: [ 'libvirt.conf' ],
    )
  endif
      rename: [ 'libvirt.conf' ],
    )
  endif

-diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args libvirt-9.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args
---- libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args   2023-07-20 17:12:02.331738606 +0200
-+++ libvirt-9.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args        2023-07-20 17:14:44.862065962 +0200
+diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args
+--- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args   2024-04-03 17:45:03.593115568 +0200
++++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args        2024-04-03 17:47:10.346810356 +0200

 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \


@@ -122,9 +122,9 @@ diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-la
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \

-diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args
---- libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args     2023-07-20 17:12:02.332738620 +0200
-+++ libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args  2023-07-20 17:14:33.814907772 +0200
+diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args
+--- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args     2024-04-03 17:45:03.597115621 +0200
++++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args  2024-04-03 17:47:02.230701838 +0200

 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \


@@ -134,9 +134,9 @@ diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-late
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \

-diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
---- libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args        2023-07-20 17:12:02.333738634 +0200
-+++ libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args     2023-07-20 17:14:05.149497298 +0200
+diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
+--- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args        2024-04-03 17:45:03.597115621 +0200
++++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args     2024-04-03 17:47:06.658761044 +0200

 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \


@@ -146,9 +146,9 @@ diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_6
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \

-diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
---- libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args       2023-07-20 17:12:02.333738634 +0200
-+++ libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args    2023-07-20 17:14:21.221727445 +0200
+diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args
+--- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args       2024-04-03 17:45:03.597115621 +0200
++++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args    2024-04-03 17:47:16.594893897 +0200

 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \


@@ -158,9 +158,9 @@ diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_6
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \

-diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
---- libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args      2023-07-20 17:12:02.333738634 +0200
-+++ libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args   2023-07-20 17:14:26.220799030 +0200
+diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args
+--- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args      2024-04-03 17:45:03.597115621 +0200
++++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args   2024-04-03 17:47:13.522852821 +0200

 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \


@@ -170,10 +170,10 @@ diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-lates
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \

-diff -ur libvirt-9.5.0.orig/tests/testutilsqemu.c libvirt-9.5.0/tests/testutilsqemu.c
---- libvirt-9.5.0.orig/tests/testutilsqemu.c   2023-07-20 17:12:02.426739966 +0200
-+++ libvirt-9.5.0/tests/testutilsqemu.c        2023-07-20 17:15:07.460389561 +0200
-@@ -528,9 +528,9 @@
+diff -ur libvirt-10.2.0.orig/tests/testutilsqemu.c libvirt-10.2.0/tests/testutilsqemu.c
+--- libvirt-10.2.0.orig/tests/testutilsqemu.c  2024-04-03 17:45:03.705117066 +0200
++++ libvirt-10.2.0/tests/testutilsqemu.c       2024-04-03 17:45:28.901453959 +0200
+@@ -387,9 +387,9 @@

      cfg->backupTLSx509certdir = g_strdup("/etc/pki/libvirt-backup");
  
      VIR_FREE(cfg->vncSASLdir);
      cfg->backupTLSx509certdir = g_strdup("/etc/pki/libvirt-backup");
  
      VIR_FREE(cfg->vncSASLdir);


@@ -185,9 +185,9 @@ diff -ur libvirt-9.5.0.orig/tests/testutilsqemu.c libvirt-9.5.0/tests/testutilsq
  
      VIR_FREE(cfg->spicePassword);
      cfg->spicePassword = g_strdup("123456");
  
      VIR_FREE(cfg->spicePassword);
      cfg->spicePassword = g_strdup("123456");

-diff -ur libvirt-9.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-9.5.0/tests/virconfdata/libvirtd.conf
---- libvirt-9.5.0.orig/tests/virconfdata/libvirtd.conf 2023-07-20 17:12:02.518741283 +0200
-+++ libvirt-9.5.0/tests/virconfdata/libvirtd.conf      2023-07-20 17:12:35.944219924 +0200
+diff -ur libvirt-10.2.0.orig/tests/virconfdata/libvirtd.conf libvirt-10.2.0/tests/virconfdata/libvirtd.conf
+--- libvirt-10.2.0.orig/tests/virconfdata/libvirtd.conf        2024-04-03 17:45:03.905119740 +0200
++++ libvirt-10.2.0/tests/virconfdata/libvirtd.conf     2024-04-03 17:45:28.929454333 +0200

 @@ -91,7 +91,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
 @@ -91,7 +91,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #


@@ -206,9 +206,9 @@ diff -ur libvirt-9.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-9.5.0/tests/
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.

-diff -ur libvirt-9.5.0.orig/tests/virconfdata/libvirtd.out libvirt-9.5.0/tests/virconfdata/libvirtd.out
---- libvirt-9.5.0.orig/tests/virconfdata/libvirtd.out  2023-07-20 17:12:02.518741283 +0200
-+++ libvirt-9.5.0/tests/virconfdata/libvirtd.out       2023-07-20 17:12:35.945219938 +0200
+diff -ur libvirt-10.2.0.orig/tests/virconfdata/libvirtd.out libvirt-10.2.0/tests/virconfdata/libvirtd.out
+--- libvirt-10.2.0.orig/tests/virconfdata/libvirtd.out 2024-04-03 17:45:03.905119740 +0200
++++ libvirt-10.2.0/tests/virconfdata/libvirtd.out      2024-04-03 17:45:28.929454333 +0200

 @@ -73,7 +73,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
 @@ -73,7 +73,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index 85de2affca9a12968bdeb24aa9348b8b324bb382..6210c3f69d6836b7a75875eee33d32de4b5677f5 100644 (file)
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,8 +1,8 @@
-diff -ur libvirt-9.0.0.orig/src/qemu/meson.build libvirt-9.0.0/src/qemu/meson.build
---- libvirt-9.0.0.orig/src/qemu/meson.build    2023-02-08 18:30:15.370997640 +0100
-+++ libvirt-9.0.0/src/qemu/meson.build 2023-02-08 18:30:29.353994809 +0100
-@@ -194,7 +194,7 @@
-   if conf.has('WITH_SYSCTL')
+diff -ur libvirt-10.2.0.orig/src/qemu/meson.build libvirt-10.2.0/src/qemu/meson.build
+--- libvirt-10.2.0.orig/src/qemu/meson.build   2024-04-03 17:51:45.090484121 +0200
++++ libvirt-10.2.0/src/qemu/meson.build        2024-04-03 17:52:00.894695514 +0200
+@@ -212,7 +212,7 @@
+   if conf.has('WITH_USERFAULTFD_SYSCTL')

      install_data(
        'postcopy-migration.sysctl',
 -      install_dir: prefix / 'lib' / 'sysctl.d',
      install_data(
        'postcopy-migration.sysctl',
 -      install_dir: prefix / 'lib' / 'sysctl.d',


@@ -10,10 +10,10 @@ diff -ur libvirt-9.0.0.orig/src/qemu/meson.build libvirt-9.0.0/src/qemu/meson.bu
        rename: [ '60-qemu-postcopy-migration.conf' ],
      )
    endif
        rename: [ '60-qemu-postcopy-migration.conf' ],
      )
    endif

-diff -ur libvirt-9.0.0.orig/src/remote/meson.build libvirt-9.0.0/src/remote/meson.build
---- libvirt-9.0.0.orig/src/remote/meson.build  2023-02-08 18:30:15.387997637 +0100
-+++ libvirt-9.0.0/src/remote/meson.build       2023-02-08 18:30:29.353994809 +0100
-@@ -258,11 +258,9 @@
+diff -ur libvirt-10.2.0.orig/src/remote/meson.build libvirt-10.2.0/src/remote/meson.build
+--- libvirt-10.2.0.orig/src/remote/meson.build 2024-04-03 17:51:45.098484228 +0200
++++ libvirt-10.2.0/src/remote/meson.build      2024-04-03 17:52:00.894695514 +0200
+@@ -284,11 +284,9 @@

      endforeach
  
      if conf.has('WITH_SYSCTL')
      endforeach
  
      if conf.has('WITH_SYSCTL')

diff --git a/libvirt-udevadm-settle.patch b/libvirt-udevadm-settle.patch
index a9c2a12ec21c6427d51f22c9a0969ec42b3e197a..83014cc0f19754d9a1b0ae7f9ea3380f52f86d5c 100644 (file)
--- a/libvirt-udevadm-settle.patch
+++ b/libvirt-udevadm-settle.patch
@@ -1,7 +1,7 @@
-diff -ur libvirt-9.5.0.orig/src/util/virutil.c libvirt-9.5.0/src/util/virutil.c
---- libvirt-9.5.0.orig/src/util/virutil.c      2023-07-20 17:20:08.053693913 +0200
-+++ libvirt-9.5.0/src/util/virutil.c   2023-07-20 17:20:22.422899676 +0200
-@@ -1246,7 +1246,7 @@
+diff -ur libvirt-10.2.0.orig/src/util/virutil.c libvirt-10.2.0/src/util/virutil.c
+--- libvirt-10.2.0.orig/src/util/virutil.c     2024-04-03 17:50:30.809490688 +0200
++++ libvirt-10.2.0/src/util/virutil.c  2024-04-03 17:50:43.373658680 +0200
+@@ -1322,7 +1322,7 @@

      if (!(udev = virFindFileInPath(UDEVADM)))
          return;
  
      if (!(udev = virFindFileInPath(UDEVADM)))
          return;
  

diff --git a/libvirt.spec b/libvirt.spec
index be342a658323897e0a8c2e62308158dcc334ff35..41c694bef4c6475d764d37181a3f1d0f14718b45 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -50,12 +50,12 @@
 Summary:       Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):     Narzędzia współpracujące z funkcjami wirtualizacji
 Name:          libvirt
 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:       http://libvirt.org/sources/libvirt-%{version}.tar.xz
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://libvirt.org/sources/libvirt-%{version}.tar.xz

-# Source0-md5: c546d8745508bd95147bc749dea82ff1
+# Source0-md5: f0856217199b32447704fb741d4a8edc

 Source1:       libvirtd.init
 Source2:       virtlockd.init
 Source3:       virtlogd.init
 Source1:       libvirtd.init
 Source2:       virtlockd.init
 Source3:       virtlogd.init