- updated to 8.0.0

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 2e4cf31b42166835307cc1b763e9a48872810726..2b7f6a8918a82864820772e6ec6f8bfc6d9d7273 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -ur libvirt-7.5.0.orig/src/qemu/qemu_command.c libvirt-7.5.0/src/qemu/qemu_command.c
---- libvirt-7.5.0.orig/src/qemu/qemu_command.c 2021-07-10 01:17:10.220677568 +0200
-+++ libvirt-7.5.0/src/qemu/qemu_command.c      2021-07-10 01:17:25.635677568 +0200
-@@ -8087,6 +8087,10 @@
+diff -ur libvirt-8.0.0.orig/src/qemu/qemu_command.c libvirt-8.0.0/src/qemu/qemu_command.c
+--- libvirt-8.0.0.orig/src/qemu/qemu_command.c 2022-01-23 12:17:21.722539037 +0100
++++ libvirt-8.0.0/src/qemu/qemu_command.c      2022-01-23 12:17:43.308582727 +0100
+@@ -8327,6 +8327,10 @@
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -12,9 +12,9 @@ diff -ur libvirt-7.5.0.orig/src/qemu/qemu_command.c libvirt-7.5.0/src/qemu/qemu_
      }
  
      if (graphics->data.vnc.powerControl != VIR_TRISTATE_BOOL_ABSENT) {
-diff -ur libvirt-7.5.0.orig/src/qemu/qemu.conf libvirt-7.5.0/src/qemu/qemu.conf
---- libvirt-7.5.0.orig/src/qemu/qemu.conf      2021-07-10 01:17:10.225677568 +0200
-+++ libvirt-7.5.0/src/qemu/qemu.conf   2021-07-10 01:17:25.633677568 +0200
+diff -ur libvirt-8.0.0.orig/src/qemu/qemu.conf libvirt-8.0.0/src/qemu/qemu.conf
+--- libvirt-8.0.0.orig/src/qemu/qemu.conf      2022-01-23 12:17:21.720539033 +0100
++++ libvirt-8.0.0/src/qemu/qemu.conf   2022-01-23 12:17:43.308582727 +0100
 @@ -147,6 +147,15 @@
  #vnc_sasl = 1
  
@@ -31,9 +31,9 @@ diff -ur libvirt-7.5.0.orig/src/qemu/qemu.conf libvirt-7.5.0/src/qemu/qemu.conf
  # The default SASL configuration file is located in /etc/sasl/
  # When running libvirtd unprivileged, it may be desirable to
  # override the configs in this location. Set this parameter to
-diff -ur libvirt-7.5.0.orig/src/qemu/qemu_conf.c libvirt-7.5.0/src/qemu/qemu_conf.c
---- libvirt-7.5.0.orig/src/qemu/qemu_conf.c    2021-07-10 01:17:10.220677568 +0200
-+++ libvirt-7.5.0/src/qemu/qemu_conf.c 2021-07-10 01:17:25.636677568 +0200
+diff -ur libvirt-8.0.0.orig/src/qemu/qemu_conf.c libvirt-8.0.0/src/qemu/qemu_conf.c
+--- libvirt-8.0.0.orig/src/qemu/qemu_conf.c    2022-01-23 12:17:21.722539037 +0100
++++ libvirt-8.0.0/src/qemu/qemu_conf.c 2022-01-23 12:17:43.308582727 +0100
 @@ -450,6 +450,8 @@
          return -1;
      if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
@@ -41,11 +41,11 @@ diff -ur libvirt-7.5.0.orig/src/qemu/qemu_conf.c libvirt-7.5.0/src/qemu/qemu_con
 +    if (virConfGetValueBool(conf, "vnc_acl", &cfg->vncACL) < 0)
 +        return -1;
  
-     return 0;
- }
-diff -ur libvirt-7.5.0.orig/src/qemu/qemu_conf.h libvirt-7.5.0/src/qemu/qemu_conf.h
---- libvirt-7.5.0.orig/src/qemu/qemu_conf.h    2021-07-10 01:17:10.220677568 +0200
-+++ libvirt-7.5.0/src/qemu/qemu_conf.h 2021-07-10 01:17:25.636677568 +0200
+     if (cfg->vncPassword &&
+         strlen(cfg->vncPassword) > 8) {
+diff -ur libvirt-8.0.0.orig/src/qemu/qemu_conf.h libvirt-8.0.0/src/qemu/qemu_conf.h
+--- libvirt-8.0.0.orig/src/qemu/qemu_conf.h    2022-01-23 12:17:21.722539037 +0100
++++ libvirt-8.0.0/src/qemu/qemu_conf.h 2022-01-23 12:17:43.309582729 +0100
 @@ -114,6 +114,7 @@
      bool vncTLSx509verify;
      bool vncTLSx509verifyPresent;

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 52b0355c022310940f69e7aa9c4b174a7ecaf47f..b85055f787aa8c611089cac25b23737be2983e84 100644 (file)
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,6 +1,6 @@
-diff -ur libvirt-7.5.0.orig/docs/auth.rst libvirt-7.5.0/docs/auth.rst
---- libvirt-7.5.0.orig/docs/auth.rst   2021-07-10 01:12:46.853677568 +0200
-+++ libvirt-7.5.0/docs/auth.rst        2021-07-10 01:16:24.992677568 +0200
+diff -ur libvirt-8.0.0.orig/docs/auth.rst libvirt-8.0.0/docs/auth.rst
+--- libvirt-8.0.0.orig/docs/auth.rst   2022-01-23 12:13:11.662032954 +0100
++++ libvirt-8.0.0/docs/auth.rst        2022-01-23 12:13:54.286119215 +0100
 @@ -225,7 +225,7 @@
  
  Since the libvirt SASL config file defaults to using ``GSSAPI`` (Kerberos), a
@@ -10,9 +10,9 @@ diff -ur libvirt-7.5.0.orig/docs/auth.rst libvirt-7.5.0/docs/auth.rst
  parameter to ``scram-sha-256``.
  
  **Note:** previous versions of libvirt suggested ``DIGEST-MD5`` and
-diff -ur libvirt-7.5.0.orig/src/qemu/qemu.conf libvirt-7.5.0/src/qemu/qemu.conf
---- libvirt-7.5.0.orig/src/qemu/qemu.conf      2021-07-10 01:12:46.952677568 +0200
-+++ libvirt-7.5.0/src/qemu/qemu.conf   2021-07-10 01:13:10.078677568 +0200
+diff -ur libvirt-8.0.0.orig/src/qemu/qemu.conf libvirt-8.0.0/src/qemu/qemu.conf
+--- libvirt-8.0.0.orig/src/qemu/qemu.conf      2022-01-23 12:13:11.768033168 +0100
++++ libvirt-8.0.0/src/qemu/qemu.conf   2022-01-23 12:13:54.287119217 +0100
 @@ -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-7.5.0.orig/src/qemu/qemu.conf libvirt-7.5.0/src/qemu/qemu.conf
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
-diff -ur libvirt-7.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-7.5.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-7.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2021-07-10 01:12:46.959677568 +0200
-+++ libvirt-7.5.0/src/qemu/test_libvirtd_qemu.aug.in   2021-07-10 01:13:10.078677568 +0200
+diff -ur libvirt-8.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-8.0.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-8.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2022-01-23 12:13:11.775033183 +0100
++++ libvirt-8.0.0/src/qemu/test_libvirtd_qemu.aug.in   2022-01-23 12:13:54.287119217 +0100
 @@ -13,7 +13,7 @@
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
@@ -77,9 +77,9 @@ diff -ur libvirt-7.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-7.5.0/src
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
-diff -ur libvirt-7.5.0.orig/src/remote/libvirtd.conf.in libvirt-7.5.0/src/remote/libvirtd.conf.in
---- libvirt-7.5.0.orig/src/remote/libvirtd.conf.in     2021-07-10 01:12:46.960677568 +0200
-+++ libvirt-7.5.0/src/remote/libvirtd.conf.in  2021-07-10 01:13:10.079677568 +0200
+diff -ur libvirt-8.0.0.orig/src/remote/libvirtd.conf.in libvirt-8.0.0/src/remote/libvirtd.conf.in
+--- libvirt-8.0.0.orig/src/remote/libvirtd.conf.in     2022-01-23 12:13:11.775033183 +0100
++++ libvirt-8.0.0/src/remote/libvirtd.conf.in  2022-01-23 12:13:54.287119217 +0100
 @@ -136,7 +136,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -98,9 +98,9 @@ diff -ur libvirt-7.5.0.orig/src/remote/libvirtd.conf.in libvirt-7.5.0/src/remote
  #auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ur libvirt-7.5.0.orig/src/remote/meson.build libvirt-7.5.0/src/remote/meson.build
---- libvirt-7.5.0.orig/src/remote/meson.build  2021-07-10 01:12:46.960677568 +0200
-+++ libvirt-7.5.0/src/remote/meson.build       2021-07-10 01:13:10.079677568 +0200
+diff -ur libvirt-8.0.0.orig/src/remote/meson.build libvirt-8.0.0/src/remote/meson.build
+--- libvirt-8.0.0.orig/src/remote/meson.build  2022-01-23 12:13:11.776033185 +0100
++++ libvirt-8.0.0/src/remote/meson.build       2022-01-23 12:13:54.288119219 +0100
 @@ -309,7 +309,7 @@
  if conf.has('WITH_SASL')
    install_data(
@@ -110,102 +110,114 @@ diff -ur libvirt-7.5.0.orig/src/remote/meson.build libvirt-7.5.0/src/remote/meso
      rename: [ 'libvirt.conf' ],
    )
  endif
-diff -ur libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-7.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
---- libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2021-07-10 01:12:47.150677568 +0200
-+++ libvirt-7.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args      2021-07-10 01:14:29.481677568 +0200
-@@ -7,7 +7,7 @@
+diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args libvirt-8.0.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args
+--- libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args   2022-01-23 12:13:11.959033556 +0100
++++ libvirt-8.0.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args        2022-01-23 12:15:32.706318406 +0100
+@@ -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 \
- QEMU_AUDIO_DRV=spice \
 -SASL_CONF_PATH=/root/.sasl2 \
 +SASL_CONF_PATH=/root/.sasl \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
+ /usr/bin/qemu-system-x86_64 \
+ -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
---- libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args   2021-07-10 01:12:47.151677568 +0200
-+++ libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args        2021-07-10 01:13:56.615677568 +0200
+diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args
+--- libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args     2022-01-23 12:13:11.960033558 +0100
++++ libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args  2022-01-23 12:15:44.141341542 +0100
 @@ -7,7 +7,7 @@
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
  XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
  QEMU_AUDIO_DRV=none \
 -SASL_CONF_PATH=/root/.sasl2 \
 +SASL_CONF_PATH=/root/.sasl \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
+ /usr/bin/qemu-system-x86_64 \
+ -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
---- libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args    2021-07-10 01:12:47.152677568 +0200
-+++ libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2021-07-10 01:14:19.077677568 +0200
-@@ -7,7 +7,7 @@
+diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args
+--- libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args     2022-01-23 12:13:11.960033558 +0100
++++ libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args  2022-01-23 12:15:47.578348507 +0100
+@@ -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 \
- QEMU_AUDIO_DRV=none \
 -SASL_CONF_PATH=/root/.sasl2 \
 +SASL_CONF_PATH=/root/.sasl \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
+ /usr/bin/qemu-system-x86_64 \
+ -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
---- libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args        2021-07-10 01:12:47.151677568 +0200
-+++ libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args     2021-07-10 01:16:03.483677568 +0200
+diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
+--- libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args        2022-01-23 12:13:11.960033558 +0100
++++ libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args     2022-01-23 12:15:37.354327814 +0100
 @@ -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 \
- /usr/bin/qemu-system-i386 \
+ /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
---- libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args       2021-07-10 01:12:47.152677568 +0200
-+++ libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args    2021-07-10 01:14:04.510677568 +0200
+diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
+--- libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args       2022-01-23 12:13:11.960033558 +0100
++++ libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args    2022-01-23 12:15:20.475293652 +0100
 @@ -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 \
- /usr/bin/qemu-system-i386 \
+ /usr/bin/qemu-system-x86_64 \
+ -name guest=QEMUGuest1,debug-threads=on \
+ -S \
+diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.11.0.args libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.11.0.args
+--- libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.11.0.args      2022-01-23 12:13:11.960033558 +0100
++++ libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.11.0.args   2022-01-23 12:15:28.153309190 +0100
+@@ -7,7 +7,7 @@
+ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+ QEMU_AUDIO_DRV=none \
+-SASL_CONF_PATH=/root/.sasl2 \
++SASL_CONF_PATH=/root/.sasl \
+ /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
---- libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args      2021-07-10 01:12:47.152677568 +0200
-+++ libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args   2021-07-10 01:14:09.866677568 +0200
+diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
+--- libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args      2022-01-23 12:13:11.960033558 +0100
++++ libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args   2022-01-23 12:15:40.112333398 +0100
 @@ -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 \
- /usr/bin/qemu-system-i386 \
+ /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-7.5.0.orig/tests/qemuxml2argvtest.c libvirt-7.5.0/tests/qemuxml2argvtest.c
---- libvirt-7.5.0.orig/tests/qemuxml2argvtest.c        2021-07-10 01:12:47.108677568 +0200
-+++ libvirt-7.5.0/tests/qemuxml2argvtest.c     2021-07-10 01:13:11.819677568 +0200
-@@ -1525,7 +1525,7 @@
+diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvtest.c libvirt-8.0.0/tests/qemuxml2argvtest.c
+--- libvirt-8.0.0.orig/tests/qemuxml2argvtest.c        2022-01-23 12:13:12.005033649 +0100
++++ libvirt-8.0.0/tests/qemuxml2argvtest.c     2022-01-23 12:15:08.509269432 +0100
+@@ -1552,7 +1552,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("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
+     DO_TEST_CAPS_VER("graphics-vnc-sasl", "2.11.0");
+     DO_TEST_CAPS_LATEST("graphics-vnc-sasl");
      driver.config->vncTLS = 1;
-     driver.config->vncTLSx509verify = 1;
-@@ -1555,7 +1555,7 @@
-     DO_TEST("graphics-spice-no-args",
-             QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
+@@ -1577,7 +1577,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("graphics-spice-sasl",
-             QEMU_CAPS_SPICE,
-             QEMU_CAPS_DEVICE_QXL);
-diff -ur libvirt-7.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-7.5.0/tests/virconfdata/libvirtd.conf
---- libvirt-7.5.0.orig/tests/virconfdata/libvirtd.conf 2021-07-10 01:12:47.331677568 +0200
-+++ libvirt-7.5.0/tests/virconfdata/libvirtd.conf      2021-07-10 01:13:11.819677568 +0200
+     DO_TEST_CAPS_LATEST("graphics-spice-sasl");
+     VIR_FREE(driver.config->spiceSASLdir);
+     driver.config->spiceSASL = 0;
+diff -ur libvirt-8.0.0.orig/tests/virconfdata/libvirtd.conf libvirt-8.0.0/tests/virconfdata/libvirtd.conf
+--- libvirt-8.0.0.orig/tests/virconfdata/libvirtd.conf 2022-01-23 12:13:12.112033865 +0100
++++ libvirt-8.0.0/tests/virconfdata/libvirtd.conf      2022-01-23 12:14:04.741140369 +0100
 @@ -91,7 +91,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -224,9 +236,9 @@ diff -ur libvirt-7.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-7.5.0/tests/
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ur libvirt-7.5.0.orig/tests/virconfdata/libvirtd.out libvirt-7.5.0/tests/virconfdata/libvirtd.out
---- libvirt-7.5.0.orig/tests/virconfdata/libvirtd.out  2021-07-10 01:12:47.331677568 +0200
-+++ libvirt-7.5.0/tests/virconfdata/libvirtd.out       2021-07-10 01:13:11.819677568 +0200
+diff -ur libvirt-8.0.0.orig/tests/virconfdata/libvirtd.out libvirt-8.0.0/tests/virconfdata/libvirtd.out
+--- libvirt-8.0.0.orig/tests/virconfdata/libvirtd.out  2022-01-23 12:13:12.112033865 +0100
++++ libvirt-8.0.0/tests/virconfdata/libvirtd.out       2022-01-23 12:14:04.741140369 +0100
 @@ -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 7819d6117a51438913293d9f27e27e1d91c3b449..b71d7fa53113e070462c135fb48b1dee53107d1a 100644 (file)
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,6 +1,18 @@
-diff -ur libvirt-7.5.0.orig/src/remote/meson.build libvirt-7.5.0/src/remote/meson.build
---- libvirt-7.5.0.orig/src/remote/meson.build  2021-07-10 01:22:28.190677568 +0200
-+++ libvirt-7.5.0/src/remote/meson.build       2021-07-10 01:22:48.926677568 +0200
+diff -ur libvirt-8.0.0.orig/src/qemu/meson.build libvirt-8.0.0/src/qemu/meson.build
+--- libvirt-8.0.0.orig/src/qemu/meson.build    2022-01-23 12:33:30.542501853 +0100
++++ libvirt-8.0.0/src/qemu/meson.build 2022-01-23 12:34:27.331616939 +0100
+@@ -173,7 +173,7 @@
+   if conf.has('WITH_SYSCTL')
+     install_data(
+       'postcopy-migration.sysctl',
+-      install_dir: prefix / 'lib' / 'sysctl.d',
++      install_dir: sysconfdir / 'sysctl.d',
+       rename: [ '60-qemu-postcopy-migration.conf' ],
+     )
+   endif
+diff -ur libvirt-8.0.0.orig/src/remote/meson.build libvirt-8.0.0/src/remote/meson.build
+--- libvirt-8.0.0.orig/src/remote/meson.build  2022-01-23 12:33:30.549501867 +0100
++++ libvirt-8.0.0/src/remote/meson.build       2022-01-23 12:33:41.164523379 +0100
 @@ -265,11 +265,9 @@
      endforeach
  

diff --git a/libvirt-udevadm-settle.patch b/libvirt-udevadm-settle.patch
index e9ebe09d813a8a36e705e0011c9310ff1e647cd6..179862f111425262e488aedd782faae8583be6fd 100644 (file)
--- a/libvirt-udevadm-settle.patch
+++ b/libvirt-udevadm-settle.patch
@@ -1,7 +1,7 @@
-diff -ur libvirt-7.5.0.orig/src/util/virutil.c libvirt-7.5.0/src/util/virutil.c
---- libvirt-7.5.0.orig/src/util/virutil.c      2021-07-10 01:20:50.499677568 +0200
-+++ libvirt-7.5.0/src/util/virutil.c   2021-07-10 01:21:10.732677568 +0200
-@@ -1296,7 +1296,7 @@
+diff -ur libvirt-8.0.0.orig/src/util/virutil.c libvirt-8.0.0/src/util/virutil.c
+--- libvirt-8.0.0.orig/src/util/virutil.c      2022-01-23 12:18:28.804674804 +0100
++++ libvirt-8.0.0/src/util/virutil.c   2022-01-23 12:18:44.386706336 +0100
+@@ -1291,7 +1291,7 @@
      if (!(udev = virFindFileInPath(UDEVADM)))
          return;
  

diff --git a/libvirt.spec b/libvirt.spec
index d9984ca60919c58c2fed1c9891b2d0b255bf3ba7..72167f06e59a18809b459d1352f0261047469910 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -49,12 +49,12 @@
 Summary:       Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):     Narzędzia współpracujące z funkcjami wirtualizacji
 Name:          libvirt
-Version:       7.7.0
+Version:       8.0.0
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5: e39f8575154e144e2df1a80c336fe788
+# Source0-md5: 77b9a8fb57ee8000ea9c4d7c4a5fb2ac
 Source1:       libvirtd.init
 Source2:       virtlockd.init
 Source3:       virtlogd.init
@@ -77,14 +77,14 @@ BuildRequires:      autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: bash-completion >= 2.0
 %{?with_ceph:BuildRequires:    ceph-devel}
-BuildRequires: curl-devel >= 7.18.0
+BuildRequires: curl-devel >= 7.19.1
 BuildRequires: cyrus-sasl-devel >= 2.1.26
 BuildRequires: dbus-devel >= 1.0.0
 BuildRequires: device-mapper-devel >= 1.0.0
 BuildRequires: gawk
 BuildRequires: gcc >= 6:4.4
 BuildRequires: gettext-tools >= 0.17
-BuildRequires: glib2-devel >= 2.48.0
+BuildRequires: glib2-devel >= 2.56.0
 %{?with_glusterfs:BuildRequires:       glusterfs-devel >= 3.4.1}
 BuildRequires: gnutls-devel >= 3.2.0
 %{?with_apparmor:BuildRequires:        libapparmor-devel}
@@ -483,6 +483,7 @@ Moduł sekcji Wiresharka do pakietów libvirt.
        -Dglusterfs=%{__enabled_disabled glusterfs} \
        -Dlibiscsi=enabled \
        -Dlibnl=enabled \
+       -Dlibpcap=enabled \
        -Dlibssh=enabled \
        -Dlibssh2=enabled \
        -Dnetcf=%{__enabled_disabled netcf} \
@@ -678,6 +679,7 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/virtlockd
 %attr(754,root,root) /etc/rc.d/init.d/virtlogd
 %config(noreplace) %verify(not md5 mtime size) /etc/sysctl.d/60-libvirtd.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/sysctl.d/60-qemu-postcopy-migration.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd
 %if %{with apparmor}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/local/usr.lib.libvirt.virt-aa-helper
@@ -883,6 +885,7 @@ fi
 %attr(755,root,root) %{_bindir}/virt-host-validate
 %attr(4755,root,root) %{_bindir}/virt-login-shell
 %attr(755,root,root) %{_bindir}/virt-xml-validate
+%attr(755,root,root) %{_bindir}/virt-pki-query-dn
 %attr(755,root,root) %{_bindir}/virt-pki-validate
 %if %{with qemu}
 %attr(755,root,root) %{_bindir}/virt-qemu-run
@@ -895,10 +898,12 @@ fi
 %{_mandir}/man1/virt-host-validate.1*
 %{_mandir}/man1/virt-login-shell.1*
 %{_mandir}/man1/virt-xml-validate.1*
+%{_mandir}/man1/virt-pki-query-dn.1*
 %{_mandir}/man1/virt-pki-validate.1*
 %if %{with qemu}
 %{_mandir}/man1/virt-qemu-run.1*
 %endif
+%{_mandir}/man8/virt-ssh-helper.8*
 %dir %{_datadir}/libvirt/schemas
 %{_datadir}/libvirt/schemas/basictypes.rng
 %{_datadir}/libvirt/schemas/capability.rng