Bug#770701: unblock: libvirt/1.2.9-4
tags 770701 -moreinfo
thanks
Hi Niels,
On Sun, Nov 23, 2014 at 01:16:40PM +0100, Niels Thykier wrote:
> Control: tags -1 moreinfo
>
> On 2014-11-23 13:07, Guido Günther wrote:
> > Package: release.debian.org
> > Severity: normal
> > User: release.debian.org@packages.debian.org
> > Usertags: unblock
> >
> > Please unblock package libvirt
> >
> > The changes are:
> >
> > [...]
> >
> > There are some more pending issues for jessie like bugs in the lxc,
> > xen and vbox driver but I'd like to give them some more testing before
> > letting them enter jessie so I'd be awesome to have these changes
> > already unblocked.
> >
> > unblock libvirt/1.2.9-4
> >
> > Cheers,
> > -- Guido
> >
> > [...]
>
> Unfortunately, libvert/1.2.9-4 FTBFS on several architectures, which is
> a regression to 1.2.9-3. Until those are resolved, we cannot accept
> libvirt/1.2.9-4.
On top of that I've added these to fix the reported build errors:
* [9779548] Add a python build-dependency for the docs build
(Closes: #770775)
* [9aa75f7] util: Prepare URI formatting for libxml2 >= 2.9.2
(Closes: #769653)
Fixing a upgrade problem:
* [5c47e64] Pre-Depend on init-system-helpers.
Thanks to intrigeri and Bastien ROUCARIES (Closes: #769551, #766362)
Unbreaking the xen backend:
* [bfe835f] Specify "pygrub" by default for libxl backend guests.
Using an absolute path prevents libxl from providing the correct
default. (Closes: #770485)
So this turned into please
unblock libvirt/1.2.9-6
Cheers,
-- Guido
diff --git a/debian/changelog b/debian/changelog
index a639322..b4f25d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+libvirt (1.2.9-6) unstable; urgency=medium
+
+ * [9779548] Add a python build-dependency for the docs build
+ (Closes: #770775)
+
+ -- Guido Günther <agx@sigxcpu.org> Sun, 23 Nov 2014 18:47:42 +0100
+
+libvirt (1.2.9-5) unstable; urgency=medium
+
+ [ Guido Günther ]
+ * [5c47e64] Pre-Depend on init-system-helpers.
+ Thanks to intrigeri and Bastien ROUCARIES (Closes: #769551, #766362)
+ * [9aa75f7] util: Prepare URI formatting for libxml2 >= 2.9.2
+ (Closes: #769653)
+
+ [ Ian Campbell ]
+ * [bfe835f] Specify "pygrub" by default for libxl backend guests.
+ Using an absolute path prevents libxl from providing the correct
+ default. (Closes: #770485)
+
+ -- Guido Günther <agx@sigxcpu.org> Sun, 23 Nov 2014 14:57:13 +0100
+
libvirt (1.2.9-4) unstable; urgency=medium
* [4cdad47] Allow backported versions of dh-systemd
diff --git a/debian/control b/debian/control
index 4e2cd0e..8b9cd9b 100644
--- a/debian/control
+++ b/debian/control
@@ -39,6 +39,7 @@ Build-Depends:
libapparmor-dev [linux-any],
libsystemd-daemon-dev [linux-any],
systemtap-sdt-dev [amd64 armel armhf i386 ia64 powerpc s390],
+ python,
# for --with-storage-sheepdog
sheepdog [linux-any],
# for --with-storage-rados
@@ -123,6 +124,8 @@ Description: programs for the libvirt library
Package: libvirt-daemon-system
Architecture: any
+# Needed to clean up old libvirt-bin cruft, can be removed post jessie
+Pre-Depends: init-system-helpers (>= 1.18~)
Depends:
${misc:Depends},
${shlibs:Depends},
diff --git a/debian/patches/debian/allow-libxl-to-find-default-path-to-pygrub.patch b/debian/patches/debian/allow-libxl-to-find-default-path-to-pygrub.patch
new file mode 100644
index 0000000..aeeaac7
--- /dev/null
+++ b/debian/patches/debian/allow-libxl-to-find-default-path-to-pygrub.patch
@@ -0,0 +1,24 @@
+From: Ian Campbell <ijc@debian.org>
+Date: Fri, 21 Nov 2014 13:45:51 +0000
+Subject: allow libxl to find default path to pygrub.
+
+The Xen debian packages relocate pygrub into
+/usr/lib/xen-X.Y/bin/pygrub, not /usr/bin/pygrub. Since libxl knows to
+DTRT with a bare "pygrub" just use that by default.
+---
+ src/libxl/libxl_conf.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h
+index da66b4e..938a891 100644
+--- a/src/libxl/libxl_conf.h
++++ b/src/libxl/libxl_conf.h
+@@ -53,7 +53,7 @@
+ # define LIBXL_LIB_DIR LOCALSTATEDIR "/lib/libvirt/libxl"
+ # define LIBXL_SAVE_DIR LIBXL_LIB_DIR "/save"
+ # define LIBXL_DUMP_DIR LIBXL_LIB_DIR "/dump"
+-# define LIBXL_BOOTLOADER_PATH BINDIR "/pygrub"
++# define LIBXL_BOOTLOADER_PATH "pygrub"
+
+ /* libxl interface for setting VCPU affinity changed in 4.5. In fact, a new
+ * parameter has been added, representative of 'VCPU soft affinity'. If one
diff --git a/debian/patches/series b/debian/patches/series
index 14dcfbe..cfa566c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+debian/allow-libxl-to-find-default-path-to-pygrub.patch
debian/remove-RHism.diff.patch
debian/Don-t-enable-default-network-on-boot.patch
debian/fix-Debian-specific-path-to-hvm-loader.patch
@@ -14,3 +15,4 @@ debian/Use-sensible-editor-as-fallback.patch
debian/Debianize-virtlockd.patch
qemu-use-systemd-s-TerminateMachine-to-kill-all-proc.patch
security/CVE-2014-7823-dumpxml-security-hole-with-migratable-.patch
+util-Prepare-URI-formatting-for-libxml2-2.9.2.patch
diff --git a/debian/patches/util-Prepare-URI-formatting-for-libxml2-2.9.2.patch b/debian/patches/util-Prepare-URI-formatting-for-libxml2-2.9.2.patch
new file mode 100644
index 0000000..9aa7ef8
--- /dev/null
+++ b/debian/patches/util-Prepare-URI-formatting-for-libxml2-2.9.2.patch
@@ -0,0 +1,44 @@
+From: Martin Kletzander <mkletzan@redhat.com>
+Date: Fri, 3 Oct 2014 18:27:01 +0200
+Subject: util: Prepare URI formatting for libxml2 >= 2.9.2
+
+Since commit 8eb55d782a2b9afacc7938694891cc6fad7b42a5 libxml2 removes
+two slashes from the URI when there is no server part. This is fixed
+with beb7281055dbf0ed4d041022a67c6c5cfd126f25, but only if the calling
+application calls xmlSaveUri() on URI that xmlURIParse() parsed. And
+that is not the case in virURIFormat(). virURIFormat() accepts
+virURIPtr that can be created without parsing it and we do that when we
+format network storage paths for gluster for example. Even though
+virStorageSourceParseBackingURI() uses virURIParse(), it throws that data
+structure right away.
+
+Since we want to format URIs as URIs and not absolute URIs or opaque
+URIs (see RFC 3986), we can specify that with a special hack thanks to
+commit beb7281055dbf0ed4d041022a67c6c5cfd126f25, by setting port to -1.
+
+This fixes qemuxml2argvtest test where the disk-drive-network-gluster
+case was failing.
+
+Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
+---
+ src/util/viruri.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/util/viruri.c b/src/util/viruri.c
+index 69e7649..23d86c5 100644
+--- a/src/util/viruri.c
++++ b/src/util/viruri.c
+@@ -254,6 +254,13 @@ virURIFormat(virURIPtr uri)
+ xmluri.server = tmpserver;
+ }
+
++ /*
++ * This helps libxml2 deal with the difference
++ * between uri:/absolute/path and uri:///absolute/path.
++ */
++ if (!xmluri.server && !xmluri.port)
++ xmluri.port = -1;
++
+ ret = (char *)xmlSaveUri(&xmluri);
+ if (!ret) {
+ virReportOOMError();
Reply to: