[Pkg-libvirt-commits] [libvirt] 03/04: Rediff patches
Guido Guenther
agx at moszumanska.debian.org
Sun Mar 12 13:39:44 UTC 2017
This is an automated email from the git hooks/post-receive script.
agx pushed a commit to branch debian/experimental
in repository libvirt.
commit b1730fa188ccfad1e67d5810c9a24b7cfe93fb50
Author: Guido Günther <agx at sigxcpu.org>
Date: Sun Mar 12 12:48:47 2017 +0100
Rediff patches
Dropped
CVE-2017-2635-qemu-Don-t-update-physical-storage-size-of-.patch
fixed upstream
Dropped
Disable-use-of-namespaces-by-default.patch
Namespaces can now be used with QEMU
---
...mu-Don-t-update-physical-storage-size-of-.patch | 33 ----------------------
.../Disable-use-of-namespaces-by-default.patch | 30 --------------------
...duce-udevadm-settle-timeout-to-10-seconds.patch | 4 +--
.../debian/Debianize-systemd-service-files.patch | 4 +--
debian/patches/debian/Debianize-virtlockd.patch | 4 +--
.../Don-t-enable-default-network-on-boot.patch | 8 +++---
debian/patches/debian/remove-RHism.diff.patch | 2 +-
...onitorTextGetMigrationStatus-to-intercept.patch | 2 +-
debian/patches/series | 2 --
9 files changed, 12 insertions(+), 77 deletions(-)
diff --git a/debian/patches/CVE-2017-2635-qemu-Don-t-update-physical-storage-size-of-.patch b/debian/patches/CVE-2017-2635-qemu-Don-t-update-physical-storage-size-of-.patch
deleted file mode 100644
index 7040d75..0000000
--- a/debian/patches/CVE-2017-2635-qemu-Don-t-update-physical-storage-size-of-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Peter Krempa <pkrempa at redhat.com>
-Date: Thu, 23 Feb 2017 10:07:30 +0100
-Subject: CVE-2017-2635: qemu: Don't update physical storage size of empty
- drives
-
-Previously the code called virStorageSourceUpdateBlockPhysicalSize which
-did not do anything on empty drives since it worked only on block
-devices. After the refactor in c5f6151390 it's called for all devices
-and thus attempts to deref the NULL path of empty drives.
-
-Add a check that skips the update of the physical size if the storage
-source is empty.
-
-Upstream-Commit: c3de387380f6057ee0e46cd9f2f0a092e8070875
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1420718
----
- src/qemu/qemu_driver.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index d4422f3..2bb5906 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -11644,6 +11644,9 @@ qemuDomainStorageUpdatePhysical(virQEMUDriverPtr driver,
- int fd = -1;
- struct stat sb;
-
-+ if (virStorageSourceIsEmpty(src))
-+ return 0;
-+
- if (qemuDomainStorageOpenStat(driver, cfg, vm, src, &fd, &sb) < 0)
- return -1;
-
diff --git a/debian/patches/Disable-use-of-namespaces-by-default.patch b/debian/patches/Disable-use-of-namespaces-by-default.patch
deleted file mode 100644
index 3f45ea3..0000000
--- a/debian/patches/Disable-use-of-namespaces-by-default.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: "Daniel P. Berrange" <berrange at redhat.com>
-Date: Wed, 18 Jan 2017 10:48:12 +0000
-Subject: Disable use of namespaces by default
-
-When namespaces are enabled there is currently breakage when
-using disk hotplug and when using AppArmor
-
-Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
----
- src/qemu/qemu_conf.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index 6613d59..aa05b46 100644
---- a/src/qemu/qemu_conf.c
-+++ b/src/qemu/qemu_conf.c
-@@ -317,13 +317,6 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged)
- if (!(cfg->namespaces = virBitmapNew(QEMU_DOMAIN_NS_LAST)))
- goto error;
-
--#if defined(__linux__)
-- if (privileged &&
-- virProcessNamespaceAvailable(VIR_PROCESS_NAMESPACE_MNT) == 0 &&
-- virBitmapSetBit(cfg->namespaces, QEMU_DOMAIN_NS_MOUNT) < 0)
-- goto error;
--#endif /* defined(__linux__) */
--
- #ifdef DEFAULT_LOADER_NVRAM
- if (virFirmwareParseList(DEFAULT_LOADER_NVRAM,
- &cfg->firmwares,
diff --git a/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch b/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
index a9df5e5..b0e9df7 100644
--- a/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
+++ b/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
@@ -10,10 +10,10 @@ Closes: #663931
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/virutil.c b/src/util/virutil.c
-index aeaa7f9..cfb326c 100644
+index bb0f2d2..61c436e 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
-@@ -1586,7 +1586,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
+@@ -1585,7 +1585,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
void virFileWaitForDevices(void)
{
# ifdef UDEVADM
diff --git a/debian/patches/debian/Debianize-systemd-service-files.patch b/debian/patches/debian/Debianize-systemd-service-files.patch
index 07320bd..ce7623d 100644
--- a/debian/patches/debian/Debianize-systemd-service-files.patch
+++ b/debian/patches/debian/Debianize-systemd-service-files.patch
@@ -8,10 +8,10 @@ Subject: Debianize systemd service files
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in
-index bbf27da..c7f11fc 100644
+index c72dde5..8ce8622 100644
--- a/daemon/libvirtd.service.in
+++ b/daemon/libvirtd.service.in
-@@ -18,8 +18,8 @@ Documentation=http://libvirt.org
+@@ -19,8 +19,8 @@ Documentation=http://libvirt.org
[Service]
Type=notify
diff --git a/debian/patches/debian/Debianize-virtlockd.patch b/debian/patches/debian/Debianize-virtlockd.patch
index 2cbf3ef..6d162cc 100644
--- a/debian/patches/debian/Debianize-virtlockd.patch
+++ b/debian/patches/debian/Debianize-virtlockd.patch
@@ -7,10 +7,10 @@ Subject: Debianize virtlockd
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
-index 57089b0..fccc78a 100644
+index 69b568f..9fa2f9f 100644
--- a/src/locking/virtlockd.service.in
+++ b/src/locking/virtlockd.service.in
-@@ -5,7 +5,7 @@ Documentation=man:virtlockd(8)
+@@ -6,7 +6,7 @@ Documentation=man:virtlockd(8)
Documentation=http://libvirt.org
[Service]
diff --git a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
index d0eeb73..28d5fbf 100644
--- a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
+++ b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
@@ -9,10 +9,10 @@ to not interfere with existing network configurations
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index 21a78e0..598e659 100644
+index a85cd0d..3d5e5cf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -3144,8 +3144,7 @@ if WITH_NETWORK
+@@ -3321,8 +3321,7 @@ if WITH_NETWORK
$(DESTDIR)$(confdir)/qemu/networks/default.xml && \
rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \
@@ -23,10 +23,10 @@ index 21a78e0..598e659 100644
uninstall-local:: uninstall-init uninstall-systemd
diff --git a/src/Makefile.in b/src/Makefile.in
-index 7a78ed4..c8e8e3a 100644
+index 81e1405..c068bdc 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -11755,8 +11755,7 @@ install-data-local: install-init install-systemd
+@@ -12260,8 +12260,7 @@ install-data-local: install-init install-systemd
@WITH_NETWORK_TRUE@ $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
@WITH_NETWORK_TRUE@ rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
@WITH_NETWORK_TRUE@ ( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \
diff --git a/debian/patches/debian/remove-RHism.diff.patch b/debian/patches/debian/remove-RHism.diff.patch
index d17949f..c832a55 100644
--- a/debian/patches/debian/remove-RHism.diff.patch
+++ b/debian/patches/debian/remove-RHism.diff.patch
@@ -7,7 +7,7 @@ Subject: remove-RHism.diff
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/virsh.pod b/tools/virsh.pod
-index 0e434c0..c35041a 100644
+index 6c06ee0..b2e20e2 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -119,7 +119,7 @@ virsh is coming from and which options and driver are compiled in.
diff --git a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index 5f9d184..64c84b4 100644
--- a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+++ b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
@@ -42,7 +42,7 @@ to savely detect that the command 'info migrate' is not implemented.
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
-index bc83218..557f06e 100644
+index 9c9eeea..93bc334 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -1482,7 +1482,15 @@ int qemuMonitorTextGetMigrationStats(qemuMonitorPtr mon,
diff --git a/debian/patches/series b/debian/patches/series
index a5eeda3..e2166ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,6 +17,4 @@ Set-defaults-for-zfs-tools.patch
Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
openpty-Skip-test-if-no-pty-is-available.patch
test-posix_openpt-don-t-fail-on-EACCESS.patch
-Disable-use-of-namespaces-by-default.patch
debian/Debianize-virtlogd.patch
-CVE-2017-2635-qemu-Don-t-update-physical-storage-size-of-.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git
More information about the Pkg-libvirt-commits
mailing list