[Pkg-libvirt-commits] [SCM] Libvirt debian packaging branch, bpo-etch, updated. debian/0.4.6-10-16-g4e730fe
Guido Guenther
agx at sigxcpu.org
Sat Dec 20 19:23:11 UTC 2008
The following commit has been merged in the bpo-etch branch:
commit 7e1a68052daebf5f8b2a4b16e4950312e2aa1b3c
Merge: 1dc2db8e8dc9338e37a3e810656f9d1918e8ee69 a62bca88be6a3cbb9ba613b834f84dccda782e1f
Author: Guido Günther <agx at sigxcpu.org>
Date: Sat Dec 20 19:40:04 2008 +0100
Merge branch 'master' into bpo-etch
Conflicts:
debian/changelog
debian/control
debian/patches/series
diff --combined debian/changelog
index cd83dc2,d7118d9..f5ea361
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,121 +1,137 @@@
+ libvirt (0.4.6-10) unstable; urgency=low
+
+ * [5878698] cherry-pick patch for CVE-2008-5086 from experimental
+
+ -- Guido Günther <agx at sigxcpu.org> Thu, 18 Dec 2008 16:59:45 +0100
+
+ libvirt (0.4.6-9) unstable; urgency=low
+
+ * [d30438c] create libvirt log directory (Closes: #508129)
+
+ -- Guido Günther <agx at sigxcpu.org> Mon, 08 Dec 2008 10:12:28 +0100
+
+ libvirt (0.4.6-8) unstable; urgency=low
+
+ * [e771da9] drop superflous 0011-Fix-segfault-on-missing-volume-
+ format.patch - not needed.
+
+ -- Guido Günther <agx at sigxcpu.org> Fri, 05 Dec 2008 10:17:01 +0100
+
+ libvirt (0.4.6-7) unstable; urgency=low
+
+ * [ea12bd9] create /var/run/libvirt fixes /var/run on tmpfs
+ (Closes: #507578)
+ * [97e5706] also look for /usr/bin/kvm (Closes: #507547)
+ * [311b4c1] increase initial qemu monitor read timeout
+ (Closes: #499720)
+ * [fbe4e00] open qemu monitor log O_APPEND instead of O_TRUNC
+ * [f8ce017] raise error on invalid volume format
+ * [40edcf8] rotate qemu monitor logs (Closes: #507553) - thanks to
+ Harald Staub
+ * [46ea43a] fix segfault on missing volume format (Closes: #507677) -
+ thanks to Daniel Veillard
+ * [ee377f3] bump shlibs version to 0.4.6
+ * [504d55d] depend on logrotate
+
+ -- Guido Günther <agx at sigxcpu.org> Thu, 04 Dec 2008 17:50:45 +0100
+
+ libvirt (0.4.6-6) unstable; urgency=low
+
+ * [ff8e9ae] README.Debian: clarify xen configuration
+ * [c07c68f] prefer xenstoraged driver for listDomains - avoids seeing "ghost
+ domains" due to bugs in several versions of the xen HV
+
+ -- Guido Günther <agx at sigxcpu.org> Thu, 27 Nov 2008 18:06:48 +0100
+
+ libvirt (0.4.6-5) unstable; urgency=low
+
+ * [411ada3] add more details about dnsmasq vs. libvirtd (Closes: #504605)
+ * [2f8f07d] add default image dir virt-manager assumes they exist and
+ they're used in the SELinux policies too. (Closes: #505577)
+ * [9eb3a83] fix #define vs. #defined typos - affects non Linux architectures
+ and fixes the build with gcc 4.4 (Closes: #505607) - thanks to Martin
+ Michlmayr
+ * [0e21634] fix uploader
+
+ -- Guido Günther <agx at sigxcpu.org> Fri, 14 Nov 2008 14:54:48 +0100
+
+ libvirt (0.4.6-4) unstable; urgency=low
+
+ * upload to unstable
+ * [50b27f5] add libvirt-suspendonreboot script (Closes: #501155) -
+ thanks to Andreas Barth
+
+ -- Guido Günther <agx at sigxcpu.org> Sat, 01 Nov 2008 19:33:36 +0100
+
+ libvirt (0.4.6-3) experimental; urgency=low
+
+ * [8fa5a3c] add a versioned recommends on qemu (Closes: #501692)
+ * [d1539bc] recommend pkg-config
+ * [f08bb18] explain libvirt group (Closes: #501824)
+
+ -- Guido Günther <agx at sigxcpu.org> Sun, 12 Oct 2008 20:27:25 +0200
+
+ libvirt (0.4.6-2) experimental; urgency=low
+
+ * [2039095] tighten libvirt dependency
+ * [06dbe8a] qemu/kvm: fix domain block stats for virtio and scsi devices
+
+ -- Guido Günther <agx at sigxcpu.org> Thu, 02 Oct 2008 22:03:05 +0200
+
+ libvirt (0.4.6-1) experimental; urgency=low
+
+ * [e20d3d4] Imported Upstream version 0.4.6
+ * [0c840ab] disable numactl
+ * [ca2c5cb] cleanup doc installation (Closes: #492075)
+ * [714ab94] drop 0004-for-kvm-determine-maxVCPUs-at-runtime.patch - applied
+ upstream
+ * [e7563a8] drop 0005-fix-crash-when-no-emulator-is-defined-for-kvm-
+ qemu.patch - fixed upstream
+
+ -- Guido Guenther <agx at sigxcpu.org> Thu, 25 Sep 2008 12:31:45 +0200
+
+ libvirt (0.4.5-2) experimental; urgency=low
+
+ * [17647cd] libvirt-bin.default: add keytab default
+ * [0ef01e7] fix runtime vcpu detection (0004-for-kvm-determine-
+ maxVCPUs-at-runtime.patch) (Closes: #495950)
+ * [b91e1eb] don't crash when no emulator is defined (0005-fix-crash-
+ when-no-emulator-is-defined-for-kvm-qemu.patch)
+
+ -- Guido Guenther <agx at sigxcpu.org> Mon, 22 Sep 2008 20:11:04 +0200
+
+ libvirt (0.4.5-1) experimental; urgency=low
+
+ * [ab8b4e6] Imported Upstream version 0.4.5
+ * [4aaef27] tighten dependency on libvirt
+ * [fa253be] drop 0002-qemu-path.diff.patch - fixed upstream
+ * [87fc2db] drop 0005-check-for-the-existence-of-the-migrate-
+ command.patch applied upstream
+ * [bc311aa] drop 0006-wrong-open-failure-detection.patch applied
+ upstream
+ * [38e615d] rebase the remaining patches
+ * [9a04bb7] bump shlibs version to 0.4.5
+ * [9fadd6f] disable LXC
+ * [179c869] build-dep on libselinux1-dev for selinux support
+
+ -- Guido Guenther <agx at sigxcpu.org> Thu, 18 Sep 2008 19:02:55 +0200
+
+libvirt (0.4.4-3~bpo40+2) etch-backports; urgency=low
+
+ * [742e4ec] disable iscsi storage backend, open-iscsi has problems on the
+ autobuilders (fixed in lenny)
+
+ -- Guido Guenther <agx at sigxcpu.org> Sat, 16 Aug 2008 13:16:35 +0200
+
+libvirt (0.4.4-3~bpo40+1) etch-backports; urgency=low
+
+ * [f4faa9d] explicitly pass -std=c99 for etch
+ * [f3d3980] include bits/siginfo.h go fix compile with etch's glibc
+ * [dec796a] disable disk storage backend since it needs parted1.8
+ * [84d3f03] disable policy kit support - not in etch
+
+ -- Guido Guenther <agx at sigxcpu.org> Sat, 02 Aug 2008 15:08:26 +0200
+
libvirt (0.4.4-3) unstable; urgency=low
* upload to unstable
@@@ -156,14 -258,6 +274,14 @@@ libvirt (0.4.0-2) unstable; urgency=lo
-- Guido Guenther <agx at sigxcpu.org> Sat, 15 Dec 2007 18:59:11 +0100
+libvirt (0.4.0-1~bpo40+1) etch-backports; urgency=low
+
+ * Rebuild for Etch backports.
+ * include the full changelog since there's now version on bpo yet
+ and none in etch
+
+ -- Guido Guenther <agx at sigxcpu.org> Mon, 07 Jan 2008 15:52:48 +0100
+
libvirt (0.4.0-1) unstable; urgency=low
* new upstream version
@@@ -199,11 -293,13 +317,11 @@@ libvirt (0.3.3-5) unstable; urgency=lo
-- Guido Guenther <agx at sigxcpu.org> Thu, 13 Dec 2007 21:34:16 +0100
-libvirt (0.3.3-4.xen0) unstable; urgency=low
+libvirt (0.3.3-4~bpo40+1) etch-backports; urgency=low
- * UNRELEASED
- * build with xen support
- * debian/control: we also support xen
+ * Rebuild for Etch backports.
- -- Guido Guenther <agx at sigxcpu.org> Thu, 06 Dec 2007 15:43:03 +0100
+ -- Guido Guenther <agx at sigxcpu.org> Fri, 28 Dec 2007 17:38:28 +0100
libvirt (0.3.3-4) unstable; urgency=low
diff --combined debian/control
index b787aac,1aaf889..cfbe563
--- a/debian/control
+++ b/debian/control
@@@ -2,8 -2,8 +2,8 @@@ Source: libvir
Section: libs
Priority: optional
Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers at lists.alioth.debian.org>
- Uploaders: Guido Guenther <agx at sigxcpu.org>
- Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.38), libxml2-dev, libncurses5-dev, libreadline5-dev, zlib1g-dev, libgnutls-dev, python-dev (>= 2.3.5-11), python-central (>= 0.5.6), quilt, libavahi-client-dev, libsasl2-dev, libxen-dev [i386 amd64], lvm2, qemu [amd64 i386 powerpc sparc]
+ Uploaders: Guido Günther <agx at sigxcpu.org>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.38), libxml2-dev, libncurses5-dev, libreadline5-dev, zlib1g-dev, libgnutls-dev, python-dev (>= 2.3.5-11), python-central (>= 0.5.6), quilt, libavahi-client-dev, libsasl2-dev, libxen-dev [i386 amd64], lvm2, qemu [amd64 i386 powerpc sparc], libpolkit-dbus-dev, open-iscsi, libparted1.8-dev, libselinux1-dev
++Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.38), libxml2-dev, libncurses5-dev, libreadline5-dev, zlib1g-dev, libgnutls-dev, python-dev (>= 2.3.5-11), python-central (>= 0.5.6), quilt, libavahi-client-dev, libsasl2-dev, libxen-dev [i386 amd64], lvm2, qemu [amd64 i386 powerpc sparc], libselinux1-dev
XS-Python-Version: current
Vcs-Git: git://git.debian.org/git/pkg-libvirt/libvirt.git
Vcs-Browser: http://git.debian.org/?p=pkg-libvirt/libvirt.git
@@@ -12,10 -12,11 +12,11 @@@ Standards-Version: 3.8.
Package: libvirt-bin
Architecture: any
- Depends: ${shlibs:Depends}, adduser
+ Depends: ${shlibs:Depends}, adduser, libvirt0 (>= ${binary:Version}), logrotate
Enhances: qemu, kvm, xen
Section: admin
- Recommends: netcat-openbsd, bridge-utils, dnsmasq, iptables
+ Recommends: netcat-openbsd, bridge-utils, dnsmasq, iptables, qemu (>= 0.9.1)
+ Suggests: policykit
Description: the programs for the libvirt library
Libvirt is a C toolkit to interact with the virtualization capabilities
of recent versions of Linux (and other OSes). The library aims at providing
@@@ -27,7 -28,7 +28,7 @@@
Package: libvirt0
Architecture: any
Depends: ${shlibs:Depends}
- Recommends: lvm2, qemu
+ Recommends: lvm2
Description: library for interfacing with different virtualization systems
Libvirt is a C toolkit to interact with the virtualization capabilities
of recent versions of Linux (and other OSes). The library aims at providing
@@@ -61,6 -62,7 +62,7 @@@ Package: libvirt-de
Architecture: any
Section: libdevel
Depends: libvirt0 (= ${binary:Version}), libxen-dev [i386 amd64]
+ Recommends: pkg-config
Description: development files for the libvirt library
Libvirt is a C toolkit to interact with the virtualization capabilities
of recent versions of Linux (and other OSes). The library aims at providing
@@@ -72,7 -74,7 +74,7 @@@
Package: python-libvirt
Architecture: any
- Depends: ${shlibs:Depends}, ${python:Depends}
+ Depends: ${shlibs:Depends}, ${python:Depends}, libvirt0 (>= ${binary:Version})
Provides: ${python:Provides}
Section: python
XB-Python-Version: ${python:Versions}
diff --combined debian/patches/series
index ba4a2ad,3c173f3..f10e54d
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,11 +1,12 @@@
0001-remove-RHism.diff.patch
- 0002-qemu-path.diff.patch
- 0003-qemu-disable-network.diff.patch
- 0004-allow-libvirt-group-to-access-the-socket.patch
+ 0002-qemu-disable-network.diff.patch
+ 0003-allow-libvirt-group-to-access-the-socket.patch
+ 0004-support-virtio-and-scsi-disks-in-qemudDomainBlockSta.patch
+ 0005-fix-define-vs.-defined-typos.patch
+ 0006-xen-prefer-xenstoraged-driver-for-listDomains.patch
+ 0007-also-look-for-usr-bin-kvm.patch
+ 0008-Increase-initial-qemu-monitor-read-timeout.patch
+ 0009-Open-qemu-monitor-log-O_APPEND-instead-of-O_TRUNC.patch
+ 0010-raise-error-on-invalid-volume-format.patch
+ 0011-Fix-missing-read-only-access-checks-CVE-2008-5086.patch
+0005-include-bits-siginfo.h-for-siginfo_t.patch
diff --combined debian/rules
index aac1163,5c6752c..0e919d8
--- a/debian/rules
+++ b/debian/rules
@@@ -14,35 -14,31 +14,33 @@@ include /usr/share/cdbs/1/class/autotoo
include /usr/share/cdbs/1/class/python-distutils.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+CFLAGS+=-std=c99
+
DEB_CONFIGURE_EXTRA_FLAGS := \
--disable-rpath \
--with-qemu \
--without-openvz \
+ --without-lxc \
--with-avahi \
--with-sasl \
- --with-polkit \
- --with-storage-fs \
+ --without-polkit \
+ --without-storage-fs \
--with-storage-lvm \
- --with-storage-iscsi \
+ --without-storage-iscsi \
--with-storage-disk \
--with-init-scripts=none \
+ --without-numactl \
--enable-debug \
$(BUILD_XEN)
DEB_DBG_PACKAGES = libvirt0-dbg
DEB_DBG_PACKAGE_libvirt0 = libvirt0-dbg
DEB_PYTHON_SETUP_CMD := /dev/null
- DEB_DH_MAKESHLIBS_ARGS_libvirt0 += -V 'libvirt0 (>= 0.4.1)'
+ DEB_DH_MAKESHLIBS_ARGS_libvirt0 += -V 'libvirt0 (>= 0.4.6)'
DEB_DH_INSTALLINIT_ARGS := --no-restart-on-upgrade
+ DEB_DH_INSTALLLOGROTATE_ARGS := --name=libvirtd
EXAMPLES=debian/libvirt-doc/usr/share/doc/libvirt-doc/examples/
binary-install/libvirt-doc::
cd $(EXAMPLES) && rm -rf .libs *.o info1 suspend ../html/CVS
-
- redo-patches::
- rm -f debian/patches/*
- git format-patch -N -o debian/patches master...patch-queue | \
- sed -e 's%debian/patches/%%' > debian/patches/series
--
Libvirt debian packaging
More information about the Pkg-libvirt-commits
mailing list