- updated to 9.0.0

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index d10ea7d0b7c48b5135a8a314b870f9fb75a887ca..a2c255cd8c42c49e86f1b324398ed3d75e1306c4 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -ur libvirt-8.4.0.orig/src/qemu/qemu_command.c libvirt-8.4.0/src/qemu/qemu_command.c
---- libvirt-8.4.0.orig/src/qemu/qemu_command.c 2022-06-03 00:01:50.967940423 +0200
-+++ libvirt-8.4.0/src/qemu/qemu_command.c      2022-06-03 00:02:10.338979122 +0200
-@@ -8318,6 +8318,10 @@
+diff -ur libvirt-9.0.0.orig/src/qemu/qemu_command.c libvirt-9.0.0/src/qemu/qemu_command.c
+--- libvirt-9.0.0.orig/src/qemu/qemu_command.c 2023-02-08 18:27:57.203025166 +0100
++++ libvirt-9.0.0/src/qemu/qemu_command.c      2023-02-08 18:28:12.916022463 +0100
+@@ -7880,6 +7880,10 @@
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -12,10 +12,10 @@ diff -ur libvirt-8.4.0.orig/src/qemu/qemu_command.c libvirt-8.4.0/src/qemu/qemu_
      }
  
      if (graphics->data.vnc.powerControl != VIR_TRISTATE_BOOL_ABSENT) {
-diff -ur libvirt-8.4.0.orig/src/qemu/qemu_conf.c libvirt-8.4.0/src/qemu/qemu_conf.c
---- libvirt-8.4.0.orig/src/qemu/qemu_conf.c    2022-06-03 00:01:50.967940423 +0200
-+++ libvirt-8.4.0/src/qemu/qemu_conf.c 2022-06-03 00:02:13.756985948 +0200
-@@ -439,6 +439,8 @@
+diff -ur libvirt-9.0.0.orig/src/qemu/qemu_conf.c libvirt-9.0.0/src/qemu/qemu_conf.c
+--- libvirt-9.0.0.orig/src/qemu/qemu_conf.c    2023-02-08 18:27:57.204025166 +0100
++++ libvirt-9.0.0/src/qemu/qemu_conf.c 2023-02-08 18:28:12.917022463 +0100
+@@ -444,6 +444,8 @@
          return -1;
      if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
          return -1;
@@ -24,10 +24,10 @@ diff -ur libvirt-8.4.0.orig/src/qemu/qemu_conf.c libvirt-8.4.0/src/qemu/qemu_con
  
      if (cfg->vncPassword &&
          strlen(cfg->vncPassword) > 8) {
-diff -ur libvirt-8.4.0.orig/src/qemu/qemu_conf.h libvirt-8.4.0/src/qemu/qemu_conf.h
---- libvirt-8.4.0.orig/src/qemu/qemu_conf.h    2022-06-03 00:01:50.967940423 +0200
-+++ libvirt-8.4.0/src/qemu/qemu_conf.h 2022-06-03 00:02:13.756985948 +0200
-@@ -114,6 +114,7 @@
+diff -ur libvirt-9.0.0.orig/src/qemu/qemu_conf.h libvirt-9.0.0/src/qemu/qemu_conf.h
+--- libvirt-9.0.0.orig/src/qemu/qemu_conf.h    2023-02-08 18:27:57.204025166 +0100
++++ libvirt-9.0.0/src/qemu/qemu_conf.h 2023-02-08 18:28:12.917022463 +0100
+@@ -119,6 +119,7 @@
      bool vncTLSx509verify;
      bool vncTLSx509verifyPresent;
      bool vncSASL;
@@ -35,9 +35,9 @@ diff -ur libvirt-8.4.0.orig/src/qemu/qemu_conf.h libvirt-8.4.0/src/qemu/qemu_con
      char *vncTLSx509certdir;
      char *vncTLSx509secretUUID;
      char *vncListen;
-diff -ur libvirt-8.4.0.orig/src/qemu/qemu.conf.in libvirt-8.4.0/src/qemu/qemu.conf.in
---- libvirt-8.4.0.orig/src/qemu/qemu.conf.in   2022-06-03 00:01:50.966940421 +0200
-+++ libvirt-8.4.0/src/qemu/qemu.conf.in        2022-06-03 00:03:50.351178936 +0200
+diff -ur libvirt-9.0.0.orig/src/qemu/qemu.conf.in libvirt-9.0.0/src/qemu/qemu.conf.in
+--- libvirt-9.0.0.orig/src/qemu/qemu.conf.in   2023-02-08 18:27:57.202025167 +0100
++++ libvirt-9.0.0/src/qemu/qemu.conf.in        2023-02-08 18:28:12.917022463 +0100
 @@ -147,6 +147,15 @@
  #vnc_sasl = 1
  

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 1626d1d3bde2545b9c63bc957ecddee92a567280..7f3489969d51412779c4073ddee3c88ce7e70eb4 100644 (file)
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,6 +1,6 @@
-diff -ur libvirt-8.4.0.orig/docs/auth.rst libvirt-8.4.0/docs/auth.rst
---- libvirt-8.4.0.orig/docs/auth.rst   2022-06-02 23:58:08.077490237 +0200
-+++ libvirt-8.4.0/docs/auth.rst        2022-06-02 23:58:27.936533169 +0200
+diff -ur libvirt-9.0.0.orig/docs/auth.rst libvirt-9.0.0/docs/auth.rst
+--- libvirt-9.0.0.orig/docs/auth.rst   2023-02-08 18:26:20.114029939 +0100
++++ libvirt-9.0.0/docs/auth.rst        2023-02-08 18:26:39.061029574 +0100
 @@ -225,7 +225,7 @@
  
  Since the libvirt SASL config file defaults to using ``GSSAPI`` (Kerberos), a
@@ -10,9 +10,9 @@ diff -ur libvirt-8.4.0.orig/docs/auth.rst libvirt-8.4.0/docs/auth.rst
  parameter to ``scram-sha-256``.
  
  **Note:** previous versions of libvirt suggested ``DIGEST-MD5`` and
-diff -ur libvirt-8.4.0.orig/src/qemu/qemu.conf.in libvirt-8.4.0/src/qemu/qemu.conf.in
---- libvirt-8.4.0.orig/src/qemu/qemu.conf.in   2022-06-02 23:58:08.164490425 +0200
-+++ libvirt-8.4.0/src/qemu/qemu.conf.in        2022-06-03 00:01:05.398849381 +0200
+diff -ur libvirt-9.0.0.orig/src/qemu/qemu.conf.in libvirt-9.0.0/src/qemu/qemu.conf.in
+--- libvirt-9.0.0.orig/src/qemu/qemu.conf.in   2023-02-08 18:26:20.202029937 +0100
++++ libvirt-9.0.0/src/qemu/qemu.conf.in        2023-02-08 18:26:39.062029574 +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-8.4.0.orig/src/qemu/qemu.conf.in libvirt-8.4.0/src/qemu/qemu.co
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
-diff -ur libvirt-8.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-8.4.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-8.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2022-06-02 23:58:08.170490438 +0200
-+++ libvirt-8.4.0/src/qemu/test_libvirtd_qemu.aug.in   2022-06-02 23:58:30.521538761 +0200
+diff -ur libvirt-9.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-9.0.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-9.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2023-02-08 18:26:20.209029937 +0100
++++ libvirt-9.0.0/src/qemu/test_libvirtd_qemu.aug.in   2023-02-08 18:26:39.062029574 +0100
 @@ -13,7 +13,7 @@
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
@@ -77,10 +77,10 @@ diff -ur libvirt-8.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-8.4.0/src
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
-diff -ur libvirt-8.4.0.orig/src/remote/libvirtd.conf.in libvirt-8.4.0/src/remote/libvirtd.conf.in
---- libvirt-8.4.0.orig/src/remote/libvirtd.conf.in     2022-06-02 23:58:08.171490440 +0200
-+++ libvirt-8.4.0/src/remote/libvirtd.conf.in  2022-06-02 23:58:30.521538761 +0200
-@@ -136,7 +136,7 @@
+diff -ur libvirt-9.0.0.orig/src/remote/libvirtd.conf.in libvirt-9.0.0/src/remote/libvirtd.conf.in
+--- libvirt-9.0.0.orig/src/remote/libvirtd.conf.in     2023-02-08 18:26:20.209029937 +0100
++++ libvirt-9.0.0/src/remote/libvirtd.conf.in  2023-02-08 18:26:39.062029574 +0100
+@@ -140,7 +140,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
  #  - sasl: use SASL infrastructure. The actual auth scheme is then
@@ -89,7 +89,7 @@ diff -ur libvirt-8.4.0.orig/src/remote/libvirtd.conf.in libvirt-8.4.0/src/remote
  #          socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
  #          For non-TCP or TLS sockets, any scheme is allowed.
  #
-@@ -186,7 +186,7 @@
+@@ -190,7 +190,7 @@
  # If you don't enable SASL, then all TCP traffic is cleartext.
  # Don't do this outside of a dev/test scenario. For real world
  # use, always enable SASL and use the GSSAPI or DIGEST-MD5
@@ -98,9 +98,9 @@ diff -ur libvirt-8.4.0.orig/src/remote/libvirtd.conf.in libvirt-8.4.0/src/remote
  #auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ur libvirt-8.4.0.orig/src/remote/meson.build libvirt-8.4.0/src/remote/meson.build
---- libvirt-8.4.0.orig/src/remote/meson.build  2022-06-02 23:58:08.171490440 +0200
-+++ libvirt-8.4.0/src/remote/meson.build       2022-06-02 23:58:30.522538764 +0200
+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:26:20.209029937 +0100
++++ libvirt-9.0.0/src/remote/meson.build       2023-02-08 18:26:39.062029574 +0100
 @@ -302,7 +302,7 @@
  if conf.has('WITH_SASL')
    install_data(
@@ -110,9 +110,9 @@ diff -ur libvirt-8.4.0.orig/src/remote/meson.build libvirt-8.4.0/src/remote/meso
      rename: [ 'libvirt.conf' ],
    )
  endif
-diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args
---- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args   2022-06-02 23:58:08.323490769 +0200
-+++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args        2022-06-02 23:58:30.522538764 +0200
+diff -ur libvirt-9.0.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args libvirt-9.0.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args
+--- libvirt-9.0.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args   2023-02-08 18:26:20.343029934 +0100
++++ libvirt-9.0.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args        2023-02-08 18:26:39.062029574 +0100
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -122,9 +122,9 @@ diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-la
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args
---- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args     2022-06-02 23:58:08.324490771 +0200
-+++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args  2022-06-02 23:58:31.535540952 +0200
+diff -ur libvirt-9.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args libvirt-9.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args
+--- libvirt-9.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args     2023-02-08 18:26:20.344029934 +0100
++++ libvirt-9.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args  2023-02-08 18:26:39.063029574 +0100
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -134,9 +134,9 @@ diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-late
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-8.4.0.orig/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
---- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args        2022-06-02 23:58:08.324490771 +0200
-+++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args     2022-06-02 23:58:31.535540952 +0200
+diff -ur libvirt-9.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args libvirt-9.0.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
+--- libvirt-9.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args        2023-02-08 18:26:20.344029934 +0100
++++ libvirt-9.0.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args     2023-02-08 18:26:39.063029574 +0100
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -146,9 +146,9 @@ diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_6
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
---- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args       2022-06-02 23:58:08.324490771 +0200
-+++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args    2022-06-02 23:58:31.536540954 +0200
+diff -ur libvirt-9.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-9.0.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
+--- libvirt-9.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args       2023-02-08 18:26:20.344029934 +0100
++++ libvirt-9.0.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args    2023-02-08 18:26:39.063029574 +0100
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -158,9 +158,9 @@ diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_6
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
---- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args      2022-06-02 23:58:08.324490771 +0200
-+++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args   2022-06-02 23:58:32.239542466 +0200
+diff -ur libvirt-9.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-9.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
+--- libvirt-9.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args      2023-02-08 18:26:20.344029934 +0100
++++ libvirt-9.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args   2023-02-08 18:26:39.063029574 +0100
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -170,10 +170,10 @@ diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-lates
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvtest.c libvirt-8.4.0/tests/qemuxml2argvtest.c
---- libvirt-8.4.0.orig/tests/qemuxml2argvtest.c        2022-06-02 23:58:08.469491084 +0200
-+++ libvirt-8.4.0/tests/qemuxml2argvtest.c     2022-06-02 23:59:10.540619907 +0200
-@@ -1509,7 +1509,7 @@
+diff -ur libvirt-9.0.0.orig/tests/qemuxml2argvtest.c libvirt-9.0.0/tests/qemuxml2argvtest.c
+--- libvirt-9.0.0.orig/tests/qemuxml2argvtest.c        2023-02-08 18:26:20.386029934 +0100
++++ libvirt-9.0.0/tests/qemuxml2argvtest.c     2023-02-08 18:26:39.064029574 +0100
+@@ -1394,7 +1394,7 @@
  
      driver.config->vncSASL = 1;
      VIR_FREE(driver.config->vncSASLdir);
@@ -182,7 +182,7 @@ diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvtest.c libvirt-8.4.0/tests/qemuxml
      DO_TEST_CAPS_LATEST("graphics-vnc-sasl");
      driver.config->vncTLS = 1;
      driver.config->vncTLSx509verify = 1;
-@@ -1531,7 +1531,7 @@
+@@ -1416,7 +1416,7 @@
      DO_TEST_CAPS_LATEST("graphics-spice");
      DO_TEST_CAPS_LATEST("graphics-spice-no-args");
      driver.config->spiceSASL = 1;
@@ -191,9 +191,9 @@ diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvtest.c libvirt-8.4.0/tests/qemuxml
      DO_TEST_CAPS_LATEST("graphics-spice-sasl");
      VIR_FREE(driver.config->spiceSASLdir);
      driver.config->spiceSASL = 0;
-diff -ur libvirt-8.4.0.orig/tests/virconfdata/libvirtd.conf libvirt-8.4.0/tests/virconfdata/libvirtd.conf
---- libvirt-8.4.0.orig/tests/virconfdata/libvirtd.conf 2022-06-02 23:58:08.555491270 +0200
-+++ libvirt-8.4.0/tests/virconfdata/libvirtd.conf      2022-06-02 23:58:32.240542468 +0200
+diff -ur libvirt-9.0.0.orig/tests/virconfdata/libvirtd.conf libvirt-9.0.0/tests/virconfdata/libvirtd.conf
+--- libvirt-9.0.0.orig/tests/virconfdata/libvirtd.conf 2023-02-08 18:26:20.464029932 +0100
++++ libvirt-9.0.0/tests/virconfdata/libvirtd.conf      2023-02-08 18:26:39.064029574 +0100
 @@ -91,7 +91,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -212,9 +212,9 @@ diff -ur libvirt-8.4.0.orig/tests/virconfdata/libvirtd.conf libvirt-8.4.0/tests/
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ur libvirt-8.4.0.orig/tests/virconfdata/libvirtd.out libvirt-8.4.0/tests/virconfdata/libvirtd.out
---- libvirt-8.4.0.orig/tests/virconfdata/libvirtd.out  2022-06-02 23:58:08.555491270 +0200
-+++ libvirt-8.4.0/tests/virconfdata/libvirtd.out       2022-06-02 23:58:32.240542468 +0200
+diff -ur libvirt-9.0.0.orig/tests/virconfdata/libvirtd.out libvirt-9.0.0/tests/virconfdata/libvirtd.out
+--- libvirt-9.0.0.orig/tests/virconfdata/libvirtd.out  2023-02-08 18:26:20.464029932 +0100
++++ libvirt-9.0.0/tests/virconfdata/libvirtd.out       2023-02-08 18:26:39.075029574 +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 5a7ba4f6433b8452572f69a70a326121db58e393..85de2affca9a12968bdeb24aa9348b8b324bb382 100644 (file)
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,7 +1,7 @@
-diff -ur libvirt-8.4.0.orig/src/qemu/meson.build libvirt-8.4.0/src/qemu/meson.build
---- libvirt-8.4.0.orig/src/qemu/meson.build    2022-06-03 00:19:08.479019287 +0200
-+++ libvirt-8.4.0/src/qemu/meson.build 2022-06-03 00:19:24.410051620 +0200
-@@ -193,7 +193,7 @@
+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')
      install_data(
        'postcopy-migration.sysctl',
@@ -10,9 +10,9 @@ diff -ur libvirt-8.4.0.orig/src/qemu/meson.build libvirt-8.4.0/src/qemu/meson.bu
        rename: [ '60-qemu-postcopy-migration.conf' ],
      )
    endif
-diff -ur libvirt-8.4.0.orig/src/remote/meson.build libvirt-8.4.0/src/remote/meson.build
---- libvirt-8.4.0.orig/src/remote/meson.build  2022-06-03 00:19:08.485019299 +0200
-+++ libvirt-8.4.0/src/remote/meson.build       2022-06-03 00:19:24.410051620 +0200
+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 @@
      endforeach
  

diff --git a/libvirt-udevadm-settle.patch b/libvirt-udevadm-settle.patch
index 478106bc1e4e7c04ebfec71d37e293147a052dde..7ae308825cac3bbd6e257019d7e76b203792de6a 100644 (file)
--- a/libvirt-udevadm-settle.patch
+++ b/libvirt-udevadm-settle.patch
@@ -1,7 +1,7 @@
-diff -ur libvirt-8.4.0.orig/src/util/virutil.c libvirt-8.4.0/src/util/virutil.c
---- libvirt-8.4.0.orig/src/util/virutil.c      2022-06-03 00:14:24.210445318 +0200
-+++ libvirt-8.4.0/src/util/virutil.c   2022-06-03 00:14:38.976474815 +0200
-@@ -1249,7 +1249,7 @@
+diff -ur libvirt-9.0.0.orig/src/util/virutil.c libvirt-9.0.0/src/util/virutil.c
+--- libvirt-9.0.0.orig/src/util/virutil.c      2023-02-08 18:29:14.753010482 +0100
++++ libvirt-9.0.0/src/util/virutil.c   2023-02-08 18:29:31.336006864 +0100
+@@ -1247,7 +1247,7 @@
      if (!(udev = virFindFileInPath(UDEVADM)))
          return;
  

diff --git a/libvirt.spec b/libvirt.spec
index 5987b92534316b379d824cc6e9f752d78bbd75a8..85ae2a23fd074f64dcd8b316c9645cdbe93f6814 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:       8.7.0
+Version:       9.0.0
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5: 7fd1af6a609201e7ca887e791d7b13b2
+# Source0-md5: f0c41217d6dd89ce558465bb3caf6e5c
 Source1:       libvirtd.init
 Source2:       virtlockd.init
 Source3:       virtlogd.init
@@ -116,7 +116,6 @@ BuildRequires:      readline-devel >= 7.0
 BuildRequires: rpcsvc-proto
 BuildRequires: rpmbuild(macros) >= 1.753-5
 %{?with_sanlock:BuildRequires: sanlock-devel >= 0.8}
-BuildRequires: sheepdog
 %{?with_systemtap:BuildRequires:       systemtap-sdt-devel}
 BuildRequires: udev-devel >= 1:219
 %{?with_wireshark:BuildRequires:       wireshark-devel >= 2.6.0}
@@ -264,7 +263,6 @@ Suggests:   parted >= 1.8.0
 Suggests:      polkit >= 0.93
 #Suggests:     radvd
 Suggests:      scrub
-#Suggests:     sheepdog
 Provides:      libvirt(hypervisor)
 
 %description daemon
@@ -504,14 +502,12 @@ Moduł sekcji Wiresharka do pakietów libvirt.
        -Dstorage_dir=enabled \
        -Dstorage_disk=enabled \
        -Dstorage_fs=enabled \
-       -Dstorage_glusterfs=%{__enabled_disabled glusterfs} \
        -Dstorage_iscsi=enabled \
        -Dstorage_iscsi_direct=enabled \
        -Dstorage_lvm=enabled \
        -Dstorage_mpath=enabled \
        -Dstorage_rbd=%{__enabled_disabled ceph} \
        -Dstorage_scsi=enabled \
-       -Dstorage_sheepdog=enabled \
        -Dstorage_vstorage=disabled \
        -Dstorage_zfs=enabled \
        -Ddriver_bhyve=disabled \
@@ -768,7 +764,6 @@ fi
 # mpath requires libdevmapper, but libvirt itself requires it too
 %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_mpath.so
 %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_scsi.so
-%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_sheepdog.so
 %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_zfs.so
 %dir %{_libdir}/libvirt/storage-file
 %attr(755,root,root) %{_libdir}/libvirt/storage-file/libvirt_storage_file_fs.so
@@ -888,7 +883,9 @@ fi
 %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-qmp-proxy
 %attr(755,root,root) %{_bindir}/virt-qemu-run
+%attr(755,root,root) %{_bindir}/virt-qemu-sev-validate
 %endif
 %attr(755,root,root) %{_bindir}/virt-ssh-helper
 %attr(754,root,root) %{_libexecdir}/libvirt-guests.sh
@@ -901,7 +898,9 @@ fi
 %{_mandir}/man1/virt-pki-query-dn.1*
 %{_mandir}/man1/virt-pki-validate.1*
 %if %{with qemu}
+%{_mandir}/man1/virt-qemu-qmp-proxy.1*
 %{_mandir}/man1/virt-qemu-run.1*
+%{_mandir}/man1/virt-qemu-sev-validate.1*
 %endif
 %{_mandir}/man8/virt-ssh-helper.8*
 %dir %{_datadir}/libvirt/schemas
@@ -914,7 +913,9 @@ fi
 %{_datadir}/libvirt/schemas/domaincaps.rng
 %{_datadir}/libvirt/schemas/domaincheckpoint.rng
 %{_datadir}/libvirt/schemas/domaincommon.rng
+%{_datadir}/libvirt/schemas/domainoverrides.rng
 %{_datadir}/libvirt/schemas/domainsnapshot.rng
+%{_datadir}/libvirt/schemas/inactiveDomain.rng
 %{_datadir}/libvirt/schemas/interface.rng
 %{_datadir}/libvirt/schemas/network.rng
 %{_datadir}/libvirt/schemas/networkcommon.rng
@@ -923,6 +924,7 @@ fi
 %{_datadir}/libvirt/schemas/nwfilter.rng
 %{_datadir}/libvirt/schemas/nwfilter_params.rng
 %{_datadir}/libvirt/schemas/nwfilterbinding.rng
+%{_datadir}/libvirt/schemas/privatedata.rng
 %{_datadir}/libvirt/schemas/secret.rng
 %{_datadir}/libvirt/schemas/storagecommon.rng
 %{_datadir}/libvirt/schemas/storagepool.rng