Hello,
On Fri, Mar 25, 2016 at 11:02:35AM +0100, Guido Günther wrote:
> thanks for looking into this!
>
> On Thu, Mar 24, 2016 at 05:51:21PM +0100, Philipp Hahn wrote:
> > diff -Nru libvirt-1.2.9/debian/changelog libvirt-1.2.9/debian/changelog
> > --- libvirt-1.2.9/debian/changelog 2015-08-26 08:34:22.000000000 +0200
> > +++ libvirt-1.2.9/debian/changelog 2016-03-05 08:18:07.000000000 +0100
> > @@ -1,3 +1,13 @@
> > +libvirt (1.2.9-9+deb8u2) jessie; urgency=medium
> > +
> > + * Non-maintainer upload.
> > + * Fix CVE-2015-5313 (Closes: #808273)
> > + * libvirt-daemon: Expects qemu-bridge-helper in /usr/libexec/
> > + (Closes: #816602)
> > + * Fix several FTBFS errors
>
> Could you elaborate on the FTBFS errors? I just rebuilt the current
> jessie version without any changes so "Fix several FTBFS errors" sounds
> very vague and exaggeratet. We already had a point release in Jessie so
> I wonder how these would get introduced?
I started working on libvirt from wheezy-backports, where the test suite
is not yet disabled. Maybe I run the build as root in some VM, where a
different set of tests are executed.
I re-run the build in a new jessie-pbuilder environment as non-root and
it work there, so the FTBFS patches are not needed for now.
But you will have to fix them some time if you wan't to re-enable
running test ests.
> > diff -Nru
> > libvirt-1.2.9/debian/patches/Disable-failing-virnetsockettest.patch
> > libvirt-1.2.9/debian/patches/Disable-failing-virnetsockettest.patch
> > --- libvirt-1.2.9/debian/patches/Disable-failing-virnetsockettest.patch
> > 2015-08-24 16:20:54.000000000 +0200
> > +++ libvirt-1.2.9/debian/patches/Disable-failing-virnetsockettest.patch
> > 2016-03-04 14:47:12.000000000 +0100
> > @@ -7,11 +7,25 @@
> > tests/virnetsockettest.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > -diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
> > -index 5d91f26..1f283a3 100644
> > --- a/tests/virnetsockettest.c
> > +++ b/tests/virnetsockettest.c
> > -@@ -501,10 +501,12 @@ mymain(void)
> > +@@ -333,6 +333,7 @@ static int testSocketUNIXAddrs(const voi
> > + return ret;
> > + }
> > +
> > ++#if 0
> > + static int testSocketCommandNormal(const void *data ATTRIBUTE_UNUSED)
> > + {
> > + virNetSocketPtr csock = NULL; /* Client socket */
> > +@@ -383,6 +384,7 @@ static int testSocketCommandFail(const v
> > + virObjectUnref(csock);
> > + return ret;
> > + }
> > ++#endif
>
> Why did you disable this one?
The alling site is disabled by
debian/patches/Disable-failing-virnetsockettest.patch, but the functions
are still defines. After running autoreconf gcc complains about defines
but unused functions.
My patch also puts the function definitions in a conditional block to
fix that issue.
> > diff -Nru libvirt-1.2.9/debian/patches/series
> > libvirt-1.2.9/debian/patches/series
> > --- libvirt-1.2.9/debian/patches/series 2015-08-24 16:20:54.000000000
> > +0200
> > +++ libvirt-1.2.9/debian/patches/series 2016-03-05 08:18:07.000000000
> > +0100
> > @@ -31,3 +31,5 @@
> > Allow-access-to-libnl-3-config-files.patch
> > Fix-crash-on-live-migration.patch
> > upstream/Report-original-error-when-QMP-probing-fails-with-ne.patch
> > +security/CVE-2015-5313-storage-don-t-allow-in-filesystem-volu.patch
> > +debian/Debianize-bridge-helper-path.patch
> > diff -Nru
> > libvirt-1.2.9/debian/patches/upstream/Report-original-error-when-QMP-probing-fails-with-ne.patch
> >
> > libvirt-1.2.9/debian/patches/upstream/Report-original-error-when-QMP-probing-fails-with-ne.patch
> > ---
> > libvirt-1.2.9/debian/patches/upstream/Report-original-error-when-QMP-probing-fails-with-ne.patch
> > 2015-08-24 16:20:54.000000000 +0200
> > +++
> > libvirt-1.2.9/debian/patches/upstream/Report-original-error-when-QMP-probing-fails-with-ne.patch
> > 2016-03-04 14:47:12.000000000 +0100
> > @@ -176,7 +176,7 @@
> >
> > if (virQEMUCapsParseHelpStr("QEMU", help, flags,
> > - &version, &is_kvm, &kvm_version, false)
> > == -1)
> > -+ &version, &is_kvm, &kvm_version, false,
> > NULL) == -1) {
> > ++ &version, &is_kvm, &kvm_version, false,
> > NULL) == -1)
> > goto cleanup;
>
> I wonder why this one changed as well.
# tail -n 12
debian/patches/upstream/Report-original-error-when-QMP-probing-fails-with-ne.patch
| index 975edf3..271fddc 100644
| --- a/tests/qemuhelptest.c
| +++ b/tests/qemuhelptest.c
| @@ -58,7 +58,7 @@ static int testHelpStrParsing(const void *data)
| goto cleanup;
|
| if (virQEMUCapsParseHelpStr("QEMU", help, flags,
| - &version, &is_kvm, &kvm_version, false) ==
-1)
| + &version, &is_kvm, &kvm_version, false,
NULL) == -1) {
| goto cleanup;
|
| # ifndef WITH_YAJL
That patch is adding one extra opening curly brace '{', which is never
closed. As the test suite is disabled for jessie but not for
wheezy-backports, this only fails there.
> > diff -Nru libvirt-1.2.9/debian/control libvirt-1.2.9/debian/control
> > --- libvirt-1.2.9/debian/control 2015-08-24 16:20:54.000000000 +0200
> > +++ libvirt-1.2.9/debian/control 2016-03-04 13:42:30.000000000 +0100
> > @@ -5,6 +5,7 @@
> > Uploaders: Guido Günther <a...@sigxcpu.org>, Laurent Léonard
> > <laur...@open-minds.org>
> > Build-Depends:
> > debhelper (>= 7),
> > + dh-autoreconf,
> > dh-systemd (>= 1.18~),
> > libxml2-dev,
> > libncurses5-dev,
> > diff -Nru libvirt-1.2.9/debian/rules libvirt-1.2.9/debian/rules
> > --- libvirt-1.2.9/debian/rules 2015-08-24 16:20:54.000000000 +0200
> > +++ libvirt-1.2.9/debian/rules 2016-03-04 13:42:30.000000000 +0100
> > @@ -123,7 +123,7 @@
> > EXAMPLES_DIR =
> > $(CURDIR)/debian/libvirt-doc/usr/share/doc/libvirt-doc/examples/
> >
> > %:
> > - dh $@ --builddirectory=$(DEB_BUILDDIR) --parallel
> > + dh $@ --builddirectory=$(DEB_BUILDDIR) --parallel --with autoreconf
>
> That shouldn't be needed either.
Some change triggeres auto* to re-create itself. Maybe caused by running
the build as root.
How to proceed from here: Are you going to upload your version or should
I redo my work and do the upload?
Philipp
--
/ / (_)__ __ ____ __ Philipp Hahn
/ /__/ / _ \/ // /\ \/ /
/____/_/_//_/\_,_/ /_/\_\ pmh...@pmhahn.de
