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

[Guido Günther]

The following commit has been merged in the experimental branch:
commit 45f98ae6954d5016c2e6da0e512f0cf67719557b
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sat Dec 26 17:30:10 2009 +0100

    Drop 0005-udev_device_get_devpath-might-return-NULL.patch
    
    applied upstream.

diff --git a/debian/patches/0005-udev_device_get_devpath-might-return-NULL.patch b/debian/patches/0005-udev_device_get_devpath-might-return-NULL.patch
deleted file mode 100644
index 044567e..0000000
--- a/debian/patches/0005-udev_device_get_devpath-might-return-NULL.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Mon, 7 Dec 2009 19:00:11 +0100
-Subject: [PATCH] udev_device_get_devpath might return NULL
-
-Fix crash on strdup in that case.
----
- src/node_device/node_device_udev.c |    8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
-
-diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
-index 9b48052..c7238fc 100644
---- a/src/node_device/node_device_udev.c
-+++ b/src/node_device/node_device_udev.c
-@@ -947,8 +947,14 @@ static int udevProcessStorage(struct udev_device *device,
- {
-     union _virNodeDevCapData *data = &def->caps->data;
-     int ret = -1;
-+    const char* devnode;
- 
--    data->storage.block = strdup(udev_device_get_devnode(device));
-+    devnode = udev_device_get_devnode(device);
-+    if(!devnode) {
-+        VIR_DEBUG("No devnode for '%s'\n", udev_device_get_devpath(device));
-+        goto out;
-+    }
-+    data->storage.block = strdup(devnode);
-     if (udevGetStringProperty(device,
-                               "DEVNAME",
-                               &data->storage.block) == PROPERTY_ERROR) {
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 7290eac..a8c0f9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 0002-qemu-disable-network.diff.patch
 0003-allow-libvirt-group-to-access-the-socket.patch
 0004-fix-Debian-specific-path-to-hvm-loader.patch
-0005-udev_device_get_devpath-might-return-NULL.patch

-- 
Libvirt Debian packaging