[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.8.1-2-7-gb0e2ed1
Laurent Léonard
laurent at open-minds.org
Tue Jul 6 10:36:54 UTC 2010
The following commit has been merged in the master branch:
commit 191fe8ed108d5b300aabc2c95965d165cbf8757a
Author: Laurent Léonard <laurent at open-minds.org>
Date: Tue Jul 6 10:54:21 2010 +0200
Drop patches.
0006-Don-t-drop-caps-when-exec-ing-qemu.patch - fixed upstream http://libvirt.org/git/?p=libvirt.git;a=commit;h=8b5bc6c4790e7b269ec6360e2000bc5a9503a8da
0008-Fix-leaks-in-udev-device-add-remove.patch - fixed upstream http://libvirt.org/git/?p=libvirt.git;a=commit;h=e7f3bad46edf352abd9f700af9ec59882762c4ca
diff --git a/debian/patches/0001-remove-RHism.diff.patch b/debian/patches/0001-remove-RHism.diff.patch
index 97b976a..9147150 100644
--- a/debian/patches/0001-remove-RHism.diff.patch
+++ b/debian/patches/0001-remove-RHism.diff.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] remove-RHism.diff
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/virsh.pod b/tools/virsh.pod
-index cf7585d..7631339 100644
+index 2b2227f..07ae3ba 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -42,7 +42,7 @@ the program.
diff --git a/debian/patches/0002-qemu-disable-network.diff.patch b/debian/patches/0002-qemu-disable-network.diff.patch
index c7442d1..5efe690 100644
--- a/debian/patches/0002-qemu-disable-network.diff.patch
+++ b/debian/patches/0002-qemu-disable-network.diff.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] qemu-disable-network.diff
2 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index 2531ac5..356a4fc 100644
+index ece18a6..9c4722f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -1043,9 +1043,6 @@ if WITH_NETWORK
+@@ -1117,9 +1117,6 @@ if WITH_NETWORK
test -z "$(UUID)" || \
sed -i -e "s,</name>,</name>\n <uuid>$(UUID)</uuid>," \
$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml
@@ -22,10 +22,10 @@ index 2531ac5..356a4fc 100644
uninstall-local::
diff --git a/src/Makefile.in b/src/Makefile.in
-index 490608a..46bf745 100644
+index 3133c07..64336aa 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -4729,9 +4729,6 @@ install-data-local:
+@@ -4931,9 +4931,6 @@ install-data-local:
@WITH_NETWORK_TRUE@ test -z "$(UUID)" || \
@WITH_NETWORK_TRUE@ sed -i -e "s,</name>,</name>\n <uuid>$(UUID)</uuid>," \
@WITH_NETWORK_TRUE@ $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml
diff --git a/debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch b/debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch
index 3c3a679..20e8fcc 100644
--- a/debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch
+++ b/debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] allow libvirt group to access the socket
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
-index 49de466..cc5f056 100644
+index d11c0fb..8de5c82 100644
--- a/daemon/libvirtd.conf
+++ b/daemon/libvirtd.conf
@@ -78,7 +78,7 @@
diff --git a/debian/patches/0005-Terminate-nc-on-EOF.patch b/debian/patches/0005-Terminate-nc-on-EOF.patch
index 06c71c2..d257f29 100644
--- a/debian/patches/0005-Terminate-nc-on-EOF.patch
+++ b/debian/patches/0005-Terminate-nc-on-EOF.patch
@@ -8,10 +8,10 @@ Closes: #564053
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
-index 317125f..2bb5a99 100644
+index 7052bf1..d68bfff 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
-@@ -736,7 +736,7 @@ doRemoteOpen (virConnectPtr conn,
+@@ -728,7 +728,7 @@ doRemoteOpen (virConnectPtr conn,
}
case trans_ssh: {
@@ -20,7 +20,7 @@ index 317125f..2bb5a99 100644
if (username) nr_args += 2; /* For -l username */
if (no_tty) nr_args += 5; /* For -T -o BatchMode=yes -e none */
-@@ -770,6 +770,8 @@ doRemoteOpen (virConnectPtr conn,
+@@ -762,6 +762,8 @@ doRemoteOpen (virConnectPtr conn,
}
cmd_argv[j++] = strdup (priv->hostname);
cmd_argv[j++] = strdup (netcat ? netcat : "nc");
diff --git a/debian/patches/0006-Don-t-drop-caps-when-exec-ing-qemu.patch b/debian/patches/0006-Don-t-drop-caps-when-exec-ing-qemu.patch
deleted file mode 100644
index ae2da4e..0000000
--- a/debian/patches/0006-Don-t-drop-caps-when-exec-ing-qemu.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Thu, 11 Feb 2010 19:02:32 +0100
-Subject: [PATCH] Don't drop caps when exec'ing qemu
-
-Closes: #565767
----
- src/qemu/qemu_driver.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 08cff00..ef9adee 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -3360,7 +3360,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-
- ret = virExecDaemonize(argv, progenv, &keepfd, &child,
- stdin_fd, &logfile, &logfile,
-- VIR_EXEC_NONBLOCK | VIR_EXEC_CLEAR_CAPS,
-+ VIR_EXEC_NONBLOCK /* | VIR_EXEC_CLEAR_CAPS */,
- qemudSecurityHook, &hookData,
- pidfile);
- VIR_FREE(pidfile);
---
diff --git a/debian/patches/0007-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
similarity index 96%
rename from debian/patches/0007-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
rename to debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index 61e0363..13605e8 100644
--- a/debian/patches/0007-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+++ b/debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
@@ -41,10 +41,10 @@ to savely detect that the command 'info migrate' is not implemented.
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
-index 3f917bf..e236588 100644
+index 569742a..e60c27e 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
-@@ -1113,7 +1113,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
+@@ -1124,7 +1124,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
*total *= 1024;
}
diff --git a/debian/patches/0008-Fix-leaks-in-udev-device-add-remove.patch b/debian/patches/0008-Fix-leaks-in-udev-device-add-remove.patch
deleted file mode 100644
index a5821f8..0000000
--- a/debian/patches/0008-Fix-leaks-in-udev-device-add-remove.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Mon, 7 Jun 2010 18:20:04 +0200
-Subject: [PATCH] Fix leaks in udev device add/remove
-
-Patch pulled from upstream git.
-
-Closes: #582965
-Thanks: Nigel Jones for forwarding
----
- src/node_device/node_device_udev.c | 12 ++++++++++--
- 1 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
-index bcfe991..1cf7fa7 100644
---- a/src/node_device/node_device_udev.c
-+++ b/src/node_device/node_device_udev.c
-@@ -1195,6 +1195,8 @@ static int udevRemoveOneDevice(struct udev_device *device)
- }
- nodeDeviceUnlock(driverState);
-
-+ udev_device_unref(device);
-+
- return ret;
- }
-
-@@ -1281,13 +1283,14 @@ static int udevAddOneDevice(struct udev_device *device)
- goto out;
- }
-
-+ /* If this is a device change, the old definition will be freed
-+ * and the current definition will take its place. */
- nodeDeviceLock(driverState);
- dev = virNodeDeviceAssignDef(&driverState->devs, def);
- nodeDeviceUnlock(driverState);
-
- if (dev == NULL) {
- VIR_ERROR("Failed to create device for '%s'", def->name);
-- virNodeDeviceDefFree(def);
- goto out;
- }
-
-@@ -1296,6 +1299,12 @@ static int udevAddOneDevice(struct udev_device *device)
- ret = 0;
-
- out:
-+ if (ret != 0) {
-+ virNodeDeviceDefFree(def);
-+ }
-+
-+ udev_device_unref(device);
-+
- return ret;
- }
-
-@@ -1315,7 +1324,6 @@ static int udevProcessDeviceListEntry(struct udev *udev,
- VIR_INFO("Failed to create node device for udev device '%s'",
- name);
- }
-- udev_device_unref(device);
- ret = 0;
- }
-
---
diff --git a/debian/patches/series b/debian/patches/series
index 7ea249d..006975c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,4 @@
0003-allow-libvirt-group-to-access-the-socket.patch
0004-fix-Debian-specific-path-to-hvm-loader.patch
0005-Terminate-nc-on-EOF.patch
-0006-Don-t-drop-caps-when-exec-ing-qemu.patch
-0007-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
-0008-Fix-leaks-in-udev-device-add-remove.patch
+0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
--
Libvirt Debian packaging
More information about the Pkg-libvirt-commits
mailing list