[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, bpo-squeeze, updated. debian/0.9.2-7_bpo60+1

Fri Jul 22 20:28:13 UTC 2011

The following commit has been merged in the bpo-squeeze branch:
commit 801df19d79d56b94fa3e3b8b32b531950857013a
Merge: 4316126836e1ed022f35eafd8774ab1bca34091b c1aadb5c69109354e95691cbd8e6fde6e343e4b4
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Jul 14 18:43:18 2011 +0200

    Merge branch 'master' into bpo-squeeze

diff --combined debian/changelog
index 3ce57af,23156d3..656b922

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,89 +1,97 @@@
+ libvirt (0.9.2-7) unstable; urgency=low
+ 
+   * [9c99f46] CVE-2011-2511: Fix integer overflow in VirDomainGetVcpus. Patch
+     taken verbatim from upstream's git. (Closes: #633630)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Tue, 12 Jul 2011 15:07:39 +0200
+ 
+ libvirt (0.9.2-6) unstable; urgency=low
+ 
+   * [b385504] Disable the testsuite on all architectures except i386 and amd64
+     so the current version can move into testing.
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Mon, 04 Jul 2011 09:14:56 +0200
+ 
+ libvirt (0.9.2-5) unstable; urgency=low
+ 
+   * [e523120] New patch Disable-gnulib-s-test-nonplocking-pipe.sh.patch.
+     Disable gnulib's test-nonplocking-pipe.sh.
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Sun, 26 Jun 2011 15:57:24 +0200
+ 
+ libvirt (0.9.2-4) unstable; urgency=low
+ 
+   * [398a4dd] New patch Split-out-dlopen-detection.patch.  Explicitly pass
+     -ldl since the lock manager needs it.
+   * [3be22be] New patch Update-generated-autoconf-files.patch. Update
+     generated autoconf files
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Mon, 13 Jun 2011 19:09:17 +0200
+ 
+ libvirt (0.9.2-3) unstable; urgency=low
+ 
+   * [008e65d] New patch Skip-nodeinfo-test-on-non-intel-architectures.patch:
+     Skip nodeinfo test on non intel architectures since the testfiles assume a
+     /proc/cpuinfo specific to this architecture.
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Sun, 12 Jun 2011 22:00:05 +0200
+ 
+ libvirt (0.9.2-2) unstable; urgency=low
+ 
+   * [17570fc] Enable OpenVZ on Linux only (Closes: #630099)
+   * [31a35bc] New patch nodeinfo-remove-superfluous-braces.patch
+     nodeinfo: remove superfluous braces to fix compilation on non intel
+     architectures
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Sat, 11 Jun 2011 18:40:14 +0200
+ 
+ libvirt (0.9.2-1) unstable; urgency=low
+ 
+   * [c6187ec] New upstream version 0.9.2
+   * [368375a] Update netcat detection to new code
+   * [e3319ee] Drop security-plug-regression-introduced-in-disk-probe-lo.patch
+     applied upstream
+   * [a1428a7] Refresh patches
+   * [77590ee] Update symbols
+   * [0626972] Depend on iproute
+   * [a1b211d] Version dependency on iptables and drop
+     Disable-CHECKSUM-rule.patch (Closes: #627595)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Wed, 08 Jun 2011 16:58:19 +0200
+ 
+ libvirt (0.9.1-2) unstable; urgency=high
+ 
+   * [4fbc990] New patch security-plug-regression-introduced-in-disk-probe-lo.
+     patch (Closes: #629128)
+     - Fixes: CVE-2011-2178
+ 
+  -- Laurent Léonard <laurent at open-minds.org>  Sat, 04 Jun 2011 01:53:43 +0200
+ 
+ libvirt (0.9.1-1) unstable; urgency=low
+ 
+   * [1546b8c] New upstream version 0.9.1
+   * [2418ebf] Rediff patches
+   * [d4e2b71] Drop Make-sure-DNSMASQ_STATE_DIR-exists.patch: applied upstream
+   * [0fef693] libvirt0: Update symbols
+   * [b4ff149] Bump standards version to 3.9.2
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Tue, 10 May 2011 22:45:11 +0200
+ 
+ libvirt (0.9.0-2) unstable; urgency=low
+ 
+   * [3a8e07f] New patch Make-sure-DNSMASQ_STATE_DIR-exists.patch
+     (Closes: #623536)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Mon, 09 May 2011 17:14:02 +0200
+ 
 +libvirt (0.9.0-1~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +  * [82758c4] Use dh_pycentral on Squeeze
 +    since there's no dh_python2 yet.
 +
 + -- Guido Günther <agx at sigxcpu.org>  Mon, 09 May 2011 18:41:55 +0200
 +
  libvirt (0.9.0-1) unstable; urgency=low
  
    * [a91c8f6] New upstream version 0.9.0
diff --combined debian/control
index 90cb1da,6aaa2bf..58a5b81
--- a/debian/control
+++ b/debian/control
@@@ -3,8 -3,7 +3,8 @@@ Section: lib
  Priority: optional
  Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers at lists.alioth.debian.org>
  Uploaders: Guido Günther <agx at sigxcpu.org>, Laurent Léonard <laurent at open-minds.org>
 -Build-Depends: cdbs (>= 0.4.90~),
 +Build-Depends: cdbs (>= 0.4.89~),
 + python-central,
   debhelper (>= 7),
   libxml2-dev,
   libncurses5-dev,
@@@ -36,7 -35,7 +36,7 @@@ Build-Conflicts: dpkg-dev (= 1.15.3
  Vcs-Git: git://git.debian.org/git/pkg-libvirt/libvirt.git
  Vcs-Browser: http://git.debian.org/?p=pkg-libvirt/libvirt.git
  Homepage: http://libvirt.org
- Standards-Version: 3.9.1
+ Standards-Version: 3.9.2
  DM-Upload-Allowed: yes
  X-Python-Version: 2.6
  
@@@ -45,8 -44,16 +45,16 @@@ Architecture: an
  Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libvirt0 (= ${binary:Version}), logrotate, gettext-base
  Enhances: qemu, qemu-kvm, xen
  Section: admin
- Recommends: netcat-openbsd, bridge-utils, dnsmasq-base (>= 2.46-1), iptables, qemu-kvm | qemu (>= 0.9.1),
-  libxml2-utils, iptables, gawk, ebtables, dmidecode
+ Recommends: netcat-openbsd,
+  bridge-utils,
+  dnsmasq-base (>= 2.46-1),
+  iptables (>= 1.4.10),
+  qemu-kvm | qemu (>= 0.9.1),
+  libxml2-utils,
+  gawk,
+  ebtables,
+  dmidecode,
+  iproute
  Suggests: policykit-1
  Description: the programs for the libvirt library
   Libvirt is a C toolkit to interact with the virtualization capabilities
@@@ -111,7 -118,6 +119,7 @@@ Architecture: an
  Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libvirt0 (>= ${binary:Version})
  Provides: ${python:Provides}
  Section: python
 +XB-Python-Version: ${python:Versions}
  Description: libvirt Python bindings
   Libvirt is a C toolkit to interact with the virtualization capabilities
   of recent versions of Linux (and other OSes). The library aims at providing
diff --combined debian/rules
index cf2149a,b7c662a..55b73f6
--- a/debian/rules
+++ b/debian/rules
@@@ -1,10 -1,9 +1,10 @@@
  #!/usr/bin/make -f
  
 +DEB_PYTHON_SYSTEM = pycentral
  DEB_BUILD_PARALLEL = yes
- DEB_MAKE_CHECK_TARGET = check
  
  ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64))
+   DEB_MAKE_CHECK_TARGET = check
    WITH_XEN = --with-xen
    WITH_VBOX = --with-vbox
  else
@@@ -22,6 -21,7 +22,7 @@@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS
    WITH_MACVTAP        = --with-macvtap
    WITH_NETWORK        = --with-network
    WITH_QEMU           = --with-qemu
+   WITH_OPENVZ         = --with-openvz
    ifneq (,$(findstring $(DEB_HOST_ARCH), ia64))
        WITH_LXC        = --without-lxc
    else
@@@ -49,7 -49,7 +50,7 @@@ DEB_CONFIGURE_EXTRA_FLAGS :=     
  	$(WITH_QEMU)		 \
  	--with-qemu-user=libvirt-qemu  \
  	--with-qemu-group=kvm    \
- 	--with-openvz            \
+         $(WITH_OPENVZ)		 \
  	--with-avahi             \
  	--with-sasl              \
  	$(WITH_POLKIT)		 \

-- 
Libvirt Debian packaging

