- updated to 1.0.6

- updated sasl,qemu-acl patches
- added vbox driver

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 67972d2600a749b59625883bb29a8362fb2ab838..c3d919f883ebc0eb3128f470c7042697cf44e818 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -30,23 +30,19 @@ index ba41f80..7ab5eee 100644
  # 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 --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 7dd8e03..0ffeaab 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -3542,8 +3542,11 @@ qemuBuildCommandLine(virConnectPtr conn,
-                     virCommandAddEnvPair(cmd, "SASL_CONF_DIR",
-                                          driver->vncSASLdir);
+--- libvirt-1.0.6/src/qemu/qemu_command.c.orig 2013-06-16 15:45:37.115181922 +0200
++++ libvirt-1.0.6/src/qemu/qemu_command.c      2013-06-16 15:47:49.335179175 +0200
+@@ -6178,6 +6178,10 @@
  
--                /* TODO: Support ACLs later */
-             }
-+
-+          if (cfg->vncACL) 
-+              virBufferAddLit(&opt, ",acl");
-+          
+             /* TODO: Support ACLs later */
          }
++
++        if (cfg->vncACL) 
++           virBufferAddLit(&opt, ",acl");
++
+     }
  
-         virCommandAddArg(cmd, "-vnc");
+     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 @@

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index bc0d6f0e0f64a84aef2f4b1e73c41f0850b995b7..0a38cfc360c656759500aa86a643b2a0536e3b17 100644 (file)
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -175,14 +175,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 -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.3/tests/qemuxml2argvtest.c.orig        2013-03-09 13:09:01.983088716 +0100
-+++ libvirt-1.0.3/tests/qemuxml2argvtest.c     2013-03-09 13:09:34.166420510 +0100
-@@ -563,7 +563,7 @@
+--- 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 @@
  
      driver.config->vncSASL = 1;
      VIR_FREE(driver.config->vncSASLdir);
--    driver.config->vncSASLdir = strdup("/root/.sasl2");
-+    driver.config->vncSASLdir = strdup("/root/.sasl");
+-    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, QEMU_CAPS_VGA);
      driver.config->vncTLS = 1;
      driver.config->vncTLSx509verify = 1;

diff --git a/libvirt.spec b/libvirt.spec
index 0b9a48501f544b89ee4bbe7e466a870d109ccc44..2d6029bdfc58b1130793b8782536e0b95d0d5e7a 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -19,6 +19,7 @@
 %bcond_without vmware          # VMware Workstation/Player support
 %bcond_without xenapi          # Xen API (Citrix XenServer) support
 %bcond_without xen             # Xen support
+%bcond_without static_libs     # static libraries build
 
 # qemu available only on x86 and ppc
 %ifnarch %{ix86} %{x8664} ppc
@@ -31,12 +32,12 @@
 Summary:       Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):     Narzędzia współpracujące z funkcjami wirtualizacji
 Name:          libvirt
-Version:       1.0.4
+Version:       1.0.6
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
-# Source0-md5: 97166bc42d7cacb037923907abe656ab
+# Source0-md5: a4a09a981f902c4d6aa5138c753d64fd
 Source1:       %{name}.init
 Source2:       %{name}.tmpfiles
 Patch0:                %{name}-sasl.patch
@@ -460,6 +461,7 @@ mv po/vi_VN.gmo po/vi.gmo
        NUMAD=/usr/bin/numad \
        COLLIE=/usr/sbin/collie \
        --disable-silent-rules \
+       %{?with_static_libs:--enable-static} \
        --with-html-dir=%{_gtkdocdir} \
        --with-html-subdir=%{name} \
        --with-init-script=systemd+redhat \
@@ -530,10 +532,12 @@ install %{SOURCE2} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.la
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.la \
+       %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.a}
 
 %if %{with sanlock}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.la \
+       %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.a}
 %endif
 
 %find_lang %{name}
@@ -581,6 +585,7 @@ NORESTART=1
 
 %dir %{_libdir}/libvirt
 %dir %{_datadir}/libvirt
+%{_datadir}/libvirt/libvirtLogo.png
 
 %files devel
 %defattr(644,root,root,755)
@@ -677,6 +682,7 @@ NORESTART=1
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_nwfilter.so
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_secret.so
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_storage.so
+%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.so
 %dir %{_libdir}/libvirt/lock-driver
 %attr(755,root,root) %{_libdir}/libvirt/lock-driver/lockd.so