[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.9.7_rc2-1

[Guido Günther]

The following commit has been merged in the experimental branch:
commit bae02ad049a966fd69604ea7baca1239ac0c1594
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Nov 3 18:57:54 2011 +0100

    Drop patches, now fixed upstream
    
    Fix-storage-pool-source-comparison-to-avoid-comparin.patch
    Skip-socket-test-if-we-exceed-UNIX_PATH_MAX.patch

diff --git a/debian/patches/Fix-storage-pool-source-comparison-to-avoid-comparin.patch b/debian/patches/Fix-storage-pool-source-comparison-to-avoid-comparin.patch
deleted file mode 100644
index 39dc785..0000000
--- a/debian/patches/Fix-storage-pool-source-comparison-to-avoid-comparin.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: "Daniel P. Berrange" <berrange at redhat.com>
-Date: Fri, 7 Oct 2011 17:38:09 +0100
-Subject: Fix storage pool source comparison to avoid comparing with self
-
-If we are comparing storage pools we must skip comparing with
-ourself, so that re-defining an existing pool works
-
-* conf/storage_conf.c: Skip self when comparing
----
- src/conf/storage_conf.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
-index 18cbfdb..dadc115 100644
---- a/src/conf/storage_conf.c
-+++ b/src/conf/storage_conf.c
-@@ -1711,6 +1711,10 @@ int virStoragePoolSourceFindDuplicate(virStoragePoolObjListPtr pools,
-         if (def->type != pool->def->type)
-             continue;
- 
-+        /* Don't mach against ourself if re-defining existing pool ! */
-+        if (STREQ(pool->def->name, def->name))
-+            continue;
-+
-         virStoragePoolObjLock(pool);
- 
-         switch (pool->def->type) {
--- 
diff --git a/debian/patches/Skip-socket-test-if-we-exceed-UNIX_PATH_MAX.patch b/debian/patches/Skip-socket-test-if-we-exceed-UNIX_PATH_MAX.patch
deleted file mode 100644
index f92478f..0000000
--- a/debian/patches/Skip-socket-test-if-we-exceed-UNIX_PATH_MAX.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Wed, 2 Nov 2011 19:02:42 +0100
-Subject: Skip socket test if we exceed UNIX_PATH_MAX.
-
-As seen on the amd64 buildd with:
-
- 5) Socket UNIX Accept... libvir: RPC error : Path /build/buildd-libvirt_0.9.7~rc1-1-amd64-EGXZTE/libvirt-0.9.7~rc1/debian/build/tests/virnetsockettest-test.sock too long for unix socket: Cannot allocate memory
----
- tests/virnetsockettest.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
-index 1b88605..d7c0c4f 100644
---- a/tests/virnetsockettest.c
-+++ b/tests/virnetsockettest.c
-@@ -205,11 +205,13 @@ static int testSocketUNIXAccept(const void *data ATTRIBUTE_UNUSED)
-     if (progname[0] == '/') {
-         if (virAsprintf(&path, "%s-test.sock", progname) < 0) {
-             virReportOOMError();
-+            ret = EXIT_AM_SKIP;
-             goto cleanup;
-         }
-     } else {
-         if (virAsprintf(&path, "%s/%s-test.sock", abs_builddir, progname) < 0) {
-             virReportOOMError();
-+            ret = EXIT_AM_SKIP;
-             goto cleanup;
-         }
-     }
-@@ -254,11 +256,13 @@ static int testSocketUNIXAddrs(const void *data ATTRIBUTE_UNUSED)
-     if (progname[0] == '/') {
-         if (virAsprintf(&path, "%s-test.sock", progname) < 0) {
-             virReportOOMError();
-+            ret = EXIT_AM_SKIP;
-             goto cleanup;
-         }
-     } else {
-         if (virAsprintf(&path, "%s/%s-test.sock", abs_builddir, progname) < 0) {
-             virReportOOMError();
-+            ret = EXIT_AM_SKIP;
-             goto cleanup;
-         }
-     }
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 9124e2c..28c11bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,12 +2,10 @@ debian/remove-RHism.diff.patch
 debian/Don-t-enable-default-network-on-boot.patch
 debian/Allow-libvirt-group-to-access-the-socket.patch
 debian/fix-Debian-specific-path-to-hvm-loader.patch
-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
 debian/Debianize-libvirt-guests.patch
+debian/Don-t-require-gawk-for-a-simple-print-expression.patch
+patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
 virsh-Initialize-library-before-calling-virResetLast.patch
 Disable-daemon-start-test.patch
 Disable-gnulib-s-test-nonplocking-pipe.sh.patch
 Disable-failing-virnetsockettest.patch
-debian/Don-t-require-gawk-for-a-simple-print-expression.patch
-Skip-socket-test-if-we-exceed-UNIX_PATH_MAX.patch
-Fix-storage-pool-source-comparison-to-avoid-comparin.patch

-- 
Libvirt Debian packaging