[packages/libvirt] - up to 0.10.1; 0.9.13 is on libvirt-0.9 branch - updated sasl patch - lxc patch needs action (if st

qboosh qboosh at pld-linux.org
Thu Sep 20 17:54:07 CEST 2012


commit 2d6e7f7eef48fa20c8154b06477c17ba70eac5aa
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Sep 20 17:54:46 2012 +0200

    - up to 0.10.1; 0.9.13 is on libvirt-0.9 branch
    - updated sasl patch
    - lxc patch needs action (if still needed; upstream changes were not trivial); thus release 0.1

 libvirt-sasl.patch | 11 +++++------
 libvirt.spec       |  9 +++++----
 2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/libvirt.spec b/libvirt.spec
index 68c59d7..d4cb577 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -27,12 +27,12 @@
 Summary:	Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):	Narzędzia współpracujące z funkcjami wirtualizacji
 Name:		libvirt
-Version:	0.9.13
-Release:	1
+Version:	0.10.1
+Release:	0.1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
-# Source0-md5:	86cbe53ee662e3b9e8bb0c63c737ba27
+# Source0-md5:	5f628e53437b0b0e78477904ba3310af
 Source1:	%{name}.init
 Source2:	%{name}.tmpfiles
 Patch0:		%{name}-sasl.patch
@@ -398,7 +398,8 @@ biblioteki libvirt.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+# TODO
+#patch1 -p1
 %patch2 -p1
 %patch3 -p1
 
diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 5162910..0f59060 100644
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -187,15 +187,14 @@ diff -ru libvirt-0.8.8/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
  -smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
  /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc \
  127.0.0.1:3,tls,x509verify=/etc/pki/tls/qemu,sasl
-diff -ru libvirt-0.8.8/tests/qemuxml2argvtest.c libvirt-0.8.8-sasl/tests/qemuxml2argvtest.c
---- libvirt-0.8.8/tests/qemuxml2argvtest.c	2011-02-11 10:46:59.000000000 +0100
-+++ libvirt-0.8.8-sasl/tests/qemuxml2argvtest.c	2011-04-28 11:45:46.767741165 +0200
-@@ -335,7 +335,7 @@
-     DO_TEST("graphics-vnc-socket", 0, false);
+--- libvirt-0.10.1/tests/qemuxml2argvtest.c.orig	2012-08-22 05:19:44.000000000 +0200
++++ libvirt-0.10.1/tests/qemuxml2argvtest.c	2012-09-02 14:17:43.448454451 +0200
+@@ -507,7 +507,7 @@
+     DO_TEST("graphics-vnc-socket", NONE);
  
      driver.vncSASL = 1;
 -    driver.vncSASLdir = strdup("/root/.sasl2");
 +    driver.vncSASLdir = strdup("/root/.sasl");
-     DO_TEST("graphics-vnc-sasl", false, QEMU_CAPS_VGA);
+     DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VGA);
      driver.vncTLS = 1;
      driver.vncTLSx509verify = 1;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libvirt.git/commitdiff/2d6e7f7eef48fa20c8154b06477c17ba70eac5aa



More information about the pld-cvs-commit mailing list