- updated to 1.1.3 (fixes CVE-2013-4296 CVE-2013-4311)

- updated sasl,xend,qemu-acl patches

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index c3d919f883ebc0eb3128f470c7042697cf44e818..13fa7eeb6dc555b1d9cca4a040b4dce75d11a81f 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -43,12 +43,12 @@ index ba41f80..7ab5eee 100644
      }
  
      virCommandAddArg(cmd, "-vnc");
---- libvirt-1.0.3/src/qemu/qemu_conf.c.orig    2013-03-09 13:10:30.059751685 +0100
-+++ libvirt-1.0.3/src/qemu/qemu_conf.c 2013-03-09 13:53:45.779640951 +0100
-@@ -365,6 +365,7 @@
-     GET_VALUE_BOOL("vnc_sasl", cfg->vncSASL);
+--- libvirt-1.1.3/src/qemu/qemu_conf.c.orig    2013-10-22 20:38:43.522043292 +0200
++++ libvirt-1.1.3/src/qemu/qemu_conf.c 2013-10-22 20:45:19.515360007 +0200
+@@ -357,6 +357,7 @@
      GET_VALUE_STR("vnc_sasl_dir", cfg->vncSASLdir);
      GET_VALUE_BOOL("vnc_allow_host_audio", cfg->vncAllowHostAudio);
+     GET_VALUE_BOOL("nographics_allow_host_audio", cfg->nogfxAllowHostAudio);
 +    GET_VALUE_LONG("vnc_acl", cfg->vncACL);
  
      p = virConfGetValue(conf, "security_driver");

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 8a4dc8a8171b51aac35995373625af90845f3a4f..b037a198ecf71124fc6ec609e41e0bdc7d01c983 100644 (file)
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -19,10 +19,9 @@ diff -ru libvirt-0.8.8/daemon/libvirtd.conf libvirt-0.8.8-sasl/daemon/libvirtd.c
  #auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ru libvirt-1.1.1/daemon/Makefile.am libvirt-1.1.1-sasl/daemon/Makefile.am
---- libvirt-1.1.1/daemon/Makefile.am.orig      2013-07-30 10:17:30.238116337 +0000
-+++ libvirt-1.1.1/daemon/Makefile.am   2013-07-30 10:20:08.281117006 +0000
-@@ -428,13 +428,13 @@
+--- libvirt-1.1.3/daemon/Makefile.am.orig      2013-10-22 16:46:45.409294047 +0200
++++ libvirt-1.1.3/daemon/Makefile.am   2013-10-22 20:09:12.185450964 +0200
+@@ -453,13 +453,13 @@
  # the WITH_LIBVIRTD conditional
  if WITH_SASL
  install-data-sasl:
@@ -37,7 +36,7 @@ diff -ru libvirt-1.1.1/daemon/Makefile.am libvirt-1.1.1-sasl/daemon/Makefile.am
 -      rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || :
 +      rm -f $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
 +      rmdir $(DESTDIR)$(sysconfdir)/sasl/ || :
- else
+ else ! WITH_SASL
  install-data-sasl:
  uninstall-data-sasl:
 diff -ru libvirt-0.8.8/daemon/test_libvirtd.aug libvirt-0.8.8-sasl/daemon/test_libvirtd.aug
@@ -156,26 +155,24 @@ diff -ru libvirt-0.8.8/tests/confdata/libvirtd.out libvirt-0.8.8-sasl/tests/conf
  auth_tcp = "sasl"
  # Change the authentication scheme for TLS sockets.
  #
-diff -ru libvirt-0.8.8/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-0.8.8-sasl/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
---- libvirt-0.8.8/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args   2011-02-03 15:05:31.000000000 +0100
-+++ libvirt-0.8.8-sasl/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args      2011-04-28 11:45:46.860741165 +0200
+--- libvirt-1.1.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args.orig      2013-10-22 20:09:59.655448969 +0200
++++ libvirt-1.1.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args   2013-10-22 20:37:43.605379136 +0200
 @@ -1,5 +1,5 @@
  LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
--SASL_CONF_DIR=/root/.sasl2 QEMU_AUDIO_DRV=none /usr/bin/qemu -S -M pc -m 214 \
-+SASL_CONF_DIR=/root/.sasl QEMU_AUDIO_DRV=none /usr/bin/qemu -S -M pc -m 214 \
+-SASL_CONF_DIR=/root/.sasl2 QEMU_AUDIO_DRV=none \
++SASL_CONF_DIR=/root/.sasl QEMU_AUDIO_DRV=none \
+ /usr/bin/qemu -S -M pc -m 214 \
  -smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
  /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -vnc \
- 127.0.0.1:3,sasl -vga cirrus
-diff -ru libvirt-0.8.8/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-0.8.8-sasl/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
---- libvirt-0.8.8/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args    2011-02-03 15:05:31.000000000 +0100
-+++ libvirt-0.8.8-sasl/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args       2011-04-28 11:45:46.864741165 +0200
+--- libvirt-1.1.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args.orig       2013-10-22 20:09:59.658782302 +0200
++++ libvirt-1.1.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args    2013-10-22 20:38:03.778711628 +0200
 @@ -1,5 +1,5 @@
  LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
--SASL_CONF_DIR=/root/.sasl2 QEMU_AUDIO_DRV=none /usr/bin/qemu -S -M pc -m 214 \
-+SASL_CONF_DIR=/root/.sasl QEMU_AUDIO_DRV=none /usr/bin/qemu -S -M pc -m 214 \
+-SASL_CONF_DIR=/root/.sasl2 QEMU_AUDIO_DRV=none \
++SASL_CONF_DIR=/root/.sasl QEMU_AUDIO_DRV=none \
+ /usr/bin/qemu -S -M pc -m 214 \
  -smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
  /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -vnc \
- 127.0.0.1:3,tls,x509verify=/etc/pki/tls/qemu,sasl
 --- libvirt-1.0.6/tests/qemuxml2argvtest.c.orig        2013-06-16 15:44:25.855183409 +0200
 +++ libvirt-1.0.6/tests/qemuxml2argvtest.c     2013-06-16 15:45:12.908515760 +0200
 @@ -614,7 +614,7 @@

diff --git a/libvirt-xend.patch b/libvirt-xend.patch
index 65cef73a6e1f7cbd50ee609e5ea21f36cb6a601b..218dd5c4e7be72d13facb39b80818549c5267c5e 100644 (file)
--- a/libvirt-xend.patch
+++ b/libvirt-xend.patch
@@ -9,12 +9,12 @@
      if (virCommandRun(cmd, &status) == 0 && status == 0)
          ret = 1;
      virCommandFree(cmd);
---- libvirt-0.9.10/src/libxl/libxl_driver.c~   2012-02-06 03:50:50.000000000 +0100
-+++ libvirt-0.9.10/src/libxl/libxl_driver.c    2012-03-06 14:27:35.983701925 +0100
-@@ -840,7 +840,7 @@
+--- libvirt-1.1.3/src/libxl/libxl_driver.c.orig        2013-10-22 20:46:08.195357964 +0200
++++ libvirt-1.1.3/src/libxl/libxl_driver.c     2013-10-22 21:17:55.935277904 +0200
+@@ -797,7 +797,7 @@
      }
  
-     /* Disable driver if legacy xen toolstack (xend) is in use */
+     /* Don't load if legacy xen toolstack (xend) is in use */
 -    cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
 +    cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL);
      if (virCommandRun(cmd, &status) == 0 && status == 0) {

diff --git a/libvirt.spec b/libvirt.spec
index 55f0637ead63aef78cdb46cfd235f8f450619fe1..209962e8e8726c6181a7be62741d586a5a1ce0c0 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -34,12 +34,12 @@
 Summary:       Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):     Narzędzia współpracujące z funkcjami wirtualizacji
 Name:          libvirt
-Version:       1.1.2
+Version:       1.1.3
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
-# Source0-md5: 1835bbfa492099bce12e2934870e5611
+# Source0-md5: b0dfe373ebe0c588b42a28c14d36a3e6
 Source1:       %{name}.init
 Source2:       %{name}.tmpfiles
 Patch0:                %{name}-sasl.patch