- updated to 3.0.0, TLDized virtlockd and virtlogd init scripts

diff --git a/bashisms.patch b/bashisms.patch
index fb3f93a1fb686924bdaff9408519ee90a866b048..4dc6dbe7354b21457edfcdedffcc34a925c14690 100644 (file)
--- a/bashisms.patch
+++ b/bashisms.patch
@@ -1,15 +1,15 @@
-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
+diff -urp libvirt-3.0.0.orig/src/locking/virtlockd.init.in libvirt-3.0.0/src/locking/virtlockd.init.in
+--- libvirt-3.0.0.orig/src/locking/virtlockd.init.in   2017-02-11 16:02:11.117361199 +0000
++++ libvirt-3.0.0/src/locking/virtlockd.init.in        2017-02-11 16:02:28.856360999 +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.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
+diff -urp libvirt-3.0.0.orig/tools/libvirt-guests.sh.in libvirt-3.0.0/tools/libvirt-guests.sh.in
+--- libvirt-3.0.0.orig/tools/libvirt-guests.sh.in      2017-02-11 16:02:11.138361199 +0000
++++ libvirt-3.0.0/tools/libvirt-guests.sh.in   2017-02-11 16:02:28.857360999 +0000
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash

diff --git a/libvirt-guests.init.patch b/libvirt-guests.init.patch
index b2be897e65186f8bb2ac128f6864a8f58319c904..596bac618e4faaec1eb70c719f6c3f881fd26f1b 100644 (file)
--- a/libvirt-guests.init.patch
+++ b/libvirt-guests.init.patch
@@ -1,6 +1,6 @@
-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
+diff -urp libvirt-3.0.0.orig/tools/libvirt-guests.init.in libvirt-3.0.0/tools/libvirt-guests.init.in
+--- libvirt-3.0.0.orig/tools/libvirt-guests.init.in    2017-02-11 16:02:42.551360845 +0000
++++ libvirt-3.0.0/tools/libvirt-guests.init.in 2017-02-11 16:03:05.756360584 +0000
 @@ -28,3 +28,6 @@
  #
  

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index afb752e68d067dbcaff19ac950b68c54829527f4..f4a30bcad0c6c941b77657f06a0e72723474a1e4 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-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
+diff -urp libvirt-3.0.0.orig/src/qemu/qemu_command.c libvirt-3.0.0/src/qemu/qemu_command.c
+--- libvirt-3.0.0.orig/src/qemu/qemu_command.c 2017-02-11 16:00:09.943362563 +0000
++++ libvirt-3.0.0/src/qemu/qemu_command.c      2017-02-11 16:01:03.437361961 +0000
+@@ -7650,6 +7650,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -12,10 +12,10 @@ diff -urp libvirt-2.3.0.orig/src/qemu/qemu_command.c libvirt-2.3.0/src/qemu/qemu
      }
  
      virCommandAddArg(cmd, "-vnc");
-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 @@
+diff -urp libvirt-3.0.0.orig/src/qemu/qemu.conf libvirt-3.0.0/src/qemu/qemu.conf
+--- libvirt-3.0.0.orig/src/qemu/qemu.conf      2017-02-11 16:00:09.945362563 +0000
++++ libvirt-3.0.0/src/qemu/qemu.conf   2017-02-11 16:01:03.438361961 +0000
+@@ -118,6 +118,15 @@
  #vnc_sasl = 1
  
  
@@ -31,10 +31,10 @@ diff -urp libvirt-2.3.0.orig/src/qemu/qemu.conf libvirt-2.3.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.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
+diff -urp libvirt-3.0.0.orig/src/qemu/qemu_conf.c libvirt-3.0.0/src/qemu/qemu_conf.c
+--- libvirt-3.0.0.orig/src/qemu/qemu_conf.c    2017-02-11 16:00:09.943362563 +0000
++++ libvirt-3.0.0/src/qemu/qemu_conf.c 2017-02-11 16:01:03.438361961 +0000
+@@ -487,6 +487,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.3.0.orig/src/qemu/qemu_conf.c libvirt-2.3.0/src/qemu/qemu_co
  
  
      if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
-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 {
+diff -urp libvirt-3.0.0.orig/src/qemu/qemu_conf.h libvirt-3.0.0/src/qemu/qemu_conf.h
+--- libvirt-3.0.0.orig/src/qemu/qemu_conf.h    2017-02-11 16:00:09.943362563 +0000
++++ libvirt-3.0.0/src/qemu/qemu_conf.h 2017-02-11 16:01:03.438361961 +0000
+@@ -119,6 +119,7 @@ struct _virQEMUDriverConfig {
      bool vncTLS;
      bool vncTLSx509verify;
      bool vncSASL;

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 179b54997e675f73971388f37937c009915cc97f..5f6b5bd9fe76513fcf22092c2718d2ff9ee18a20 100644 (file)
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,6 +1,6 @@
-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
+diff -urp libvirt-3.0.0.orig/daemon/libvirtd.conf libvirt-3.0.0/daemon/libvirtd.conf
+--- libvirt-3.0.0.orig/daemon/libvirtd.conf    2017-02-11 15:58:23.924363757 +0000
++++ libvirt-3.0.0/daemon/libvirtd.conf 2017-02-11 15:58:43.786363533 +0000
 @@ -123,7 +123,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -19,10 +19,10 @@ diff -urp libvirt-2.3.0.orig/daemon/libvirtd.conf libvirt-2.3.0/daemon/libvirtd.
  #auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-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
+diff -urp libvirt-3.0.0.orig/daemon/Makefile.am libvirt-3.0.0/daemon/Makefile.am
+--- libvirt-3.0.0.orig/daemon/Makefile.am      2017-02-11 15:58:23.923363757 +0000
++++ libvirt-3.0.0/daemon/Makefile.am   2017-02-11 15:58:43.786363533 +0000
+@@ -532,13 +532,13 @@ POD2MAN = pod2man -c "Virtualization Sup
  # the WITH_LIBVIRTD conditional
  if WITH_SASL
  install-data-sasl:
@@ -40,10 +40,10 @@ diff -urp libvirt-2.3.0.orig/daemon/Makefile.am libvirt-2.3.0/daemon/Makefile.am
  else ! WITH_SASL
  install-data-sasl:
  uninstall-data-sasl:
-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/
+diff -urp libvirt-3.0.0.orig/daemon/Makefile.in libvirt-3.0.0/daemon/Makefile.in
+--- libvirt-3.0.0.orig/daemon/Makefile.in      2017-02-11 15:58:23.923363757 +0000
++++ libvirt-3.0.0/daemon/Makefile.in   2017-02-11 15:58:43.786363533 +0000
+@@ -2932,13 +2932,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,10 +61,10 @@ diff -urp libvirt-2.3.0.orig/daemon/Makefile.in libvirt-2.3.0/daemon/Makefile.in
  @WITH_SASL_FALSE@install-data-sasl:
  @WITH_SASL_FALSE@uninstall-data-sasl:
  
-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:
+diff -urp libvirt-3.0.0.orig/docs/auth.html libvirt-3.0.0/docs/auth.html
+--- libvirt-3.0.0.orig/docs/auth.html  2017-02-11 15:58:23.865363758 +0000
++++ libvirt-3.0.0/docs/auth.html       2017-02-11 15:58:43.787363533 +0000
+@@ -257,7 +257,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
  username+password style authentication. To enable Kerberos single-sign-on instead,
@@ -73,9 +73,9 @@ diff -urp libvirt-2.3.0.orig/docs/auth.html libvirt-2.3.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.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
+diff -urp libvirt-3.0.0.orig/docs/auth.html.in libvirt-3.0.0/docs/auth.html.in
+--- libvirt-3.0.0.orig/docs/auth.html.in       2017-02-11 15:58:23.867363758 +0000
++++ libvirt-3.0.0/docs/auth.html.in    2017-02-11 15:58:43.787363533 +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,35 +85,34 @@ diff -urp libvirt-2.3.0.orig/docs/auth.html.in libvirt-2.3.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
-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
+diff -urp libvirt-3.0.0.orig/libvirt.spec libvirt-3.0.0/libvirt.spec
+--- libvirt-3.0.0.orig/libvirt.spec    2017-02-11 15:58:23.878363757 +0000
++++ libvirt-3.0.0/libvirt.spec 2017-02-11 15:58:43.787363533 +0000
+@@ -1844,7 +1844,7 @@ exit 0
+ 
+ %{_datadir}/libvirt/test-screenshot.png
  
 -%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
 +%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf
  
  %files admin
  %{_mandir}/man1/virt-admin.1*
-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
+diff -urp libvirt-3.0.0.orig/libvirt.spec.in libvirt-3.0.0/libvirt.spec.in
+--- libvirt-3.0.0.orig/libvirt.spec.in 2017-02-11 15:58:23.877363757 +0000
++++ libvirt-3.0.0/libvirt.spec.in      2017-02-11 15:58:43.787363533 +0000
+@@ -1844,7 +1844,7 @@ exit 0
+ 
+ %{_datadir}/libvirt/test-screenshot.png
  
 -%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
 +%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf
  
  %files admin
  %{_mandir}/man1/virt-admin.1*
-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 @@
+diff -urp libvirt-3.0.0.orig/src/qemu/qemu.conf libvirt-3.0.0/src/qemu/qemu.conf
+--- libvirt-3.0.0.orig/src/qemu/qemu.conf      2017-02-11 15:58:23.898363757 +0000
++++ libvirt-3.0.0/src/qemu/qemu.conf   2017-02-11 15:58:43.788363533 +0000
+@@ -112,18 +112,18 @@
  # Examples include vinagre, virt-viewer and virt-manager
  # itself. UltraVNC, RealVNC, TightVNC do not support this
  #
@@ -135,7 +134,7 @@ diff -urp libvirt-2.3.0.orig/src/qemu/qemu.conf libvirt-2.3.0/src/qemu/qemu.conf
  
  
  # QEMU implements an extension for providing audio over a VNC connection,
-@@ -173,17 +173,17 @@
+@@ -187,17 +187,17 @@
  # Enable use of SASL encryption on the SPICE server. This requires
  # a SPICE client which supports the SASL protocol extension.
  #
@@ -156,10 +155,10 @@ diff -urp libvirt-2.3.0.orig/src/qemu/qemu.conf libvirt-2.3.0/src/qemu/qemu.conf
  
  # 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 =
+diff -urp libvirt-3.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-3.0.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-3.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2017-02-11 15:58:23.898363757 +0000
++++ libvirt-3.0.0/src/qemu/test_libvirtd_qemu.aug.in   2017-02-11 15:58:43.788363533 +0000
+@@ -12,7 +12,7 @@ module Test_libvirtd_qemu =
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
  { "vnc_sasl" = "1" }
@@ -168,7 +167,7 @@ diff -urp libvirt-2.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-2.3.0/sr
  { "vnc_allow_host_audio" = "0" }
  { "spice_listen" = "0.0.0.0" }
  { "spice_tls" = "1" }
-@@ -19,7 +19,7 @@ module Test_libvirtd_qemu =
+@@ -20,7 +20,7 @@ module Test_libvirtd_qemu =
  { "spice_auto_unix_socket" = "1" }
  { "spice_password" = "XYZ12345" }
  { "spice_sasl" = "1" }
@@ -177,9 +176,9 @@ diff -urp libvirt-2.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-2.3.0/sr
  { "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
+diff -urp libvirt-3.0.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-3.0.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args
+--- libvirt-3.0.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args      2017-02-11 15:58:23.938363757 +0000
++++ libvirt-3.0.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args   2017-02-11 15:58:43.788363533 +0000
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -189,9 +188,9 @@ diff -urp libvirt-2.3.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sa
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu \
  -name QEMUGuest1 \
-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
+diff -urp libvirt-3.0.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-3.0.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args
+--- libvirt-3.0.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args       2017-02-11 15:58:23.938363757 +0000
++++ libvirt-3.0.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args    2017-02-11 15:58:43.788363533 +0000
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -201,9 +200,9 @@ diff -urp libvirt-2.3.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tl
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu \
  -name QEMUGuest1 \
-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
+diff -urp libvirt-3.0.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-3.0.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
+--- libvirt-3.0.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args    2017-02-11 15:58:23.949363757 +0000
++++ libvirt-3.0.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2017-02-11 15:58:43.788363533 +0000
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -213,9 +212,9 @@ diff -urp libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-
  QEMU_AUDIO_DRV=spice \
  /usr/bin/qemu \
  -name QEMUGuest1 \
-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
+diff -urp libvirt-3.0.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-3.0.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
+--- libvirt-3.0.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args      2017-02-11 15:58:23.950363757 +0000
++++ libvirt-3.0.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args   2017-02-11 15:58:43.788363533 +0000
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -225,9 +224,9 @@ diff -urp libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sa
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu \
  -name QEMUGuest1 \
-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
+diff -urp libvirt-3.0.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-3.0.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
+--- libvirt-3.0.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args       2017-02-11 15:58:23.950363757 +0000
++++ libvirt-3.0.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args    2017-02-11 15:58:43.788363533 +0000
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -237,30 +236,30 @@ diff -urp libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tl
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu \
  -name QEMUGuest1 \
-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)
+diff -urp libvirt-3.0.0.orig/tests/qemuxml2argvtest.c libvirt-3.0.0/tests/qemuxml2argvtest.c
+--- libvirt-3.0.0.orig/tests/qemuxml2argvtest.c        2017-02-11 15:58:23.934363757 +0000
++++ libvirt-3.0.0/tests/qemuxml2argvtest.c     2017-02-11 15:59:22.996363092 +0000
+@@ -1033,7 +1033,7 @@ mymain(void)
  
      driver.config->vncSASL = 1;
      VIR_FREE(driver.config->vncSASLdir);
 -    ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl2"));
 +    ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl"));
-     DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC);
+     DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->vncTLS = 1;
      driver.config->vncTLSx509verify = 1;
-@@ -1002,7 +1002,7 @@ mymain(void)
+@@ -1057,7 +1057,7 @@ mymain(void)
      DO_TEST("graphics-spice-no-args",
-             QEMU_CAPS_SPICE);
+             QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->spiceSASL = 1;
 -    ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl2"));
 +    ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl"));
      DO_TEST("graphics-spice-sasl",
-             QEMU_CAPS_VGA_QXL,
              QEMU_CAPS_SPICE,
-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
+             QEMU_CAPS_DEVICE_QXL);
+diff -urp libvirt-3.0.0.orig/tests/virconfdata/libvirtd.conf libvirt-3.0.0/tests/virconfdata/libvirtd.conf
+--- libvirt-3.0.0.orig/tests/virconfdata/libvirtd.conf 2017-02-11 15:58:24.047363756 +0000
++++ libvirt-3.0.0/tests/virconfdata/libvirtd.conf      2017-02-11 15:58:43.789363533 +0000
 @@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700"
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -279,9 +278,9 @@ diff -urp libvirt-2.3.0.orig/tests/virconfdata/libvirtd.conf libvirt-2.3.0/tests
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-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
+diff -urp libvirt-3.0.0.orig/tests/virconfdata/libvirtd.out libvirt-3.0.0/tests/virconfdata/libvirtd.out
+--- libvirt-3.0.0.orig/tests/virconfdata/libvirtd.out  2017-02-11 15:58:24.047363756 +0000
++++ libvirt-3.0.0/tests/virconfdata/libvirtd.out       2017-02-11 15:58:43.789363533 +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 a6bb480e497b4fae17ba6345028ca4487277bf83..3f2acd4987d566f5b795823099269ae42ac4e4fa 100644 (file)
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,7 +1,7 @@
-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
+diff -urp libvirt-3.0.0.orig/daemon/Makefile.am libvirt-3.0.0/daemon/Makefile.am
+--- libvirt-3.0.0.orig/daemon/Makefile.am      2017-02-11 16:03:23.470360384 +0000
++++ libvirt-3.0.0/daemon/Makefile.am   2017-02-11 16:03:38.597360214 +0000
+@@ -402,13 +402,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
  install-sysctl:

diff --git a/libvirt-udevadm-settle.patch b/libvirt-udevadm-settle.patch
index cf4c2dd03c701746eca6ec77e598982c9dc5f7d7..749ade4dcbb1ee01450fafd35c3c51e1988ac162 100644 (file)
--- a/libvirt-udevadm-settle.patch
+++ b/libvirt-udevadm-settle.patch
@@ -1,6 +1,6 @@
-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
+diff -urp libvirt-3.0.0.orig/src/util/virutil.c libvirt-3.0.0/src/util/virutil.c
+--- libvirt-3.0.0.orig/src/util/virutil.c      2017-02-11 16:01:36.648361587 +0000
++++ libvirt-3.0.0/src/util/virutil.c   2017-02-11 16:01:56.797361360 +0000
 @@ -1586,7 +1586,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gi
  void virFileWaitForDevices(void)
  {

diff --git a/libvirt.spec b/libvirt.spec
index 6d61836970c136801b67d683a48933beb9dd911f..29ff88ea6a1147b3cbf12721064f003c3034b316 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -39,13 +39,15 @@
 Summary:       Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):     Narzędzia współpracujące z funkcjami wirtualizacji
 Name:          libvirt
-Version:       2.3.0
+Version:       3.0.0
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5: a492cd17aae09284b3b218d597887ae2
-Source1:       %{name}.init
+# Source0-md5: 7a24f2ef34e768b654cb689a985cc7aa
+Source1:       libvirtd.init
+Source2:       virtlockd.init
+Source3:       virtlogd.init
 Patch0:                %{name}-sasl.patch
 Patch1:                %{name}-qemu-acl.patch
 Patch2:                %{name}-udevadm-settle.patch
@@ -514,6 +516,8 @@ install -d $RPM_BUILD_ROOT/etc/{sysconfig,sysctl.d,rc.d/init.d}
        DESTDIR=$RPM_BUILD_ROOT
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/libvirtd
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtlockd
+install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtlogd
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.la \
@@ -535,11 +539,19 @@ rm -rf $RPM_BUILD_ROOT
 %post daemon
 /sbin/chkconfig --add libvirtd
 %service libvirtd restart
+/sbin/chkconfig --add virtlockd
+%service virtlockd restart
+/sbin/chkconfig --add virtlogd
+%service virtlogd restart
 
 %preun daemon
 if [ "$1" = "0" ]; then
        %service -q libvirtd stop
        /sbin/chkconfig --del libvirtd
+       %service -q virtlockd stop
+       /sbin/chkconfig --del virtlockd
+       %service -q virtlogd stop
+       /sbin/chkconfig --del virtlogd
 fi
 
 %post client
@@ -559,6 +571,7 @@ fi
 %dir %{_sysconfdir}/libvirt
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirt.conf
 %attr(755,root,root) %{_libdir}/libnss_libvirt.so.?
+%attr(755,root,root) %{_libdir}/libnss_libvirt_guest.so.?
 %attr(755,root,root) %{_libdir}/libvirt.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libvirt.so.0
 %attr(755,root,root) %{_libdir}/libvirt-admin.so.*.*.*
@@ -572,7 +585,7 @@ fi
 
 %dir %{_libdir}/libvirt
 %dir %{_datadir}/libvirt
-%{_datadir}/libvirt/libvirtLogo.png
+%{_datadir}/libvirt/test-screenshot.png
 
 %files devel
 %defattr(644,root,root,755)

diff --git a/libvirt.init b/libvirtd.init
similarity index 100%
rename from libvirt.init
rename to libvirtd.init