- updated to 0.9.12

Changed files:
    libvirt-driver-modules.patch -> 1.3
    libvirt-uri-user.patch -> 1.2
    libvirt.spec -> 1.82

diff --git a/libvirt-driver-modules.patch b/libvirt-driver-modules.patch
index 423d6e2a8848c5c7fd8bcb8903e7abd73cd5e8f2..c6832d7802fffa88f53d6fb5061d3d24534a9821 100644 (file)
--- a/libvirt-driver-modules.patch
+++ b/libvirt-driver-modules.patch
@@ -26,9 +26,9 @@ diff -ur libvirt-0.9.11/src/Makefile.am libvirt-0.9.11-mod/src/Makefile.am
  
  $(srcdir)/remote/remote_driver.c: $(REMOTE_DRIVER_GENERATED)
 @@ -832,6 +832,10 @@
- libvirt_driver_lxc_la_CFLAGS = \
+               $(LIBNL_CFLAGS) \
                -I$(top_srcdir)/src/conf $(AM_CFLAGS)
- libvirt_driver_lxc_la_LIBADD = $(CAPNG_LIBS)
+ libvirt_driver_lxc_la_LIBADD = $(CAPNG_LIBS) $(LIBNL_LIBS)
 +if HAVE_LIBBLKID
 +libvirt_driver_lxc_la_CFLAGS += $(BLKID_CFLAGS)
 +libvirt_driver_lxc_la_LIBADD += $(BLKID_LIBS)

diff --git a/libvirt-uri-user.patch b/libvirt-uri-user.patch
deleted file mode 100644 (file)
index fe09b24..0000000
--- a/libvirt-uri-user.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 4eb1c2560d1ab8bae620788d343e9e7b32ddc066 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Thu, 5 Apr 2012 17:52:42 +0200
-Subject: [PATCH] virURIParse: don't forget to copy the user part
-
-This got dropped with 300e60e15b22387dda41ed5985a9ebadfd86dd25
-
-Cheers,
- -- Guido
----
- src/util/viruri.c  |    5 ++++-
- tests/viruritest.c |   24 +++++++++++++-----------
- 2 files changed, 17 insertions(+), 12 deletions(-)
-
-diff --git a/src/util/viruri.c b/src/util/viruri.c
-index 2c6de51..a41f345 100644
---- a/src/util/viruri.c
-+++ b/src/util/viruri.c
-@@ -185,7 +185,9 @@ virURIParse(const char *uri)
-     if (xmluri->fragment &&
-         !(ret->fragment = strdup(xmluri->fragment)))
-         goto no_memory;
--
-+    if (xmluri->user &&
-+        !(ret->user = strdup(xmluri->user)))
-+        goto no_memory;
- 
-     /* First check: does it even make sense to jump inside */
-     if (ret->server != NULL &&
-@@ -249,6 +251,7 @@ virURIFormat(virURIPtr uri)
-     xmluri.query = uri->query;
- #endif
-     xmluri.fragment = uri->fragment;
-+    xmluri.user = uri->user;
- 
-     /* First check: does it make sense to do anything */
-     if (xmluri.server != NULL &&
-diff --git a/tests/viruritest.c b/tests/viruritest.c
-index 3570217..4bb6a03 100644
---- a/tests/viruritest.c
-+++ b/tests/viruritest.c
-@@ -42,6 +42,7 @@ struct URIParseData {
-     const char *path;
-     const char *query;
-     const char *fragment;
-+    const char *user;
-     virURIParamPtr params;
- };
- 
-@@ -143,33 +144,34 @@ mymain(void)
-     signal(SIGPIPE, SIG_IGN);
- 
- #define TEST_FULL(uri, uri_out, scheme, server, port, path, query,      \
--                  fragment, params)                                     \
-+                  fragment, user, params)                               \
-     do  {                                                               \
-         const struct URIParseData data = {                              \
-             uri, (uri_out) ? (uri_out) : (uri), scheme, server, port,   \
--            path, query, fragment, params                               \
-+            path, query, fragment, user, params                         \
-         };                                                              \
-         if (virtTestRun("Test URI " # uri,  1, testURIParse, &data) < 0) \
-             ret = -1;                                                   \
-     } while (0)
--#define TEST_PARSE(uri, scheme, server, port, path, query, fragment, params) \
--    TEST_FULL(uri, NULL, scheme, server, port, path, query, fragment, params)
-+#define TEST_PARSE(uri, scheme, server, port, path, query, fragment, user, params) \
-+    TEST_FULL(uri, NULL, scheme, server, port, path, query, fragment, user, params)
- #define TEST_PARAMS(query_in, query_out, params)                        \
-     TEST_FULL("test://example.com/?" query_in,                          \
-               *query_out ? "test://example.com/?" query_out : NULL,     \
--              "test", "example.com", 0, "/", query_in, NULL, params)
-+              "test", "example.com", 0, "/", query_in, NULL, NULL, params)
- 
-     virURIParam params[] = {
-         { (char*)"name", (char*)"value" },
-         { NULL, NULL },
-     };
- 
--    TEST_PARSE("test://example.com", "test", "example.com", 0, NULL, NULL, NULL, NULL);
--    TEST_PARSE("test://example.com:123", "test", "example.com", 123, NULL, NULL, NULL, NULL);
--    TEST_PARSE("test://example.com:123/system?name=value#foo", "test", "example.com", 123, "/system", "name=value", "foo", params);
--    TEST_PARSE("test://127.0.0.1:123/system", "test", "127.0.0.1", 123, "/system", NULL, NULL, NULL);
--    TEST_PARSE("test://[::1]:123/system", "test", "::1", 123, "/system", NULL, NULL, NULL);
--    TEST_PARSE("test://[2001:41c8:1:4fd4::2]:123/system", "test", "2001:41c8:1:4fd4::2", 123, "/system", NULL, NULL, NULL);
-+    TEST_PARSE("test://example.com", "test", "example.com", 0, NULL, NULL, NULL, NULL, NULL);
-+    TEST_PARSE("test://foo@example.com", "test", "example.com", 0, NULL, NULL, NULL, "foo", NULL);
-+    TEST_PARSE("test://example.com:123", "test", "example.com", 123, NULL, NULL, NULL, NULL, NULL);
-+    TEST_PARSE("test://example.com:123/system?name=value#foo", "test", "example.com", 123, "/system", "name=value", "foo", NULL, params);
-+    TEST_PARSE("test://127.0.0.1:123/system", "test", "127.0.0.1", 123, "/system", NULL, NULL, NULL, NULL);
-+    TEST_PARSE("test://[::1]:123/system", "test", "::1", 123, "/system", NULL, NULL, NULL, NULL);
-+    TEST_PARSE("test://[2001:41c8:1:4fd4::2]:123/system", "test", "2001:41c8:1:4fd4::2", 123, "/system", NULL, NULL, NULL, NULL);
- 
-     virURIParam params1[] = {
-         { (char*)"foo", (char*)"one" },
--- 
-1.7.1
-

diff --git a/libvirt.spec b/libvirt.spec
index 9c56abe75f11f881e03d4d15700ae371e06d3675..5261fdf4dc0403af76a25f3aaa2a2f94281788f2 100644 (file)
--- 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.11
-Release:       2
+Version:       0.9.12
+Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
-# Source0-md5: 6e9fab115075a8fd21d9bd0d7e558a52
+# Source0-md5: 5e842bc55733ceba60c64767580ff3e4
 Source1:       %{name}.init
 Source2:       %{name}.tmpfiles
 Patch0:                %{name}-sasl.patch
@@ -41,7 +41,6 @@ Patch2:               %{name}-qemu-acl.patch
 Patch3:                %{name}-xend.patch
 Patch4:                lxc-without-selinux.patch
 Patch5:                %{name}-driver-modules.patch
-Patch6:                %{name}-uri-user.patch
 URL:           http://www.libvirt.org/
 BuildRequires: audit-libs-devel
 BuildRequires: augeas-devel
@@ -493,7 +492,6 @@ biblioteki libvirt.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 # weird translations
 %{__rm} po/{my,eu_ES}.{po,gmo}