[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.7.7-4-6-g9201ff6
Laurent Léonard
laurent at open-minds.org
Tue Apr 13 18:54:26 UTC 2010
The following commit has been merged in the master branch:
commit 44d5e7ae0e7a1cf73f34209b8c1d9b54897f5a67
Author: Laurent Léonard <laurent at open-minds.org>
Date: Tue Apr 13 19:02:57 2010 +0200
Drop patches.
0007-Work-around-broken-linux-socket.h.patch
0008-qemu-Fix-USB-by-product-with-security-enabled.patch - fixed upstream http://libvirt.org/git/?p=libvirt.git;a=commit;h=6d5c8a8f51db8ce97ab35ab6022dd5c94ab016b4
0009-security-Set-permissions-for-kernel-initrd.patch - fixed upstream http://libvirt.org/git/?p=libvirt.git;a=commit;h=3f1aa08af6580c215d973bc6bf57f505dbf8b926
0010-Don-t-crash-without-a-security-driver.patch - fixed upstream http://libvirt.org/git/?p=libvirt.git;a=commit;h=b7a7b3365145f6e9e434a3265a58666cd2e6d8dd
diff --git a/debian/patches/0001-remove-RHism.diff.patch b/debian/patches/0001-remove-RHism.diff.patch
index 55f9d87..e4bd0eb 100644
--- a/debian/patches/0001-remove-RHism.diff.patch
+++ b/debian/patches/0001-remove-RHism.diff.patch
@@ -7,15 +7,15 @@ Subject: [PATCH] remove-RHism.diff
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/virsh.pod b/tools/virsh.pod
-index 8f6df19..d5096a4 100644
+index 4af5603..f9fbacc 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
-@@ -34,7 +34,7 @@ the program.
+@@ -42,7 +42,7 @@ the program.
- All B<virsh> operations rely upon the libvirt library.
- For any virsh commands to run xend/qemu, or what ever virtual library that libvirt supports. For this reason you should start xend/qemu as a service when your system first boots using xen/qemu. This can usually be done using the command
--B<service libvirtd start> .
-+B<invoke-rc.d libvirt-bin start> .
+ Most B<virsh> operations rely upon the libvirt library being able to
+ connect to an already running libvirtd service. This can usually be
+-done using the command B<service libvirtd start>.
++done using the command B<invoke-rc.d libvirt-bin start>.
Most B<virsh> commands require root privileges to run due to the
communications channels used to talk to the hypervisor. Running as
diff --git a/debian/patches/0002-qemu-disable-network.diff.patch b/debian/patches/0002-qemu-disable-network.diff.patch
index 9cd31d7..cb57cb2 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 67f8b6d..760548d 100644
+index d54e6d0..c296ecd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -928,9 +928,6 @@ if WITH_NETWORK
+@@ -1032,9 +1032,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 67f8b6d..760548d 100644
uninstall-local::
diff --git a/src/Makefile.in b/src/Makefile.in
-index 2ec4626..9da317b 100644
+index 656d2cd..3b59b90 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -4323,9 +4323,6 @@ install-data-local:
+@@ -4645,9 +4645,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/0004-fix-Debian-specific-path-to-hvm-loader.patch b/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch
index f224208..1da59c0 100644
--- a/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch
+++ b/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch
@@ -12,10 +12,10 @@ Closes: #517059
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index ab8fbc3..bff4a1d 100644
+index ae17c60..f612711 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
-@@ -2288,7 +2288,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
+@@ -2287,7 +2287,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
"/usr/lib64/xen/bin/qemu-dm" :
"/usr/lib/xen/bin/qemu-dm"),
(guest_archs[i].hvm ?
diff --git a/debian/patches/0005-Terminate-nc-on-EOF.patch b/debian/patches/0005-Terminate-nc-on-EOF.patch
index 40c254e..36de284 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 b7b2e09..d8d363e 100644
+index 751c354..9a48613 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
-@@ -733,7 +733,7 @@ doRemoteOpen (virConnectPtr conn,
+@@ -735,7 +735,7 @@ doRemoteOpen (virConnectPtr conn,
}
case trans_ssh: {
@@ -20,7 +20,7 @@ index b7b2e09..d8d363e 100644
if (username) nr_args += 2; /* For -l username */
if (no_tty) nr_args += 5; /* For -T -o BatchMode=yes -e none */
-@@ -767,6 +767,8 @@ doRemoteOpen (virConnectPtr conn,
+@@ -769,6 +769,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 4661097..521cb3c 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 4707f72..2c99ce8 100644
+index df1d435..ce1c3cf 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
-@@ -2855,7 +2855,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+@@ -3363,7 +3363,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
ret = virExecDaemonize(argv, progenv, &keepfd, &child,
stdin_fd, &logfile, &logfile,
diff --git a/debian/patches/0007-Work-around-broken-linux-socket.h.patch b/debian/patches/0007-Work-around-broken-linux-socket.h.patch
deleted file mode 100644
index 556664f..0000000
--- a/debian/patches/0007-Work-around-broken-linux-socket.h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Tue, 9 Mar 2010 14:21:07 +0100
-Subject: [PATCH] Work around broken linux/socket.h
-
-lacking sa_family_t typedef.
----
- configure | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/configure b/configure
-index 3db3c68..626293c 100755
---- a/configure
-+++ b/configure
-@@ -57871,6 +57871,7 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+ #include <bits/sockaddr.h>
- #include <linux/if_link.h>
- int
- main ()
---
diff --git a/debian/patches/0008-qemu-Fix-USB-by-product-with-security-enabled.patch b/debian/patches/0008-qemu-Fix-USB-by-product-with-security-enabled.patch
deleted file mode 100644
index 339fc24..0000000
--- a/debian/patches/0008-qemu-Fix-USB-by-product-with-security-enabled.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Cole Robinson <crobinso at redhat.com>
-Date: Fri, 12 Mar 2010 17:37:52 +0000
-Subject: [PATCH] qemu: Fix USB by product with security enabled
-
-We need to call PrepareHostdevs to determine the USB device path before
-any security calls. PrepareHostUSBDevices was also incorrectly skipping
-all USB devices.
-
-Origin: upstream, http://www.libvirt.org/git/?p=libvirt.git;a=commit;h=6d5c8a8f51db8ce97ab35ab6022dd5c94ab016b4
----
- src/qemu/qemu_driver.c | 9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 2c99ce8..d5ac904 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -2360,7 +2360,7 @@ qemuPrepareHostUSBDevices(struct qemud_driver *driver ATTRIBUTE_UNUSED,
-
- if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
- continue;
-- if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
-+ if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB)
- continue;
-
- /* Resolve a vendor/product to bus/device */
-@@ -2701,6 +2701,10 @@ static int qemudStartVMDaemon(virConnectPtr conn,
- return -1;
- }
-
-+ /* Must be run before security labelling */
-+ if (qemuPrepareHostDevices(driver, vm->def) < 0)
-+ goto cleanup;
-+
- /* If you are using a SecurityDriver with dynamic labelling,
- then generate a security label for isolation */
- if (driver->securityDriver &&
-@@ -2759,9 +2763,6 @@ static int qemudStartVMDaemon(virConnectPtr conn,
- if (qemuSetupCgroup(driver, vm) < 0)
- goto cleanup;
-
-- if (qemuPrepareHostDevices(driver, vm->def) < 0)
-- goto cleanup;
--
- if (VIR_ALLOC(priv->monConfig) < 0) {
- virReportOOMError();
- goto cleanup;
---
diff --git a/debian/patches/0009-security-Set-permissions-for-kernel-initrd.patch b/debian/patches/0009-security-Set-permissions-for-kernel-initrd.patch
deleted file mode 100644
index e66f26d..0000000
--- a/debian/patches/0009-security-Set-permissions-for-kernel-initrd.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From: Cole Robinson <crobinso at redhat.com>
-Date: Fri, 12 Mar 2010 13:38:39 -0500
-Subject: [PATCH] security: Set permissions for kernel/initrd
-
-Fixes URL installs when running virt-install as root on Fedora.
-
-Closes: #574241
-Origin: upstream, http://libvirt.org/git/?p=libvirt.git;a=commit;h=3f1aa08af6580c215d973bc6bf57f505dbf8b926
----
- src/qemu/qemu_security_dac.c | 21 +++++++++++++++++++++
- src/security/security_selinux.c | 16 ++++++++++++++++
- 2 files changed, 37 insertions(+), 0 deletions(-)
-
-diff --git a/src/qemu/qemu_security_dac.c b/src/qemu/qemu_security_dac.c
-index 6911f48..1883fbe 100644
---- a/src/qemu/qemu_security_dac.c
-+++ b/src/qemu/qemu_security_dac.c
-@@ -332,6 +332,15 @@ qemuSecurityDACRestoreSecurityAllLabel(virDomainObjPtr vm)
- vm->def->disks[i]) < 0)
- rc = -1;
- }
-+
-+ if (vm->def->os.kernel &&
-+ qemuSecurityDACRestoreSecurityFileLabel(vm->def->os.kernel) < 0)
-+ rc = -1;
-+
-+ if (vm->def->os.initrd &&
-+ qemuSecurityDACRestoreSecurityFileLabel(vm->def->os.initrd) < 0)
-+ rc = -1;
-+
- return rc;
- }
-
-@@ -356,6 +365,18 @@ qemuSecurityDACSetSecurityAllLabel(virDomainObjPtr vm)
- return -1;
- }
-
-+ if (vm->def->os.kernel &&
-+ qemuSecurityDACSetOwnership(vm->def->os.kernel,
-+ driver->user,
-+ driver->group) < 0)
-+ return -1;
-+
-+ if (vm->def->os.initrd &&
-+ qemuSecurityDACSetOwnership(vm->def->os.initrd,
-+ driver->user,
-+ driver->group) < 0)
-+ return -1;
-+
- return 0;
- }
-
-diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
-index b2c8581..975b315 100644
---- a/src/security/security_selinux.c
-+++ b/src/security/security_selinux.c
-@@ -616,6 +616,14 @@ SELinuxRestoreSecurityAllLabel(virDomainObjPtr vm)
- rc = -1;
- }
-
-+ if (vm->def->os.kernel &&
-+ SELinuxRestoreSecurityFileLabel(vm->def->os.kernel) < 0)
-+ rc = -1;
-+
-+ if (vm->def->os.initrd &&
-+ SELinuxRestoreSecurityFileLabel(vm->def->os.initrd) < 0)
-+ rc = -1;
-+
- return rc;
- }
-
-@@ -736,6 +744,14 @@ SELinuxSetSecurityAllLabel(virDomainObjPtr vm)
- return -1;
- }
-
-+ if (vm->def->os.kernel &&
-+ SELinuxSetFilecon(vm->def->os.kernel, default_content_context) < 0)
-+ return -1;
-+
-+ if (vm->def->os.initrd &&
-+ SELinuxSetFilecon(vm->def->os.initrd, default_content_context) < 0)
-+ return -1;
-+
- return 0;
- }
-
---
diff --git a/debian/patches/0010-Don-t-crash-without-a-security-driver.patch b/debian/patches/0010-Don-t-crash-without-a-security-driver.patch
deleted file mode 100644
index 2eed331..0000000
--- a/debian/patches/0010-Don-t-crash-without-a-security-driver.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Wed, 17 Mar 2010 21:04:11 +0100
-Subject: [PATCH] Don't crash without a security driver
-
-Closes: #574359
----
- 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 d5ac904..ec05c0e 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -4902,7 +4902,7 @@ static int qemudNodeGetSecurityModel(virConnectPtr conn,
- int ret = 0;
-
- qemuDriverLock(driver);
-- if (!driver->securityDriver) {
-+ if (!driver->securityPrimaryDriver) {
- memset(secmodel, 0, sizeof (*secmodel));
- goto cleanup;
- }
---
diff --git a/debian/patches/series b/debian/patches/series
index 5fa083e..5b4033f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +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-Work-around-broken-linux-socket.h.patch
-0008-qemu-Fix-USB-by-product-with-security-enabled.patch
-0009-security-Set-permissions-for-kernel-initrd.patch
-0010-Don-t-crash-without-a-security-driver.patch
--
Libvirt Debian packaging
More information about the Pkg-libvirt-commits
mailing list