Package: libvirt Version: 1.1.4-1 Severity: serious Tags: patch pending Dear maintainer,
I've prepared an NMU for libvirt (versioned as 1.1.4-1.1) and am going to upload it to DELAYED/2. Please feel free to tell me if I should delay it longer. Cheers, Julien
diff -Nru libvirt-1.1.4/debian/changelog libvirt-1.1.4/debian/changelog --- libvirt-1.1.4/debian/changelog 2013-11-04 07:05:56.000000000 +0100 +++ libvirt-1.1.4/debian/changelog 2013-11-24 12:28:11.000000000 +0100 @@ -1,3 +1,11 @@ +libvirt (1.1.4-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Fix linking when using pthread atomic ops, such as on armel. + * Disable silent build rules. + + -- Julien Cristau <jcris...@debian.org> Sun, 24 Nov 2013 12:27:18 +0100 + libvirt (1.1.4-1) unstable; urgency=low * Upload to unstable diff -Nru libvirt-1.1.4/debian/patches/atomic-pthread-link-fix libvirt-1.1.4/debian/patches/atomic-pthread-link-fix --- libvirt-1.1.4/debian/patches/atomic-pthread-link-fix 1970-01-01 01:00:00.000000000 +0100 +++ libvirt-1.1.4/debian/patches/atomic-pthread-link-fix 2013-11-24 12:15:27.000000000 +0100 @@ -0,0 +1,110 @@ +Description: <short summary of the patch> + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + libvirt (1.1.4-1) unstable; urgency=low + . + * Upload to unstable + * [54c6758] New upstream version 1.1.4 +Author: Guido GÃŒnther <a...@sigxcpu.org> + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +Index: libvirt-1.1.4/src/Makefile.am +=================================================================== +--- libvirt-1.1.4.orig/src/Makefile.am ++++ libvirt-1.1.4/src/Makefile.am +@@ -1982,6 +1982,7 @@ noinst_LTLIBRARIES += libvirt-setuid-rpc + + libvirt_setuid_rpc_client_la_SOURCES = \ + util/viralloc.c \ ++ util/viratomic.c \ + util/virbitmap.c \ + util/virbuffer.c \ + util/vircommand.c \ +Index: libvirt-1.1.4/src/Makefile.in +=================================================================== +--- libvirt-1.1.4.orig/src/Makefile.in ++++ libvirt-1.1.4/src/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.13.4 from Makefile.am. ++# Makefile.in generated by automake 1.14 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994-2013 Free Software Foundation, Inc. +@@ -612,10 +612,10 @@ libvirt_qemu_la_LINK = $(LIBTOOL) $(AM_V + $(LDFLAGS) -o $@ + libvirt_setuid_rpc_client_la_LIBADD = + am__libvirt_setuid_rpc_client_la_SOURCES_DIST = util/viralloc.c \ +- util/virbitmap.c util/virbuffer.c util/vircommand.c \ +- util/virconf.c util/virerror.c util/virevent.c \ +- util/vireventpoll.c util/virfile.c util/virhash.c \ +- util/virhashcode.c util/virjson.c util/virlog.c \ ++ util/viratomic.c util/virbitmap.c util/virbuffer.c \ ++ util/vircommand.c util/virconf.c util/virerror.c \ ++ util/virevent.c util/vireventpoll.c util/virfile.c \ ++ util/virhash.c util/virhashcode.c util/virjson.c util/virlog.c \ + util/virobject.c util/virpidfile.c util/virprocess.c \ + util/virrandom.c util/virsocketaddr.c util/virstoragefile.c \ + util/virstring.c util/virtime.c util/virthread.c \ +@@ -629,6 +629,7 @@ am__libvirt_setuid_rpc_client_la_SOURCES + remote/lxc_protocol.c datatypes.c libvirt.c libvirt-lxc.c + @WITH_LXC_TRUE@am_libvirt_setuid_rpc_client_la_OBJECTS = \ + @WITH_LXC_TRUE@ util/libvirt_setuid_rpc_client_la-viralloc.lo \ ++@WITH_LXC_TRUE@ util/libvirt_setuid_rpc_client_la-viratomic.lo \ + @WITH_LXC_TRUE@ util/libvirt_setuid_rpc_client_la-virbitmap.lo \ + @WITH_LXC_TRUE@ util/libvirt_setuid_rpc_client_la-virbuffer.lo \ + @WITH_LXC_TRUE@ util/libvirt_setuid_rpc_client_la-vircommand.lo \ +@@ -4456,6 +4457,7 @@ libvirt_lxc_la_CFLAGS = $(AM_CFLAGS) + libvirt_lxc_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD) + @WITH_LXC_TRUE@libvirt_setuid_rpc_client_la_SOURCES = \ + @WITH_LXC_TRUE@ util/viralloc.c \ ++@WITH_LXC_TRUE@ util/viratomic.c \ + @WITH_LXC_TRUE@ util/virbitmap.c \ + @WITH_LXC_TRUE@ util/virbuffer.c \ + @WITH_LXC_TRUE@ util/vircommand.c \ +@@ -4937,6 +4939,8 @@ util/$(DEPDIR)/$(am__dirstamp): + @: > util/$(DEPDIR)/$(am__dirstamp) + util/libvirt_setuid_rpc_client_la-viralloc.lo: util/$(am__dirstamp) \ + util/$(DEPDIR)/$(am__dirstamp) ++util/libvirt_setuid_rpc_client_la-viratomic.lo: util/$(am__dirstamp) \ ++ util/$(DEPDIR)/$(am__dirstamp) + util/libvirt_setuid_rpc_client_la-virbitmap.lo: util/$(am__dirstamp) \ + util/$(DEPDIR)/$(am__dirstamp) + util/libvirt_setuid_rpc_client_la-virbuffer.lo: util/$(am__dirstamp) \ +@@ -6185,6 +6189,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@uml/$(DEPDIR)/libvirt_driver_uml_impl_la-uml_driver.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/libvirt_iohelper-iohelper.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/libvirt_setuid_rpc_client_la-viralloc.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/libvirt_setuid_rpc_client_la-viratomic.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/libvirt_setuid_rpc_client_la-virbitmap.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/libvirt_setuid_rpc_client_la-virbuffer.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/libvirt_setuid_rpc_client_la-vircommand.Plo@am__quote@ +@@ -6458,6 +6463,13 @@ util/libvirt_setuid_rpc_client_la-virall + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_setuid_rpc_client_la_CFLAGS) $(CFLAGS) -c -o util/libvirt_setuid_rpc_client_la-viralloc.lo `test -f 'util/viralloc.c' || echo '$(srcdir)/'`util/viralloc.c + ++util/libvirt_setuid_rpc_client_la-viratomic.lo: util/viratomic.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_setuid_rpc_client_la_CFLAGS) $(CFLAGS) -MT util/libvirt_setuid_rpc_client_la-viratomic.lo -MD -MP -MF util/$(DEPDIR)/libvirt_setuid_rpc_client_la-viratomic.Tpo -c -o util/libvirt_setuid_rpc_client_la-viratomic.lo `test -f 'util/viratomic.c' || echo '$(srcdir)/'`util/viratomic.c ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) util/$(DEPDIR)/libvirt_setuid_rpc_client_la-viratomic.Tpo util/$(DEPDIR)/libvirt_setuid_rpc_client_la-viratomic.Plo ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='util/viratomic.c' object='util/libvirt_setuid_rpc_client_la-viratomic.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_setuid_rpc_client_la_CFLAGS) $(CFLAGS) -c -o util/libvirt_setuid_rpc_client_la-viratomic.lo `test -f 'util/viratomic.c' || echo '$(srcdir)/'`util/viratomic.c ++ + util/libvirt_setuid_rpc_client_la-virbitmap.lo: util/virbitmap.c + @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_setuid_rpc_client_la_CFLAGS) $(CFLAGS) -MT util/libvirt_setuid_rpc_client_la-virbitmap.lo -MD -MP -MF util/$(DEPDIR)/libvirt_setuid_rpc_client_la-virbitmap.Tpo -c -o util/libvirt_setuid_rpc_client_la-virbitmap.lo `test -f 'util/virbitmap.c' || echo '$(srcdir)/'`util/virbitmap.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) util/$(DEPDIR)/libvirt_setuid_rpc_client_la-virbitmap.Tpo util/$(DEPDIR)/libvirt_setuid_rpc_client_la-virbitmap.Plo diff -Nru libvirt-1.1.4/debian/patches/series libvirt-1.1.4/debian/patches/series --- libvirt-1.1.4/debian/patches/series 2013-11-04 07:05:40.000000000 +0100 +++ libvirt-1.1.4/debian/patches/series 2013-11-24 12:26:31.000000000 +0100 @@ -10,3 +10,4 @@ Reduce-udevadm-settle-timeout-to-10-seconds.patch debian/Debianize-systemd-service-files.patch Allow-xen-toolstack-to-find-it-s-binaries.patch +atomic-pthread-link-fix diff -Nru libvirt-1.1.4/debian/rules libvirt-1.1.4/debian/rules --- libvirt-1.1.4/debian/rules 2013-11-04 07:05:40.000000000 +0100 +++ libvirt-1.1.4/debian/rules 2013-11-24 11:53:33.000000000 +0100 @@ -68,6 +68,7 @@ endif DEB_CONFIGURE_EXTRA_ARGS := \ + --disable-silent-rules \ --disable-rpath \ $(WITH_QEMU) \ --with-qemu-user=libvirt-qemu \
signature.asc
Description: Digital signature
