- updated to 2.3.0

diff --git a/bashisms.patch b/bashisms.patch
index 68ef8784276135d7ed4005d7df4c72c05471cca1..fb3f93a1fb686924bdaff9408519ee90a866b048 100644 (file)
--- a/bashisms.patch
+++ b/bashisms.patch
@@ -1,15 +1,15 @@
-diff -urp libvirt-2.1.0.orig/src/locking/virtlockd.init.in libvirt-2.1.0/src/locking/virtlockd.init.in
---- libvirt-2.1.0.orig/src/locking/virtlockd.init.in   2016-08-20 10:27:48.111554000 +0000
-+++ libvirt-2.1.0/src/locking/virtlockd.init.in        2016-08-20 10:28:19.098554000 +0000
+diff -urp libvirt-2.3.0.orig/src/locking/virtlockd.init.in libvirt-2.3.0/src/locking/virtlockd.init.in
+--- libvirt-2.3.0.orig/src/locking/virtlockd.init.in   2016-10-28 19:18:18.158715000 +0000
++++ libvirt-2.3.0/src/locking/virtlockd.init.in        2016-10-28 19:18:43.566715000 +0000
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
  
  # the following is the LSB init header see
  # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html
-diff -urp libvirt-2.1.0.orig/tools/libvirt-guests.sh.in libvirt-2.1.0/tools/libvirt-guests.sh.in
---- libvirt-2.1.0.orig/tools/libvirt-guests.sh.in      2016-08-20 10:27:48.167554000 +0000
-+++ libvirt-2.1.0/tools/libvirt-guests.sh.in   2016-08-20 10:28:19.097554000 +0000
+diff -urp libvirt-2.3.0.orig/tools/libvirt-guests.sh.in libvirt-2.3.0/tools/libvirt-guests.sh.in
+--- libvirt-2.3.0.orig/tools/libvirt-guests.sh.in      2016-10-28 19:18:18.097715000 +0000
++++ libvirt-2.3.0/tools/libvirt-guests.sh.in   2016-10-28 19:18:43.574715000 +0000
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash

diff --git a/libvirt-guests.init.patch b/libvirt-guests.init.patch
index 84e90cef912090fc63b3f9375308387264de82d3..b2be897e65186f8bb2ac128f6864a8f58319c904 100644 (file)
--- a/libvirt-guests.init.patch
+++ b/libvirt-guests.init.patch
@@ -1,6 +1,6 @@
-diff -urp libvirt-2.1.0.orig/tools/libvirt-guests.init.in libvirt-2.1.0/tools/libvirt-guests.init.in
---- libvirt-2.1.0.orig/tools/libvirt-guests.init.in    2016-08-20 10:28:36.230554000 +0000
-+++ libvirt-2.1.0/tools/libvirt-guests.init.in 2016-08-20 10:29:22.215554000 +0000
+diff -urp libvirt-2.3.0.orig/tools/libvirt-guests.init.in libvirt-2.3.0/tools/libvirt-guests.init.in
+--- libvirt-2.3.0.orig/tools/libvirt-guests.init.in    2016-10-28 19:19:00.347715000 +0000
++++ libvirt-2.3.0/tools/libvirt-guests.init.in 2016-10-28 19:19:48.334715000 +0000
 @@ -28,3 +28,6 @@
  #
  

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index e2de6e56806e13b835e38e018345cf727e1c3676..afb752e68d067dbcaff19ac950b68c54829527f4 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-2.1.0.orig/src/qemu/qemu_command.c libvirt-2.1.0/src/qemu/qemu_command.c
---- libvirt-2.1.0.orig/src/qemu/qemu_command.c 2016-08-20 10:12:37.332554000 +0000
-+++ libvirt-2.1.0/src/qemu/qemu_command.c      2016-08-20 10:13:30.288554000 +0000
-@@ -7519,6 +7519,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+diff -urp libvirt-2.3.0.orig/src/qemu/qemu_command.c libvirt-2.3.0/src/qemu/qemu_command.c
+--- libvirt-2.3.0.orig/src/qemu/qemu_command.c 2016-10-28 19:15:31.893715000 +0000
++++ libvirt-2.3.0/src/qemu/qemu_command.c      2016-10-28 19:15:54.915715000 +0000
+@@ -7536,6 +7536,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -12,10 +12,10 @@ diff -urp libvirt-2.1.0.orig/src/qemu/qemu_command.c libvirt-2.1.0/src/qemu/qemu
      }
  
      virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-2.1.0.orig/src/qemu/qemu.conf libvirt-2.1.0/src/qemu/qemu.conf
---- libvirt-2.1.0.orig/src/qemu/qemu.conf      2016-08-20 10:12:37.337554000 +0000
-+++ libvirt-2.1.0/src/qemu/qemu.conf   2016-08-20 10:13:30.289554000 +0000
-@@ -80,6 +80,15 @@
+diff -urp libvirt-2.3.0.orig/src/qemu/qemu.conf libvirt-2.3.0/src/qemu/qemu.conf
+--- libvirt-2.3.0.orig/src/qemu/qemu.conf      2016-10-28 19:15:31.898715000 +0000
++++ libvirt-2.3.0/src/qemu/qemu.conf   2016-10-28 19:15:54.916715000 +0000
+@@ -104,6 +104,15 @@
  #vnc_sasl = 1
  
  
@@ -31,10 +31,10 @@ diff -urp libvirt-2.1.0.orig/src/qemu/qemu.conf libvirt-2.1.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 -urp libvirt-2.1.0.orig/src/qemu/qemu_conf.c libvirt-2.1.0/src/qemu/qemu_conf.c
---- libvirt-2.1.0.orig/src/qemu/qemu_conf.c    2016-08-20 10:12:37.334554000 +0000
-+++ libvirt-2.1.0/src/qemu/qemu_conf.c 2016-08-20 10:15:22.160554000 +0000
-@@ -425,6 +425,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
+diff -urp libvirt-2.3.0.orig/src/qemu/qemu_conf.c libvirt-2.3.0/src/qemu/qemu_conf.c
+--- libvirt-2.3.0.orig/src/qemu/qemu_conf.c    2016-10-28 19:15:31.894715000 +0000
++++ libvirt-2.3.0/src/qemu/qemu_conf.c 2016-10-28 19:15:54.917715000 +0000
+@@ -468,6 +468,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
          goto cleanup;
      if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0)
          goto cleanup;
@@ -43,10 +43,10 @@ diff -urp libvirt-2.1.0.orig/src/qemu/qemu_conf.c libvirt-2.1.0/src/qemu/qemu_co
  
  
      if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
-diff -urp libvirt-2.1.0.orig/src/qemu/qemu_conf.h libvirt-2.1.0/src/qemu/qemu_conf.h
---- libvirt-2.1.0.orig/src/qemu/qemu_conf.h    2016-08-20 10:12:37.334554000 +0000
-+++ libvirt-2.1.0/src/qemu/qemu_conf.h 2016-08-20 10:13:30.294554000 +0000
-@@ -113,6 +113,7 @@ struct _virQEMUDriverConfig {
+diff -urp libvirt-2.3.0.orig/src/qemu/qemu_conf.h libvirt-2.3.0/src/qemu/qemu_conf.h
+--- libvirt-2.3.0.orig/src/qemu/qemu_conf.h    2016-10-28 19:15:31.894715000 +0000
++++ libvirt-2.3.0/src/qemu/qemu_conf.h 2016-10-28 19:15:54.917715000 +0000
+@@ -116,6 +116,7 @@ struct _virQEMUDriverConfig {
      bool vncTLS;
      bool vncTLSx509verify;
      bool vncSASL;

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 474acdb2b33aa601bf069f19d05183ca7228deae..179b54997e675f73971388f37937c009915cc97f 100644 (file)
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,6 +1,6 @@
-diff -urp libvirt-2.1.0.orig/daemon/libvirtd.conf libvirt-2.1.0/daemon/libvirtd.conf
---- libvirt-2.1.0.orig/daemon/libvirtd.conf    2016-08-20 10:07:32.043554000 +0000
-+++ libvirt-2.1.0/daemon/libvirtd.conf 2016-08-20 10:07:47.074554000 +0000
+diff -urp libvirt-2.3.0.orig/daemon/libvirtd.conf libvirt-2.3.0/daemon/libvirtd.conf
+--- libvirt-2.3.0.orig/daemon/libvirtd.conf    2016-10-28 19:13:22.641715000 +0000
++++ libvirt-2.3.0/daemon/libvirtd.conf 2016-10-28 19:13:48.452715000 +0000
 @@ -123,7 +123,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -19,9 +19,9 @@ diff -urp libvirt-2.1.0.orig/daemon/libvirtd.conf libvirt-2.1.0/daemon/libvirtd.
  #auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -urp libvirt-2.1.0.orig/daemon/Makefile.am libvirt-2.1.0/daemon/Makefile.am
---- libvirt-2.1.0.orig/daemon/Makefile.am      2016-08-20 10:07:32.040554000 +0000
-+++ libvirt-2.1.0/daemon/Makefile.am   2016-08-20 10:07:47.074554000 +0000
+diff -urp libvirt-2.3.0.orig/daemon/Makefile.am libvirt-2.3.0/daemon/Makefile.am
+--- libvirt-2.3.0.orig/daemon/Makefile.am      2016-10-28 19:13:22.638715000 +0000
++++ libvirt-2.3.0/daemon/Makefile.am   2016-10-28 19:13:48.468715000 +0000
 @@ -528,13 +528,13 @@ POD2MAN = pod2man -c "Virtualization Sup
  # the WITH_LIBVIRTD conditional
  if WITH_SASL
@@ -40,10 +40,10 @@ diff -urp libvirt-2.1.0.orig/daemon/Makefile.am libvirt-2.1.0/daemon/Makefile.am
  else ! WITH_SASL
  install-data-sasl:
  uninstall-data-sasl:
-diff -urp libvirt-2.1.0.orig/daemon/Makefile.in libvirt-2.1.0/daemon/Makefile.in
---- libvirt-2.1.0.orig/daemon/Makefile.in      2016-08-20 10:07:32.040554000 +0000
-+++ libvirt-2.1.0/daemon/Makefile.in   2016-08-20 10:07:47.076554000 +0000
-@@ -2842,13 +2842,13 @@ admin_dispatch.h: $(top_srcdir)/src/rpc/
+diff -urp libvirt-2.3.0.orig/daemon/Makefile.in libvirt-2.3.0/daemon/Makefile.in
+--- libvirt-2.3.0.orig/daemon/Makefile.in      2016-10-28 19:13:22.638715000 +0000
++++ libvirt-2.3.0/daemon/Makefile.in   2016-10-28 19:13:48.469715000 +0000
+@@ -2847,13 +2847,13 @@ admin_dispatch.h: $(top_srcdir)/src/rpc/
  # This is needed for clients too, so can't wrap in
  # the WITH_LIBVIRTD conditional
  @WITH_SASL_TRUE@install-data-sasl:
@@ -61,9 +61,9 @@ diff -urp libvirt-2.1.0.orig/daemon/Makefile.in libvirt-2.1.0/daemon/Makefile.in
  @WITH_SASL_FALSE@install-data-sasl:
  @WITH_SASL_FALSE@uninstall-data-sasl:
  
-diff -urp libvirt-2.1.0.orig/docs/auth.html libvirt-2.1.0/docs/auth.html
---- libvirt-2.1.0.orig/docs/auth.html  2016-08-20 10:07:32.082554000 +0000
-+++ libvirt-2.1.0/docs/auth.html       2016-08-20 10:07:47.076554000 +0000
+diff -urp libvirt-2.3.0.orig/docs/auth.html libvirt-2.3.0/docs/auth.html
+--- libvirt-2.3.0.orig/docs/auth.html  2016-10-28 19:13:22.665715000 +0000
++++ libvirt-2.3.0/docs/auth.html       2016-10-28 19:13:48.470715000 +0000
 @@ -415,7 +415,7 @@ again:
  The plain TCP socket of the libvirt daemon defaults to using SASL for authentication.
  The SASL mechanism configured by default is DIGEST-MD5, which provides a basic
@@ -73,9 +73,9 @@ diff -urp libvirt-2.1.0.orig/docs/auth.html libvirt-2.1.0/docs/auth.html
  The <code>mech_list</code> parameter must first be changed to <code>gssapi</code>
  instead of the default <code>digest-md5</code>, and keytab should be set to
  <code>/etc/libvirt/krb5.tab</code> . If SASL is enabled on the UNIX
-diff -urp libvirt-2.1.0.orig/docs/auth.html.in libvirt-2.1.0/docs/auth.html.in
---- libvirt-2.1.0.orig/docs/auth.html.in       2016-08-20 10:07:32.100554000 +0000
-+++ libvirt-2.1.0/docs/auth.html.in    2016-08-20 10:07:47.077554000 +0000
+diff -urp libvirt-2.3.0.orig/docs/auth.html.in libvirt-2.3.0/docs/auth.html.in
+--- libvirt-2.3.0.orig/docs/auth.html.in       2016-10-28 19:13:22.677715000 +0000
++++ libvirt-2.3.0/docs/auth.html.in    2016-10-28 19:13:48.474715000 +0000
 @@ -246,7 +246,7 @@ again:
  The plain TCP socket of the libvirt daemon defaults to using SASL for authentication.
  The SASL mechanism configured by default is DIGEST-MD5, which provides a basic
@@ -85,10 +85,11 @@ diff -urp libvirt-2.1.0.orig/docs/auth.html.in libvirt-2.1.0/docs/auth.html.in
  The <code>mech_list</code> parameter must first be changed to <code>gssapi</code>
  instead of the default <code>digest-md5</code>, and keytab should be set to
  <code>/etc/libvirt/krb5.tab</code> . If SASL is enabled on the UNIX
-diff -urp libvirt-2.1.0.orig/libvirt.spec libvirt-2.1.0/libvirt.spec
---- libvirt-2.1.0.orig/libvirt.spec    2016-08-20 10:07:31.917554000 +0000
-+++ libvirt-2.1.0/libvirt.spec 2016-08-20 10:08:58.351554000 +0000
-@@ -1827,7 +1827,7 @@ exit 0
+Only in libvirt-2.3.0: libvirt-sasl.patch
+diff -urp libvirt-2.3.0.orig/libvirt.spec libvirt-2.3.0/libvirt.spec
+--- libvirt-2.3.0.orig/libvirt.spec    2016-10-28 19:13:22.458715000 +0000
++++ libvirt-2.3.0/libvirt.spec 2016-10-28 19:13:48.474715000 +0000
+@@ -1832,7 +1832,7 @@ exit 0
  %{_datadir}/libvirt/cpu_map.xml
  %{_datadir}/libvirt/libvirtLogo.png
  
@@ -97,10 +98,10 @@ diff -urp libvirt-2.1.0.orig/libvirt.spec libvirt-2.1.0/libvirt.spec
  
  %files admin
  %{_mandir}/man1/virt-admin.1*
-diff -urp libvirt-2.1.0.orig/libvirt.spec.in libvirt-2.1.0/libvirt.spec.in
---- libvirt-2.1.0.orig/libvirt.spec.in 2016-08-20 10:07:31.915554000 +0000
-+++ libvirt-2.1.0/libvirt.spec.in      2016-08-20 10:09:09.031554000 +0000
-@@ -1827,7 +1827,7 @@ exit 0
+diff -urp libvirt-2.3.0.orig/libvirt.spec.in libvirt-2.3.0/libvirt.spec.in
+--- libvirt-2.3.0.orig/libvirt.spec.in 2016-10-28 19:13:22.455715000 +0000
++++ libvirt-2.3.0/libvirt.spec.in      2016-10-28 19:13:48.475715000 +0000
+@@ -1832,7 +1832,7 @@ exit 0
  %{_datadir}/libvirt/cpu_map.xml
  %{_datadir}/libvirt/libvirtLogo.png
  
@@ -109,10 +110,10 @@ diff -urp libvirt-2.1.0.orig/libvirt.spec.in libvirt-2.1.0/libvirt.spec.in
  
  %files admin
  %{_mandir}/man1/virt-admin.1*
-diff -urp libvirt-2.1.0.orig/src/qemu/qemu.conf libvirt-2.1.0/src/qemu/qemu.conf
---- libvirt-2.1.0.orig/src/qemu/qemu.conf      2016-08-20 10:07:31.997554000 +0000
-+++ libvirt-2.1.0/src/qemu/qemu.conf   2016-08-20 10:07:47.087554000 +0000
-@@ -74,18 +74,18 @@
+diff -urp libvirt-2.3.0.orig/src/qemu/qemu.conf libvirt-2.3.0/src/qemu/qemu.conf
+--- libvirt-2.3.0.orig/src/qemu/qemu.conf      2016-10-28 19:13:22.586715000 +0000
++++ libvirt-2.3.0/src/qemu/qemu.conf   2016-10-28 19:13:48.475715000 +0000
+@@ -98,18 +98,18 @@
  # Examples include vinagre, virt-viewer and virt-manager
  # itself. UltraVNC, RealVNC, TightVNC do not support this
  #
@@ -134,7 +135,7 @@ diff -urp libvirt-2.1.0.orig/src/qemu/qemu.conf libvirt-2.1.0/src/qemu/qemu.conf
  
  
  # QEMU implements an extension for providing audio over a VNC connection,
-@@ -154,17 +154,17 @@
+@@ -173,17 +173,17 @@
  # Enable use of SASL encryption on the SPICE server. This requires
  # a SPICE client which supports the SASL protocol extension.
  #
@@ -153,12 +154,12 @@ diff -urp libvirt-2.1.0.orig/src/qemu/qemu.conf libvirt-2.1.0/src/qemu/qemu.conf
 -#spice_sasl_dir = "/some/directory/sasl2"
 +#spice_sasl_dir = "/some/directory/sasl"
  
- 
- # By default, if no graphical front end is configured, libvirt will disable
-diff -urp libvirt-2.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-2.1.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-2.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2016-08-20 10:07:31.997554000 +0000
-+++ libvirt-2.1.0/src/qemu/test_libvirtd_qemu.aug.in   2016-08-20 10:09:46.009554000 +0000
-@@ -9,7 +9,7 @@ module Test_libvirtd_qemu =
+ # Enable use of TLS encryption on the chardev TCP transports.
+ #
+diff -urp libvirt-2.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-2.3.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-2.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2016-10-28 19:13:22.588715000 +0000
++++ libvirt-2.3.0/src/qemu/test_libvirtd_qemu.aug.in   2016-10-28 19:14:27.032715000 +0000
+@@ -11,7 +11,7 @@ module Test_libvirtd_qemu =
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
  { "vnc_sasl" = "1" }
@@ -167,18 +168,18 @@ diff -urp libvirt-2.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-2.1.0/sr
  { "vnc_allow_host_audio" = "0" }
  { "spice_listen" = "0.0.0.0" }
  { "spice_tls" = "1" }
-@@ -17,7 +17,7 @@ module Test_libvirtd_qemu =
+@@ -19,7 +19,7 @@ module Test_libvirtd_qemu =
  { "spice_auto_unix_socket" = "1" }
  { "spice_password" = "XYZ12345" }
  { "spice_sasl" = "1" }
 -{ "spice_sasl_dir" = "/some/directory/sasl2" }
 +{ "spice_sasl_dir" = "/some/directory/sasl" }
- { "nographics_allow_host_audio" = "1" }
- { "remote_display_port_min" = "5900" }
- { "remote_display_port_max" = "65535" }
-diff -urp libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args
---- libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args      2016-08-20 10:07:32.590554000 +0000
-+++ libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args   2016-08-20 10:07:48.739554000 +0000
+ { "chardev_tls" = "1" }
+ { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
+ { "chardev_tls_x509_verify" = "1" }
+diff -urp libvirt-2.3.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-2.3.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args
+--- libvirt-2.3.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args      2016-10-28 19:13:23.321715000 +0000
++++ libvirt-2.3.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args   2016-10-28 19:13:48.476715000 +0000
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -188,9 +189,9 @@ diff -urp libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sa
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu \
  -name QEMUGuest1 \
-diff -urp libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args
---- libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args       2016-08-20 10:07:32.591554000 +0000
-+++ libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args    2016-08-20 10:07:48.739554000 +0000
+diff -urp libvirt-2.3.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-2.3.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args
+--- libvirt-2.3.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args       2016-10-28 19:13:23.321715000 +0000
++++ libvirt-2.3.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args    2016-10-28 19:13:48.476715000 +0000
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -200,9 +201,9 @@ diff -urp libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tl
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu \
  -name QEMUGuest1 \
-diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
---- libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args    2016-08-20 10:07:32.622554000 +0000
-+++ libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-08-20 10:07:48.740554000 +0000
+diff -urp libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
+--- libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args    2016-10-28 19:13:23.399715000 +0000
++++ libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-10-28 19:13:48.476715000 +0000
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -212,9 +213,9 @@ diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-
  QEMU_AUDIO_DRV=spice \
  /usr/bin/qemu \
  -name QEMUGuest1 \
-diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
---- libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args      2016-08-20 10:07:32.623554000 +0000
-+++ libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args   2016-08-20 10:07:48.740554000 +0000
+diff -urp libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
+--- libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args      2016-10-28 19:13:23.399715000 +0000
++++ libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args   2016-10-28 19:13:48.477715000 +0000
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -224,9 +225,9 @@ diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sa
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu \
  -name QEMUGuest1 \
-diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
---- libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args       2016-08-20 10:07:32.623554000 +0000
-+++ libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args    2016-08-20 10:07:48.740554000 +0000
+diff -urp libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
+--- libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args       2016-10-28 19:13:23.399715000 +0000
++++ libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args    2016-10-28 19:13:48.477715000 +0000
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -236,10 +237,10 @@ diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tl
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu \
  -name QEMUGuest1 \
-diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvtest.c libvirt-2.1.0/tests/qemuxml2argvtest.c
---- libvirt-2.1.0.orig/tests/qemuxml2argvtest.c        2016-08-20 10:07:32.132554000 +0000
-+++ libvirt-2.1.0/tests/qemuxml2argvtest.c     2016-08-20 10:07:48.741554000 +0000
-@@ -929,7 +929,7 @@ mymain(void)
+diff -urp libvirt-2.3.0.orig/tests/qemuxml2argvtest.c libvirt-2.3.0/tests/qemuxml2argvtest.c
+--- libvirt-2.3.0.orig/tests/qemuxml2argvtest.c        2016-10-28 19:13:22.696715000 +0000
++++ libvirt-2.3.0/tests/qemuxml2argvtest.c     2016-10-28 19:13:48.478715000 +0000
+@@ -978,7 +978,7 @@ mymain(void)
  
      driver.config->vncSASL = 1;
      VIR_FREE(driver.config->vncSASLdir);
@@ -248,7 +249,7 @@ diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvtest.c libvirt-2.1.0/tests/qemuxm
      DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC);
      driver.config->vncTLS = 1;
      driver.config->vncTLSx509verify = 1;
-@@ -953,7 +953,7 @@ mymain(void)
+@@ -1002,7 +1002,7 @@ mymain(void)
      DO_TEST("graphics-spice-no-args",
              QEMU_CAPS_SPICE);
      driver.config->spiceSASL = 1;
@@ -257,9 +258,9 @@ diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvtest.c libvirt-2.1.0/tests/qemuxm
      DO_TEST("graphics-spice-sasl",
              QEMU_CAPS_VGA_QXL,
              QEMU_CAPS_SPICE,
-diff -urp libvirt-2.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-2.1.0/tests/virconfdata/libvirtd.conf
---- libvirt-2.1.0.orig/tests/virconfdata/libvirtd.conf 2016-08-20 10:07:33.070554000 +0000
-+++ libvirt-2.1.0/tests/virconfdata/libvirtd.conf      2016-08-20 10:09:58.088554000 +0000
+diff -urp libvirt-2.3.0.orig/tests/virconfdata/libvirtd.conf libvirt-2.3.0/tests/virconfdata/libvirtd.conf
+--- libvirt-2.3.0.orig/tests/virconfdata/libvirtd.conf 2016-10-28 19:13:23.469715000 +0000
++++ libvirt-2.3.0/tests/virconfdata/libvirtd.conf      2016-10-28 19:13:48.478715000 +0000
 @@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700"
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -278,9 +279,9 @@ diff -urp libvirt-2.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-2.1.0/tests
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -urp libvirt-2.1.0.orig/tests/virconfdata/libvirtd.out libvirt-2.1.0/tests/virconfdata/libvirtd.out
---- libvirt-2.1.0.orig/tests/virconfdata/libvirtd.out  2016-08-20 10:07:33.070554000 +0000
-+++ libvirt-2.1.0/tests/virconfdata/libvirtd.out       2016-08-20 10:10:07.948554000 +0000
+diff -urp libvirt-2.3.0.orig/tests/virconfdata/libvirtd.out libvirt-2.3.0/tests/virconfdata/libvirtd.out
+--- libvirt-2.3.0.orig/tests/virconfdata/libvirtd.out  2016-10-28 19:13:23.469715000 +0000
++++ libvirt-2.3.0/tests/virconfdata/libvirtd.out       2016-10-28 19:13:48.479715000 +0000
 @@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700"
  #          the network providing auth (eg, TLS/x509 certificates)
  #

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index f82dc80b4e8cf9e7764b034a5c3c2b94565d2127..a6bb480e497b4fae17ba6345028ca4487277bf83 100644 (file)
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,6 +1,6 @@
-diff -urp libvirt-2.1.0.orig/daemon/Makefile.am libvirt-2.1.0/daemon/Makefile.am
---- libvirt-2.1.0.orig/daemon/Makefile.am      2016-08-20 10:29:38.054554000 +0000
-+++ libvirt-2.1.0/daemon/Makefile.am   2016-08-20 10:31:14.932554000 +0000
+diff -urp libvirt-2.3.0.orig/daemon/Makefile.am libvirt-2.3.0/daemon/Makefile.am
+--- libvirt-2.3.0.orig/daemon/Makefile.am      2016-10-28 19:20:01.192715000 +0000
++++ libvirt-2.3.0/daemon/Makefile.am   2016-10-28 19:20:22.734715000 +0000
 @@ -401,13 +401,11 @@ if WITH_SYSCTL
  # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
  # /usr/lib/sysctl.d/ even when libdir is /usr/lib64

diff --git a/libvirt-udevadm-settle.patch b/libvirt-udevadm-settle.patch
index 809fa7b5d899da50aa5672f941bfeca585a85226..cf4c2dd03c701746eca6ec77e598982c9dc5f7d7 100644 (file)
--- a/libvirt-udevadm-settle.patch
+++ b/libvirt-udevadm-settle.patch
@@ -1,6 +1,6 @@
-diff -urp libvirt-2.1.0.orig/src/util/virutil.c libvirt-2.1.0/src/util/virutil.c
---- libvirt-2.1.0.orig/src/util/virutil.c      2016-08-20 10:22:17.303554000 +0000
-+++ libvirt-2.1.0/src/util/virutil.c   2016-08-20 10:26:45.761554000 +0000
+diff -urp libvirt-2.3.0.orig/src/util/virutil.c libvirt-2.3.0/src/util/virutil.c
+--- libvirt-2.3.0.orig/src/util/virutil.c      2016-10-28 19:17:48.496715000 +0000
++++ libvirt-2.3.0/src/util/virutil.c   2016-10-28 19:18:02.376715000 +0000
 @@ -1586,7 +1586,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gi
  void virFileWaitForDevices(void)
  {

diff --git a/libvirt.spec b/libvirt.spec
index 139ed9dbe551e7aa027082315c728f1fccef8b50..164ea6019e86c6be7ba715dfa455ddd2d9ea9c63 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -39,12 +39,12 @@
 Summary:       Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):     Narzędzia współpracujące z funkcjami wirtualizacji
 Name:          libvirt
-Version:       2.1.0
+Version:       2.3.0
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5: fd1c054a8b59235e877efb728de79386
+# Source0-md5: a492cd17aae09284b3b218d597887ae2
 Source1:       %{name}.init
 Patch0:                %{name}-sasl.patch
 Patch1:                %{name}-qemu-acl.patch