[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.8.1-1
Guido Günther
agx at sigxcpu.org
Sun May 9 12:47:37 UTC 2010
The following commit has been merged in the master branch:
commit 3e58e0b4cb7f4bd437d84070eaebc7c6adf9926a
Author: Guido Günther <agx at sigxcpu.org>
Date: Sat May 8 20:10:57 2010 +0200
Drop patches merged upstream
0007-nwfilter-Don-t-crash-if-driverState-NULL.patch
0008-Ignore-empty-type-statement-in-disk-element.patch
diff --git a/debian/patches/0001-remove-RHism.diff.patch b/debian/patches/0001-remove-RHism.diff.patch
index e4bd0eb..97b976a 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 4af5603..f9fbacc 100644
+index cf7585d..7631339 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 cb57cb2..c7442d1 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 d54e6d0..c296ecd 100644
+index 2531ac5..356a4fc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -1032,9 +1032,6 @@ if WITH_NETWORK
+@@ -1043,9 +1043,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 d54e6d0..c296ecd 100644
uninstall-local::
diff --git a/src/Makefile.in b/src/Makefile.in
-index 656d2cd..3b59b90 100644
+index 490608a..46bf745 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -4645,9 +4645,6 @@ install-data-local:
+@@ -4729,9 +4729,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/0005-Terminate-nc-on-EOF.patch b/debian/patches/0005-Terminate-nc-on-EOF.patch
index 36de284..06c71c2 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 751c354..9a48613 100644
+index 317125f..2bb5a99 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
-@@ -735,7 +735,7 @@ doRemoteOpen (virConnectPtr conn,
+@@ -736,7 +736,7 @@ doRemoteOpen (virConnectPtr conn,
}
case trans_ssh: {
@@ -20,7 +20,7 @@ index 751c354..9a48613 100644
if (username) nr_args += 2; /* For -l username */
if (no_tty) nr_args += 5; /* For -T -o BatchMode=yes -e none */
-@@ -769,6 +769,8 @@ doRemoteOpen (virConnectPtr conn,
+@@ -770,6 +770,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
index 521cb3c..ae2da4e 100644
--- 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
@@ -8,10 +8,10 @@ Closes: #565767
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index df1d435..ce1c3cf 100644
+index 08cff00..ef9adee 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
-@@ -3363,7 +3363,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+@@ -3360,7 +3360,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
ret = virExecDaemonize(argv, progenv, &keepfd, &child,
stdin_fd, &logfile, &logfile,
diff --git a/debian/patches/0007-nwfilter-Don-t-crash-if-driverState-NULL.patch b/debian/patches/0007-nwfilter-Don-t-crash-if-driverState-NULL.patch
deleted file mode 100644
index 7f31d9f..0000000
--- a/debian/patches/0007-nwfilter-Don-t-crash-if-driverState-NULL.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Mon, 19 Apr 2010 18:06:05 +0200
-Subject: [PATCH] nwfilter: Don't crash if driverState == NULL
-
-Origin: Upstream
-Closes: #577728
----
- src/nwfilter/nwfilter_driver.c | 11 +++++++++--
- 1 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
-index f237b7c..9fbfaa7 100644
---- a/src/nwfilter/nwfilter_driver.c
-+++ b/src/nwfilter/nwfilter_driver.c
-@@ -161,9 +161,16 @@ nwfilterDriverReload(void) {
- */
- static int
- nwfilterDriverActive(void) {
-- if (!driverState->pools.count)
-+ int ret;
-+
-+ if (!driverState)
- return 0;
-- return 1;
-+
-+ nwfilterDriverLock(driverState);
-+ ret = driverState->pools.count ? 1 : 0;
-+ nwfilterDriverUnlock(driverState);
-+
-+ return ret;
- }
-
- /**
---
diff --git a/debian/patches/0008-Ignore-empty-type-statement-in-disk-element.patch b/debian/patches/0008-Ignore-empty-type-statement-in-disk-element.patch
deleted file mode 100644
index 85807c4..0000000
--- a/debian/patches/0008-Ignore-empty-type-statement-in-disk-element.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Mon, 19 Apr 2010 18:08:19 +0200
-Subject: [PATCH] Ignore empty type statement in disk element
-
-Closes: #578347
----
- src/qemu/qemu_conf.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index 48252a5..6749b1d 100644
---- a/src/qemu/qemu_conf.c
-+++ b/src/qemu/qemu_conf.c
-@@ -2459,7 +2459,7 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk,
- if (disk->readonly &&
- qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)
- virBufferAddLit(&opt, ",readonly=on");
-- if (disk->driverType &&
-+ if (disk->driverType && strlen(disk->driverType) &&
- disk->type != VIR_DOMAIN_DISK_TYPE_DIR &&
- qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE_FORMAT)
- virBufferVSprintf(&opt, ",format=%s", disk->driverType);
---
diff --git a/debian/patches/series b/debian/patches/series
index 779562e..5b4033f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,3 @@
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-nwfilter-Don-t-crash-if-driverState-NULL.patch
-0008-Ignore-empty-type-statement-in-disk-element.patch
--
Libvirt Debian packaging
More information about the Pkg-libvirt-commits
mailing list