--- libvirt-0.7.5.orig/debian/copyright +++ libvirt-0.7.5/debian/copyright @@ -0,0 +1,44 @@ +libvirt was initially debianized by Andrew Mitchell + +It was downloaded from http://libvirt.org/sources/ + +Upstream Author: + + Daniel Veillard or + +Copyright: + + 2005,2006 Red Hat, Inc + +Licenses: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + + src/hash.c: + + Copyright (C) 2000 Bjorn Reese and Daniel Veillard. + + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF + MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND + CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER. + + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. --- libvirt-0.7.5.orig/debian/libvirt-doc.links +++ libvirt-0.7.5/debian/libvirt-doc.links @@ -0,0 +1 @@ +usr/share/doc/libvirt-doc/devhelp/ /usr/share/gtk-doc/html/libvirt --- libvirt-0.7.5.orig/debian/libvirt-bin.manpages +++ libvirt-0.7.5/debian/libvirt-bin.manpages @@ -0,0 +1 @@ +tools/virsh.1 --- libvirt-0.7.5.orig/debian/libvirt-bin.init +++ libvirt-0.7.5/debian/libvirt-bin.init @@ -0,0 +1,170 @@ +#! /bin/sh +# +# Init script for libvirtd +# +# (c) 2007 Guido Guenther +# based on the skeletons that comes with dh_make +# +### BEGIN INIT INFO +# Provides: libvirt-bin libvirtd +# Required-Start: $network $local_fs +# Required-Stop: +# Should-Start: hal avahi +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: libvirt management daemon +### END INIT INFO + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/libvirtd +NAME=libvirtd +DESC="libvirt management daemon" + +test -x $DAEMON || exit 0 +. /lib/lsb/init-functions + +PIDFILE=/var/run/$NAME.pid +DODTIME=1 # Time to wait for the server to die, in seconds + +# Include libvirtd defaults if available +if [ -f /etc/default/libvirt-bin ] ; then + . /etc/default/libvirt-bin +fi + +check_start_libvirtd_option() { + if [ ! "$start_libvirtd" = "yes" ]; then + log_warning_msg "Not starting libvirt management daemon libvirtd, disabled via /etc/default/libvirt-bin" + return 1 + else + return 0 + fi +} + +running_pid() +{ + # Check if a given process pid's cmdline matches a given name + pid=$1 + name=$2 + [ -z "$pid" ] && return 1 + [ ! -d /proc/$pid ] && return 1 + cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1` + # Is this the expected child? + [ "$cmd" != "$name" ] && return 1 + return 0 +} + +running() +{ +# Check if the process is running looking at /proc +# (works for all users) + # No pidfile, probably no daemon present + [ ! -f "$PIDFILE" ] && return 1 + # Obtain the pid and check it against the binary name + pid=`cat $PIDFILE` + running_pid $pid $DAEMON || return 1 + return 0 +} + +force_stop() { +# Forcefully kill the process + [ ! -f "$PIDFILE" ] && return + if running ; then + kill -15 $pid + # Is it really dead? + [ -n "$DODTIME" ] && sleep "$DODTIME"s + if running ; then + kill -9 $pid + [ -n "$DODTIME" ] && sleep "$DODTIME"s + if running ; then + echo "Cannot kill $LABEL (pid=$pid)!" + exit 1 + fi + fi + fi + rm -f $PIDFILE + return 0 +} + +mkdir -p /var/run/libvirt +case "$1" in + start) + if check_start_libvirtd_option; then + log_daemon_msg "Starting $DESC" "$NAME" + if running ; then + log_progress_msg "already running" + log_end_msg 0 + exit 0 + fi + rm -f /var/run/libvirtd.pid + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --exec $DAEMON -- $libvirtd_opts + if running; then + log_end_msg 0 + else + log_end_msg 1 + fi + fi + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + if ! running ; then + log_progress_msg "not running" + log_end_msg 0 + exit 0 + fi + start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + --exec $DAEMON + log_end_msg 0 + ;; + force-stop) + log_daemon_msg "Forcefully stopping $DESC" "$NAME" + force_stop + if ! running; then + log_end_msg 0 + else + log_end_msg 1 + fi + ;; + restart) + if check_start_libvirtd_option; then + log_daemon_msg "Restarting $DESC" "$DAEMON" + start-stop-daemon --oknodo --stop --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON + [ -n "$DODTIME" ] && sleep $DODTIME + start-stop-daemon --start --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON -- $libvirtd_opts + if running; then + log_end_msg 0 + else + log_end_msg 1 + fi + fi + ;; + reload|force-reload) + if running; then + log_daemon_msg "Reloading configuration of $DESC" "$NAME" + start-stop-daemon --stop --signal 1 --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON + log_end_msg 0 + else + log_warning_msg "libvirtd not running, doing nothing." + fi + ;; + status) + log_daemon_msg "Checking status of $DESC" "$NAME" + if running ; then + log_progress_msg "running" + log_end_msg 0 + else + log_progress_msg "not running" + log_end_msg 1 + fi + ;; + *) + N=/etc/init.d/libvirt-bin + echo "Usage: $N {start|stop|restart|reload|force-reload|status|force-stop}" >&2 + exit 1 + ;; +esac + +exit 0 --- libvirt-0.7.5.orig/debian/libvirt-bin.default +++ libvirt-0.7.5/debian/libvirt-bin.default @@ -0,0 +1,11 @@ +# Defaults for libvirt-bin initscript (/etc/init.d/libvirt-bin) +# This is a POSIX shell fragment + +# Start libvirtd to handle qemu/kvm: +start_libvirtd="yes" + +# options passed to libvirtd, add "-l" to listen on tcp +libvirtd_opts="-d" + +# pass in location of kerberos keytab +#export KRB5_KTNAME=/etc/libvirt/libvirt.keytab --- libvirt-0.7.5.orig/debian/libvirt0.symbols +++ libvirt-0.7.5/debian/libvirt0.symbols @@ -0,0 +1,31 @@ +libvirt.so.0 libvirt0 #MINVER# + *@LIBVIRT_0.0.3 0.0.3 + *@LIBVIRT_0.0.5 0.0.5 + *@LIBVIRT_0.1.0 0.1.0 + *@LIBVIRT_0.1.1 0.1.1 + *@LIBVIRT_0.1.4 0.1.4 + *@LIBVIRT_0.1.5 0.1.5 + *@LIBVIRT_0.1.9 0.1.9 + *@LIBVIRT_0.2.0 0.2.0 + *@LIBVIRT_0.2.1 0.2.1 + *@LIBVIRT_0.2.3 0.2.3 + *@LIBVIRT_0.3.0 0.3.0 + *@LIBVIRT_0.3.2 0.3.2 + *@LIBVIRT_0.3.3 0.3.3 + *@LIBVIRT_0.4.0 0.4.0 + *@LIBVIRT_0.4.1 0.4.1 + *@LIBVIRT_0.4.2 0.4.2 + *@LIBVIRT_0.4.5 0.4.5 + *@LIBVIRT_0.5.0 0.5.0 + *@LIBVIRT_0.6.0 0.6.0 + *@LIBVIRT_0.6.1 0.6.1 + *@LIBVIRT_0.6.3 0.6.3 + *@LIBVIRT_0.6.4 0.6.4 + *@LIBVIRT_0.6.5 0.6.5 + *@LIBVIRT_0.7.0 0.7.0 + *@LIBVIRT_0.7.1 0.7.1 + *@LIBVIRT_0.7.2 0.7.2 + *@LIBVIRT_0.7.3 0.7.3 + *@LIBVIRT_0.7.4 0.7.4 + *@LIBVIRT_0.7.5 0.7.5 + *@LIBVIRT_PRIVATE_0.7.5 0.7.5 --- libvirt-0.7.5.orig/debian/libvirt-bin.libvirtd.logrotate +++ libvirt-0.7.5/debian/libvirt-bin.libvirtd.logrotate @@ -0,0 +1,9 @@ +/var/log/libvirt/qemu/*.log { + daily + missingok + rotate 7 + compress + delaycompress + notifempty + copytruncate +} --- libvirt-0.7.5.orig/debian/control +++ libvirt-0.7.5/debian/control @@ -0,0 +1,100 @@ +Source: libvirt +Section: libs +Priority: optional +Maintainer: Debian Libvirt Maintainers +Uploaders: Guido Günther , Laurent Léonard +Build-Depends: cdbs (>= 0.4.43), debhelper (>= 7), libxml2-dev, libncurses5-dev, libreadline-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], open-iscsi, libparted1.8-dev, libdevmapper-dev, uuid-dev, + libudev-dev, + libpciaccess-dev, + module-init-tools, + policykit-1, + dpkg-dev (<< 1.15.3) | dpkg-dev (>> 1.15.3), + libcap-ng-dev +XS-Python-Version: current +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.8.3 +DM-Upload-Allowed: yes + +Package: libvirt-bin +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libvirt0 (= ${binary:Version}), logrotate, + hal +Enhances: qemu, kvm, xen +Section: admin +Recommends: netcat-openbsd, bridge-utils, dnsmasq-base (>= 2.46-1), iptables, qemu (>= 0.9.1) +Suggests: policykit-1 +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 + a long term stable C API for different virtualization mechanisms. It currently + supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox. + . + This package contains the supporting binaries to use with libvirt + +Package: libvirt0 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +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 + a long term stable C API for different virtualization mechanisms. It currently + supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox. + +Package: libvirt0-dbg +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libvirt0 (= ${binary:Version}) +Priority: extra +Section: debug +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 + a long term stable C API for different virtualization mechanisms. It currently + supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox. + . + This package contains the debugging symbols. + +Package: libvirt-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Suggests: devhelp +Description: documentation 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 + a long term stable C API for different virtualization mechanisms. It currently + supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox. + . + This package contains the documentation. + +Package: libvirt-dev +Architecture: any +Section: libdevel +Depends: ${misc: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 + a long term stable C API for different virtualization mechanisms. It currently + supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox. + . + This package contains the header files and static libraries which are + needed for developing the applications with libvirt. + +Package: python-libvirt +Architecture: any +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 + a long term stable C API for different virtualization mechanisms. It currently + supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox. + . + This package contains Python bindings for the libvirt library + --- libvirt-0.7.5.orig/debian/libvirt-doc.doc-base.libvirt-doc +++ libvirt-0.7.5/debian/libvirt-doc.doc-base.libvirt-doc @@ -0,0 +1,8 @@ +Document: libvirt-doc +Title: Libvirt the virtualization API +Abstract: Local copy of the web site of libvirt +Section: System/Administration + +Format: HTML +Index: /usr/share/doc/libvirt-doc/intro.html +Files: /usr/share/doc/libvirt-doc/*.html --- libvirt-0.7.5.orig/debian/changelog +++ libvirt-0.7.5/debian/changelog @@ -0,0 +1,768 @@ +libvirt (0.7.5-4) unstable; urgency=low + + * [18520c0] Same description of supported virt techs in all binary packages + (Closes: #564909) - thanks to Loïc Minier + * [49c357c] Implement path lookup for USB by vendor:product (Closes: + #563502) - thanks to Cole Robinson + + -- Guido Günther Wed, 13 Jan 2010 23:57:26 +0100 + +libvirt (0.7.5-3) unstable; urgency=low + + * [4d41fd7] Also look for dmi information in /sys/class older kernels such + as 2.6.26 have it there. (Closes: #564020) + * [1c0e0b5] Explicitly disable ESX support + * [c3c84f6] Terminate nc on EOF (Closes: #564053) - thanks to Gabor Gombas + for the patch + + -- Guido Günther Fri, 08 Jan 2010 11:07:34 +0100 + +libvirt (0.7.5-2) unstable; urgency=low + + * Upload to unstable + * [d6c5ca5] Add debugging symbols for all packages + + -- Guido Günther Sun, 03 Jan 2010 20:01:12 +0100 + +libvirt (0.7.5-1) experimental; urgency=low + + [ Laurent Léonard ] + * [96f8d94] Imported Upstream version 0.7.5 + * [f8089a1] Redo patches. + * [294ce3d] Update libvirt0 symbols. + * [1c97be7] Allow DM upload and add myself as uploader. + * [5635a32] Clean debian/watch. + + [ Guido Günther ] + * [45f98ae] Drop 0005-udev_device_get_devpath-might-return-NULL.patch + applied upstream. + + -- Guido Günther Sat, 26 Dec 2009 17:45:47 +0100 + +libvirt (0.7.4-2) experimental; urgency=low + + * [65d3755] Disable SELinux to work around #559356 + * [19bd427] Run qemu instances as qemu-libvirt instead of root by default + (Closes: #558197) + * [0a6c03b] Use kvm as primary group for libvirt-qemu user + * [e5ae24b] Fix udev backend startup + * [f610a8e] Use udev instead of hal backend + + -- Guido Günther Mon, 07 Dec 2009 21:20:20 +0100 + +libvirt (0.7.4-1) unstable; urgency=low + + [ Laurent Léonard ] + * [8f2761b] Imported Upstream version 0.7.4 + * [20b6b3d] Drop patches. + * 0005-Fix-SELinux-linking-issues.patch - fixed upstream. + * 0006-Don-t-let-parent-of-daemon-exit-until-basic-initiali.patch - + fixed upstream. + * 0007-Only-remove-masquerade-roles-for-VIR_NETWORK_FORWARD.patch - + applied upstream. + * 0008-Fix-qemu-session.patch - fixed upstream. + * [e41f8c6] Update libvirt0 symbols. + * [f184e28] Revert "switch to new source format 3.0 (quilt)" This reverts + commit 213ca47bbbefe2dc95be58a09db34669e3be5797. + * [65084d2] Enhance handling of examples. + + -- Guido Günther Tue, 01 Dec 2009 18:51:18 +0100 + +libvirt (0.7.2-4) unstable; urgency=low + + * [213ca47] switch to new source format 3.0 (quilt) + * [f5a10e9] Depend on hal (Closes: #556730) + * [7d1422d] Drop build-dep on libpolkit-dbus-dev (Closes: #549500) + * [95ad85c] Depend on libcap-ng-dev for lxc driver. + + -- Guido Günther Wed, 25 Nov 2009 20:39:17 +0100 + +libvirt (0.7.2-3) unstable; urgency=low + + * [2c0aa82] Fix qemu:///session Backported from upsgtream's + 79218cdd9887b132eb0f29fe2048f89e90beae1 (Closes: #554869) + + -- Guido Günther Sat, 07 Nov 2009 12:50:54 +0100 + +libvirt (0.7.2-2) unstable; urgency=low + + [ Laurent Léonard ] + * [a9ea205] Change requirement of libvirt-bin in libvirt- suspendonreboot. + * [a4db804] Update debian/patches/0006-Don-t-let-parent-of-daemon- + exit-until-basic-initiali.patch. Fix use of an uninitialized variable that + was causing a bug on i386 systems. + * [59e1e53] Redo patches. + + [ Guido Günther ] + * upload to unstable + * [43f106a] Only remove masquerade roles for VIR_NETWORK_FORWARD_NAT + (Closes: #549949) - thanks to Rob S. Wolfram for testing + + -- Guido Günther Thu, 05 Nov 2009 20:44:21 +0100 + +libvirt (0.7.2-1) experimental; urgency=low + + [ Laurent Léonard ] + * [51a4814] Imported Upstream version 0.7.2 + * [12268f6] Update patches. + * [175d497] Fix SELinux linking issues. Pulled from upstream + 309acaa0230494b8ec08d03375c10238cb2daf55. + * [5cfdaf8] Update libvirt-doc docs. + * [dc2059f] Update libvirt-bin manpages. + * [a62a4a7] Update libvirt-bin examples. + * [9e38cbc] Update libvirt0 symbols. + * [412b12f] Make init.d script provide itself. + * [35451bf] Update debian/rules to support new example files. + * [43b7dac] Don't let parent of daemon exit until basic initialization is + done. + * [5a37e69] Make init.d provide libvirtd for backward compatibility. + + -- Guido Günther Mon, 26 Oct 2009 20:14:23 +0100 + +libvirt (0.7.1-2) unstable; urgency=low + + * [f5299d3] document changes and release 0.7.1-1 + * [f137c00] Allow for older versions of dpkg-dev to ease backports. + * [74f5832] Use Policykit 1.0 (Closes: #549500) + + -- Guido Günther Fri, 09 Oct 2009 20:32:02 +0200 + +libvirt (0.7.1-1) unstable; urgency=low + + [ Laurent Léonard ] + * [40fb620] Bump Debhelper version to 7. + * [e0e89f2] Bump Standards-Version to 3.8.3. + * [50a862f] Clean debian/rules. + * [e9c9906] Change build dependency on libreadline5-dev to + libreadline-dev. + * [b6cb738] Imported Upstream version 0.7.1 + * [780f6a7] Redo patches. + * [3d66f37] Update libvirt-bin examples. + * [c01ed84] Update libvirt0 symbols. + + -- Guido Günther Sat, 26 Sep 2009 17:15:02 +0200 + +libvirt (0.7.0-1) experimental; urgency=low + + [ Laurent Léonard ] + * [4fb1a38] Imported Upstream version 0.7.0 + * [5578fd3] Drop 0005-Fix-PCI-device-hotplug-unplug-with-newer- + QEMU.patch. Fixed upstream. + * [9a8afd0] Redo patches. + * [937ab63] Update symbols. + * [b4bd1ea] Update section in doc-base control file. + + -- Guido Günther Sun, 09 Aug 2009 13:35:42 +0200 + +libvirt (0.6.5-3) unstable; urgency=low + + * [72a8eb6] Add a versioned dependency on dpkg-dev (Closes: #537316) + * [ae20998] fix Debian Xen path patch to also cover the testsuite + * [b2a1c47] New patch 0001-Fix-PCI-device-hotplug-unplug-with-newer- + QEMU.patch pulled from upstream 326ecb7. Fixes PCI hotplug with + newer kvm. + + -- Guido Günther Wed, 29 Jul 2009 12:17:52 +0200 + +libvirt (0.6.5-2) unstable; urgency=low + + * [45b9fdf] build-conflict on dpkg-dev (= 1.15.3) (Closes: #536673) + + -- Guido Günther Sun, 12 Jul 2009 15:03:08 +0200 + +libvirt (0.6.5-1) unstable; urgency=low + + [ Guido Günther ] + * [05e9a39] build-depend on policykit so polkit auth works with virsh + as well + + [ C.J. Adams-Collier ] + * [a161c5f] allow to qemu to emulate arm + + [ Guido Günther ] + * [b1e4c4b] Imported Upstream version 0.6.5 + * [e764583] change private symbols to 0.6.5 + * [f94fb48] drop 0005-allow-to-qemu-to-emulate-arm.patch fixed upstream. + * [7ad7896] bump standards version + * [e2c5867] tighten libvirt-bin's dependency on libvirt0 since libvirtd uses + private symbols + + -- Guido Günther Sun, 05 Jul 2009 13:07:53 +0200 + +libvirt (0.6.4-1) unstable; urgency=low + + * [dd3adb2] Imported Upstream version 0.6.4 + * [2320162] update symbols file + * [89c9720] remove bashism (Closes: #530122) + * [30d86c1] drop patches fixed upstream: + 0005-don-t-crash-with-def-NULL.patch + 0006-Fix-QEMU-ARGV-detection-with-kvm-85.patch + 0007-Declare-support-for-QEMU-migration-in-capabilities.patch + + -- Guido Günther Thu, 04 Jun 2009 12:50:01 +0200 + +libvirt (0.6.3-4) unstable; urgency=low + + * [3607f2f] Install libvirt_lxc that got list somewhere between our + testbuilds. (Closes: #529578) + * [070ddd5] install augeas lense + * [c9b034d] install schema files + + -- Guido Günther Wed, 20 May 2009 14:33:18 +0200 + +libvirt (0.6.3-3) unstable; urgency=low + + * [4087b7d] disable lxc on ia64 to work around FTBFS until we have + access to a test machine + * [df5f5a0] pull some kvm/qemu related patches from upstream + (Closes: #529324) + + -- Guido Günther Tue, 19 May 2009 19:14:57 +0200 + +libvirt (0.6.3-2) unstable; urgency=low + + * [35898d3] fix crash when libvirt_lxc is called without arguments + * [449ca60] enable lxc support (Closes: #526718) - thanks to Daniel + Pittman for testing this + * [335a4e6] update description with supported virtualization solutions + * [92eba47] delay libvirt-bin start until after avahi + * [8ebd17d] update startup priorities due to changed libvirt-bin + startup priority. Also add an LSB header. (Closes: #526944) + + -- Guido Günther Thu, 07 May 2009 13:28:40 +0200 + +libvirt (0.6.3-1) unstable; urgency=low + + * [0cb2f83] Imported Upstream version 0.6.3 + * virtual box support + * [06fe518] 0001-remove-RHism.diff.patch: use invoke-rc.d + * [ec2fd52] drop patches merged upstream: + * 0003-allow-libvirt-group-to-access-the-socket.patch series + * 0004-fix-Debian-specific-path-to-hvm-loader.patch + * [6977bde] enable vbox support + * [93c4423] add symbols file + + -- Guido Günther Sun, 03 May 2009 23:33:28 +0200 + +libvirt (0.6.2-2) unstable; urgency=low + + * [031b9c1] Don't hardcode buffer size for getgrnam_r. Works around + #520744 and fixes possible problems with implementations having + _SC_GETGR_R_SIZE_MAX != 1024. + * [bbe7743] respect log priority for qemu domain logs (Closes: #524145) + * [a2e4cb0] don't rely on log_end_msg returning 0 this isn't the case + with splashy. (Closes: #523712) + * [ddfafda] move debug package into section debug + + -- Guido Günther Thu, 16 Apr 2009 15:28:31 +0200 + +libvirt (0.6.2-1) unstable; urgency=low + + * [99fd06c] Imported Upstream version 0.6.2 (Closes: #521785) + * [78cd5c8] drop /var/run/libvirt created by init script + * [2a7cb3b] move startup of libvirtd after hal (Closes: #522310) + * [b8707ed] bump standards version 0.8.1 (no changes necessary) + + -- Guido Günther Thu, 09 Apr 2009 22:48:57 +0200 + +libvirt (0.6.1-1) unstable; urgency=low + + * [3be7341] Imported Upstream version 0.6.1 + * [38fde15] rediff Debian specific patches + * [9b59a19] drop patches applied upstream: + * 0004-Don-t-hardcode-ssh-port.patch + * 0005-minimal-workaround-for-qemu-startup-race.patch + * [95d4b7f] drop patches backported from upstream + * 0009-libvirt_proxy-Fix-use-of-uninitalized-memory.patch + * [8171d83] build-dep on module-init-tools so configure can figure out + the path to modprobe + + -- Guido Günther Thu, 05 Mar 2009 13:58:41 +0100 + +libvirt (0.6.0-1) experimental; urgency=low + + * [30be86d] Imported Upstream version 0.6.0 + * [179781c] drop patches + * fixed upstream: + 0006-Fix-missing-read-only-access-checks-CVE-2008-5086.patch + * applied upstream: + 0004-Open-qemu-monitor-log-O_APPEND-instead-of-O_TRUNC.patch + 0005-qemu-fix-parallel-serial-mode-tcp-and-unix.patch + 0007-don-t-fail-on-missing-locales.patch + * [d80a176] adjust remaining patches to new upstream version + * [208c924] add minimal workaround for qemu startup race + * [6e8caa0] restart libvirt daemon on upgrades if possible + (Closes: #492694, #499008) + + -- Guido Günther Thu, 05 Feb 2009 18:40:10 +0100 + +libvirt (0.5.1-7) unstable; urgency=low + + * [1238706] Recommend dnsmasq-base instead of dnsmasq this keeps us + out of all the dnsmasq already running troubles. (Closes: #516443) - + thanks to Bin Zhang for the suggestion and the doc update + * [5c9dfd7] don't rotate empty logfiles (Closes: #517040) + * [1c9a023] libvirt_proxy: Fix use of uninitalized memory We currently + don't build this code (CVE-2009-0036). + * [4ea1ea9] fix path to hvmloader (Closes: #517059) + * [879b632] suggest devhelp + * [f22f1ef] add ${misc:Depends} + * [c6f579e] README.Debian: fix typo + + -- Guido Günther Thu, 26 Feb 2009 14:45:32 +0100 + +libvirt (0.5.1-6) unstable; urgency=low + + * upload to unstable + + -- Guido Günther Mon, 16 Feb 2009 21:27:21 +0100 + +libvirt (0.5.1-5) experimental; urgency=low + + * [d4a69d1] don't fail on missing locales (Closes: #512721) + * [cecac4c] don't hardcode ssh port - based on a patch by Adrian + Bridgett. (Closes: #513605) + * [4565a65] drop superflous headers and footers from remaining patches + + -- Guido Günther Fri, 30 Jan 2009 23:06:29 +0100 + +libvirt (0.5.1-4) experimental; urgency=low + + * [2fd5224] apply upstream patch for CVE-2008-5086 (Closes: #509106) + + -- Guido Günther Thu, 18 Dec 2008 16:12:00 +0100 + +libvirt (0.5.1-3) experimental; urgency=low + + * [d30438c] create libvirt log directory (Closes: #508129) + * [417a23c] qemu: fix parallel/serial mode "tcp" and "unix" + (Closes: #507608) + + -- Guido Günther Thu, 11 Dec 2008 12:38:01 +0100 + +libvirt (0.5.1-2) experimental; urgency=low + + * [4cd547b] create /var/run/libvirt (Closes: #507578) + * [fe96870] merge back master + * [d46313f] drop patches for issues fixed upstream + - 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 + + -- Guido Günther Sat, 06 Dec 2008 10:37:12 +0100 + +libvirt (0.5.1-1) experimental; urgency=low + + * [d76b3a1] Imported Upstream version 0.5.1 (Closes: #507677, #507547) + * [2e550ae] enable hal for device enumeration + * [0d9116a] rotate qemu monitor logs (Closes: #507553) - thanks to + Harald Staub + * [5f85e66] depend on logrotate + * [6e955a3] open qemu monitor O_APPEND instead of O_TRUNC for logrotate + * [7dbea84] drop 0004-xen-prefer-xenstoraged-driver-for- + listDomains.patch - applied upstream + + -- Guido Günther Fri, 05 Dec 2008 09:36:54 +0100 + +libvirt (0.5.0-1) experimental; urgency=low + + * [717ef21] Imported Upstream version 0.5.0 + * [b7a1fbd] enable OpenVZ support (Closes: #504597) - thanks to Pierre + Chifflier for the patch + * [ee3590a] drop patches, fixed upstream: + * 0004-support-virtio-and-scsi-disks-in-qemudDomainBlockSta.patch + * 0005-fix-define-vs.-defined-typos.patch + * [f4f601f] bump shlibs to 0.5.0 + + -- Guido Günther Fri, 28 Nov 2008 16:40:38 +0100 + +libvirt (0.4.6-10) unstable; urgency=low + + * [5878698] cherry-pick patch for CVE-2008-5086 from experimental + + -- Guido Günther 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 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 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 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 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 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 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 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 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 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 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 Thu, 18 Sep 2008 19:02:55 +0200 + +libvirt (0.4.4-3) unstable; urgency=low + + * upload to unstable + * [96c6727] add /var/cache/libvirt needed by qemuDriver for temporary + storage + * [794f95c] bump standards version to 3.8.0 + * [05184af] add README.source + + -- Guido Guenther Wed, 23 Jul 2008 11:30:31 -0400 + +libvirt (0.4.4-2) experimental; urgency=low + + * [facb983] README.Debian explain "default" network startup + * [395a510] add /var/lib/libvirt needed for the dnsmasq lease file + * [9c588ac] promote bridge-utils & dnsmasq to Recommends: since + they're needed for the default NAT network + * [9ed2cd4] recommend iptables - needed for the default NAT network + + -- Guido Guenther Wed, 23 Jul 2008 00:23:58 -0400 + +libvirt (0.4.4-1) experimental; urgency=low + + * [0ff1e68] new upstream version + * [2098f96] rebase patches for 0.4.4 + * [abbd15e] enable with-storage-disk now that we have parted1.8 + * [3942b25] start libvirtd by default + + -- Guido Guenther Fri, 27 Jun 2008 10:06:00 +0200 + +libvirt (0.4.2-6) unstable; urgency=low + + * reenable open-iscsi support - thanks to to the open-iscsi + maintainers for fixing this up + * build a libvirt0-dbg package + * register documentation with doc-base (Closes: #480294) - thanks to + Tzafrir Cohen for the patch + * control: fix typo + * README.Debian: explain debugging + + -- Guido Guenther Thu, 15 May 2008 18:04:20 +0200 + +libvirt (0.4.2-5) unstable; urgency=low + + * no need to depend on python-all-dev we only build an extension for + the current python version + + -- Guido Guenther Tue, 22 Apr 2008 11:26:13 +0200 + +libvirt (0.4.2-4) unstable; urgency=low + + * only build-dep on qemu on architectures that have it + (Closes: #476290) + * the packages containing the daemon should suggest polkit + + -- Guido Guenther Fri, 18 Apr 2008 10:41:38 +0200 + +libvirt (0.4.2-3) unstable; urgency=low + + * drop the {build-,}dependency on open-iscsi too + * suggest policykit + + -- Guido Guenther Mon, 14 Apr 2008 15:27:20 +0200 + +libvirt (0.4.2-2) unstable; urgency=low + + * disable the iscsi storage backend until #423368 is fixed in unstable + * disable polkit authentication by default so the libvirt stays accessible + for members of the libvirt group + + -- Guido Guenther Mon, 14 Apr 2008 14:20:23 +0200 + +libvirt (0.4.2-1) unstable; urgency=low + + * drop no-mac.diff - applied upstream + * no need to explicitly link against libpthread + * always enable debugging + * add Homepage URL + * add Vcs-{Git,Browser} fields + * symlink devhelp docs + * enable policy kit + + -- Guido Guenther Fri, 11 Apr 2008 17:54:06 +0200 + +libvirt (0.4.1-1) experimental; urgency=low + + * new upstream version + * Xen 3.2 fixes + * storage pool support + * partition based storage pools are disabled, since this needs parted 1.8 + which is only in experimental + * update patches for new upstream release + * boot-dev-error.diff - applied upstream + * qemu-parse-error.diff - applied upstream + * qemu-path.diff - adjust to new hypervisor detection code + * rediff the rest + * new patches: + * no-mac.diff: don't set mac address on tun device since it breaks kvm + * bump shlibs version + + -- Guido Guenther Fri, 07 Mar 2008 10:17:21 +0100 + +libvirt (0.4.0-6) unstable; urgency=low + + * depend on libxen-dev (Closes:#467598) + * allow members of the libvirt group to manage virtual machines + + -- Guido Guenther Sun, 02 Mar 2008 16:11:49 +0100 + +libvirt (0.4.0-5) unstable; urgency=low + + * thanks to the xen maintainers Debian now has a working libxen-dev, so + enable xen support in the default build (Closes: #453826) + * recommend netcat-openbsd for unix domain socket support (Closes: #453627) + * README.Debian: document necessary xend options + * fix spelling of Python + + -- Guido Guenther Wed, 20 Feb 2008 11:14:22 +0100 + +libvirt (0.4.0-4) unstable; urgency=low + + * don't segfault on broken boot device configuration (Closes: #463686) + * don't segfault due to missing errorhandling in the XML parsing code + + -- Guido Guenther Tue, 05 Feb 2008 13:12:54 +0100 + +libvirt (0.4.0-3) unstable; urgency=low + + * add and remove the libvirt group for the socket + * be a bit more verbose on libvirtd reload + * depend on adduser since we add the libvirt user + * don't restart libvirtd on upgrades since it kills running qemus + * enable debugging via DEB_BUILD_OPTS + + -- Guido Guenther Sun, 03 Feb 2008 14:21:46 +0100 + +libvirt (0.4.0-2) unstable; urgency=low + + * libvirt-bin.init: fix the reload target + * add configuration examples + + -- Guido Guenther Sat, 15 Dec 2007 18:59:11 +0100 + +libvirt (0.4.0-1) unstable; urgency=low + + * new upstream version + * enable sasl support + * leave policykit support disabled since it's not in unstable yet + * bump shlibs version + * remove CVS metadata + * rediff patches + * libvirtd-bin.init: libvirtd supports reload + + -- Guido Guenther Fri, 21 Dec 2007 16:49:13 +0100 + +libvirt (0.3.3-6) unstable; urgency=low + + * don't include precompiled examples in the doc package (Closes: #456825) + * remove RHism from manpage (Closes: #455859) + * bump standards version + + -- Guido Guenther Wed, 19 Dec 2007 13:45:58 +0100 + +libvirt (0.3.3-5.xen0) unstable; urgency=low + + * rebuild with xen support + + -- Guido Guenther Tue, 08 Jan 2008 11:00:24 +0100 + +libvirt (0.3.3-5) unstable; urgency=low + + * make libs match overrides + * move to team maintenance + * suggest dnsmasq and bridge-utils for qemu networking + * remove stale PID files + + -- Guido Guenther Thu, 13 Dec 2007 21:34:16 +0100 + +libvirt (0.3.3-4.xen0) unstable; urgency=low + + * UNRELEASED + * build with xen support + * debian/control: we also support xen + + -- Guido Guenther Thu, 06 Dec 2007 15:43:03 +0100 + +libvirt (0.3.3-4) unstable; urgency=low + + * put packages into the proper sections + * fix messed up Standards-Version (Closes: #453900) + + -- Guido Guenther Sun, 02 Dec 2007 14:50:11 +0100 + +libvirt (0.3.3-3.xen0) unstable; urgency=low + + * build with xen support - depend on our hacked up xen-utils for that + + -- Guido Guenther Sat, 01 Dec 2007 16:27:32 +0000 + +libvirt (0.3.3-3) unstable; urgency=low + + * add initscript to start libvirtd + + -- Guido Guenther Wed, 28 Nov 2007 10:30:29 +0100 + +libvirt (0.3.3-2) unstable; urgency=low + + * debian/copyright: + * update FSF address + * update upstream author and copyright information + * install the virsh manpage + * use binary:Version instead of Source-Version + + -- Guido Guenther Fri, 23 Nov 2007 22:31:26 +0100 + +libvirt (0.3.3-1) unstable; urgency=low + + * repackage for Debian (Closes: #384300) + * enable avahi + * build with qemu/kvm support + * disable xen support until #402249 is fixed + * disable qemu autonetwork for now, causes libvirtd to seqfault + * fix path to kvm + * switch off DH_VERBOSE + * thanks to the Ubuntu maintainers for their work! + + -- Guido Guenther Fri, 23 Nov 2007 01:58:56 +0100 + +libvirt (0.3.3-0ubuntu1) hardy; urgency=low + + * New upstream release. + * Update maintainer. + + -- Soren Hansen Wed, 14 Nov 2007 23:09:33 +0100 + +libvirt (0.3.0-0ubuntu2) gutsy; urgency=low + + * Add lingnutls-dev Build-Dep. + + -- Fabio M. Di Nitto Mon, 16 Jul 2007 12:10:41 +0200 + +libvirt (0.3.0-0ubuntu1) gutsy; urgency=low + + * Import new upstram release that can actually build on xen-3.1. + + -- Fabio M. Di Nitto Mon, 16 Jul 2007 10:23:04 +0200 + +libvirt (0.2.2-0ubuntu1) gutsy; urgency=low + + * Depends on libxen3.1-dev. + + -- Chuck Short Fri, 13 Jul 2007 11:04:00 -0400 + +libvirt (0.2.2-0ubuntu0) gutsy; urgency=low + + * New upstream version. + * Updated libvirt-bin.install, thanks to Marcelo Boveto Shima. + + -- Chuck Short Sun, 24 Jun 2007 09:54:54 -0400 + +libvirt (0.1.8-0ubuntu2) feisty; urgency=low + + * Rebuild for python2.5 as the default python version. + + -- Matthias Klose Fri, 12 Jan 2007 13:21:55 +0000 + +libvirt (0.1.8-0ubuntu1) feisty; urgency=low + + * Initial release + + -- Andrew Mitchell Mon, 23 Oct 2006 20:00:28 +1300 + --- libvirt-0.7.5.orig/debian/python-libvirt.install +++ libvirt-0.7.5/debian/python-libvirt.install @@ -0,0 +1,2 @@ +usr/lib/python*/*/*.so +usr/lib/python*/*/*.py --- libvirt-0.7.5.orig/debian/libvirt-bin.postinst +++ libvirt-0.7.5/debian/libvirt-bin.postinst @@ -0,0 +1,83 @@ +#!/bin/sh +# postinst script for libvirt-bin +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + if ! getent group libvirt >/dev/null; then + addgroup --system libvirt + fi + + # user and group libvirt runs qemu/kvm instances with + if ! getent group kvm >/dev/null; then + addgroup --quiet --system kvm + fi + if ! getent passwd libvirt-qemu >/dev/null; then + adduser --quiet \ + --system \ + --ingroup kvm \ + --quiet \ + --disabled-login \ + --disabled-password \ + --home /var/lib/libvirt \ + --no-create-home \ + -gecos "Libvirt Qemu" \ + libvirt-qemu + fi + + # libvirt from 0.6.0 on is safe to restart with running vms: + if [ -n "$2" ] && dpkg --compare-versions "$2" ge 0.6.0; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d libvirt-bin stop + else + /etc/init.d/libvirt-bin stop + fi + sleep 1 + fi + + if dpkg --compare-versions "$2" lt "0.6.1-2"; then + if [ -e /etc/rc2.d/S20libvirt-bin ] && \ + [ -e /etc/rc3.d/S20libvirt-bin ] && \ + [ -e /etc/rc4.d/S20libvirt-bin ] && \ + [ -e /etc/rc5.d/S20libvirt-bin ] && \ + [ -e /etc/rc0.d/K20libvirt-bin ] && \ + [ -e /etc/rc1.d/K20libvirt-bin ] && \ + [ -e /etc/rc6.d/K20libvirt-bin ]; then + update-rc.d -f libvirt-bin remove >/dev/null + fi + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- libvirt-0.7.5.orig/debian/libvirt0.install +++ libvirt-0.7.5/debian/libvirt0.install @@ -0,0 +1,2 @@ +usr/lib/libvirt.so.* + --- libvirt-0.7.5.orig/debian/pycompat +++ libvirt-0.7.5/debian/pycompat @@ -0,0 +1 @@ +2 --- libvirt-0.7.5.orig/debian/libvirt-suspendonreboot +++ libvirt-0.7.5/debian/libvirt-suspendonreboot @@ -0,0 +1,48 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: libvirt-suspendonreboot +# Required-Start: libvirt-bin +# Required-Stop: libvirt-bin $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: suspend/resmum vms on reboot +### END INIT INFO +# (c) Andi Barth 2008 +# Distributable under the terms of the GNU GPL version 2. +# +# copy to /etc/init.d/libvirt-suspendonreboot and use +# update-rc.d libvirt-suspendonreboot defaults 29 71 +# to enable + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin + +suspenddir=/var/lib/libvirt/autosuspend + +case "$1" in + start) + for domain in ${suspenddir}/*dump; do + if [ -f $domain ]; then + domain=$(basename $domain .dump) + echo "resuming $domain ..." + virsh restore ${suspenddir}/${domain}.dump && rm ${suspenddir}/${domain}.dump + fi + done + ;; + stop) + for domain in /etc/libvirt/qemu/*xml; do + domain=$(basename $domain .xml) + state=$(virsh domstate $domain) + if [ "$state" = "running" ]; then + echo "suspending $domain ..." + virsh save ${domain} ${suspenddir}/${domain}.dump + fi + done + ;; + reload|force-reload|restart) + # No action, nothing to reload + ;; + *) + echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2 + exit 1 +esac + --- libvirt-0.7.5.orig/debian/README.Debian +++ libvirt-0.7.5/debian/README.Debian @@ -0,0 +1,59 @@ +Xen +=== +To manage xen domains with libvirt you have to set: + +(xend-unix-server yes) + +in /etc/xen/xend-config.sxp. + +For xend HTTP access (not recommended) you also have to set: + +(xend-http-server yes) +# only allow access from localhost: +(xend-address localhost) + +Note that *every* user on the system has access to xend then. Better use +libvirtd to access xen with unprivileged users and add the users to the +"libvirt" group (see "Access Control" below). + +Debugging +========= +Use LIBVIRT_DEBUG=1 to enable libvirt's debugging output, e.g.: + +LIBVIRT_DEBUG=1 +export LIBVIRT_DEBUG +virt-manager + +The default NAT network +======================= +To ease network configuration libvirt defines a NATed network named "default". +VMs using this network end up in 192.168.122.1/24 and DHCP is provided to them +via dnsmasq. This network is not automatically started. To start it use: + + virsh net-start default + +To make the default network start automatically use: + + virsh net-autostart default + +In order for things to work this way you need to have the recommended packages +dnsmasq-base, bridge-utils and iptables installed. + +You don't need the package dnsmasq. However, if you install it, Debian's +default dnsmasq needs to be adjusted slightly to interoperate with libvirtd: + +cat </etc/dnsmasq.d/00_libvirtd.conf +# only bind to loopback by default +interface=lo +bind-interfaces +EOF + +This makes dnsmasq only bind to the loopback interface by default so libvirtd +can handle the virtual bridges. + +Access Control +============== +Access to the libvirt socket is controlled by membership in the "libvirt" group. +If you want to manage VMs as non root you need to add a user to that group. + + -- Guido Guenther Thu, 15 May 2008 14:13:03 +0100 --- libvirt-0.7.5.orig/debian/libvirt-bin.examples +++ libvirt-0.7.5/debian/libvirt-bin.examples @@ -0,0 +1,5 @@ +daemon/libvirtd.conf +daemon/libvirtd.policy-0 +daemon/libvirtd.policy-1 +daemon/libvirtd.sasl +debian/libvirt-suspendonreboot --- libvirt-0.7.5.orig/debian/libvirt-bin.install +++ libvirt-0.7.5/debian/libvirt-bin.install @@ -0,0 +1,8 @@ +usr/bin/* +usr/sbin/* +etc/libvirt/* +etc/sasl2/* +usr/share/polkit-1/* +usr/lib/libvirt/* +usr/share/augeas/* +usr/share/libvirt/* --- libvirt-0.7.5.orig/debian/watch +++ libvirt-0.7.5/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://libvirt.org/sources/libvirt-(.*)\.tar\.gz --- libvirt-0.7.5.orig/debian/libvirt-dev.install +++ libvirt-0.7.5/debian/libvirt-dev.install @@ -0,0 +1,4 @@ +usr/lib/libvirt.so +usr/lib/libvirt.a +usr/include/* +usr/lib/pkgconfig/* --- libvirt-0.7.5.orig/debian/compat +++ libvirt-0.7.5/debian/compat @@ -0,0 +1 @@ +7 --- libvirt-0.7.5.orig/debian/rules +++ libvirt-0.7.5/debian/rules @@ -0,0 +1,61 @@ +#!/usr/bin/make -f + +DEB_PYTHON_SYSTEM = pycentral + +ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64)) + BUILD_XEN = --with-xen + BUILD_VBOX = --with-vbox +else + BUILD_XEN = --without-xen + BUILD_VBOX = --without-vbox +endif + +ifneq (,$(findstring $(DEB_HOST_ARCH), ia64)) + BUILD_LXC = --without-lxc +else + BUILD_LXC = --with-lxc +endif + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/class/python-distutils.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +DEB_CONFIGURE_EXTRA_FLAGS := \ + --disable-rpath \ + --with-qemu \ + --with-qemu-user=libvirt-qemu \ + --with-qemu-group=kvm \ + --with-openvz \ + --with-avahi \ + --with-sasl \ + --with-polkit \ + --with-udev \ + --with-storage-fs \ + --with-storage-lvm \ + --with-storage-iscsi \ + --with-storage-disk \ + --with-init-scripts=none \ + --without-numactl \ + --without-selinux \ + --without-esx \ + --without-libssh2 \ + --enable-debug \ + $(BUILD_XEN) \ + $(BUILD_VBOX) \ + $(BUILD_LXC) + +DEB_COMPRESS_EXCLUDE = .o event-test hellolibvirt info1 suspend +DEB_PYTHON_SETUP_CMD = /dev/null +DEB_DH_MAKESHLIBS_ARGS_libvirt0 += -V 'libvirt0 (>= 0.5.0)' +DEB_DH_INSTALLINIT_ARGS = --no-restart-on-upgrade -- defaults 28 72 +DEB_DH_INSTALLLOGROTATE_ARGS = --name=libvirtd + +EXAMPLES_DIR = $(CURDIR)/debian/libvirt-doc/usr/share/doc/libvirt-doc/examples/ + +binary-install/libvirt-doc:: + find $(EXAMPLES_DIR) -name "*.o" -type f -delete -o -name .libs -type d -exec rm -rf {} \; + rm -f $(EXAMPLES_DIR)domain-events/events-c/event-test + rm -f $(EXAMPLES_DIR)dominfo/info1 + rm -f $(EXAMPLES_DIR)domsuspend/suspend + rm -f $(EXAMPLES_DIR)hellolibvirt/hellolibvirt --- libvirt-0.7.5.orig/debian/libvirt-bin.dirs +++ libvirt-0.7.5/debian/libvirt-bin.dirs @@ -0,0 +1,4 @@ +/var/lib/libvirt/images +/var/lib/libvirt/boot +/var/cache/libvirt +/var/log/libvirt/qemu --- libvirt-0.7.5.orig/debian/libvirt-doc.docs +++ libvirt-0.7.5/debian/libvirt-doc.docs @@ -0,0 +1,8 @@ +docs/*.rng +docs/*.png +docs/*.xml +docs/*.html +docs/*.gif +docs/html/ +docs/devhelp/ +examples/ --- libvirt-0.7.5.orig/debian/README.source +++ libvirt-0.7.5/debian/README.source @@ -0,0 +1,57 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command. --- libvirt-0.7.5.orig/debian/libvirt-bin.postrm +++ libvirt-0.7.5/debian/libvirt-bin.postrm @@ -0,0 +1,45 @@ +#!/bin/sh +# postrm script for #PACKAGE# +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge) + if getent group libvirt >/dev/null; then + delgroup libvirt || true + fi + + ;; + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- libvirt-0.7.5.orig/debian/patches/0001-remove-RHism.diff.patch +++ libvirt-0.7.5/debian/patches/0001-remove-RHism.diff.patch @@ -0,0 +1,22 @@ +From: Guido Guenther +Date: Fri, 7 Mar 2008 09:08:25 +0100 +Subject: [PATCH] remove-RHism.diff + +--- + tools/virsh.pod | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tools/virsh.pod b/tools/virsh.pod +index ee8cc11..d2458f5 100644 +--- a/tools/virsh.pod ++++ b/tools/virsh.pod +@@ -34,7 +34,7 @@ the program. + + All B operations rely upon the libvirt library. + For any virsh commands to run xend/qemu, or what ever virtual library that libvirt supports. For this reason you should start xend/qemu as a service when your system first boots using xen/qemu. This can usually be done using the command +-B . ++B . + + Most B commands require root privileges to run due to the + communications channels used to talk to the hypervisor. Running as +-- --- libvirt-0.7.5.orig/debian/patches/0002-qemu-disable-network.diff.patch +++ libvirt-0.7.5/debian/patches/0002-qemu-disable-network.diff.patch @@ -0,0 +1,38 @@ +From: Guido Guenther +Date: Fri, 7 Mar 2008 09:08:26 +0100 +Subject: [PATCH] qemu-disable-network.diff + +--- + src/Makefile.am | 3 --- + src/Makefile.in | 3 --- + 2 files changed, 0 insertions(+), 6 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 8ef0e81..f59eb08 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -913,9 +913,6 @@ if WITH_NETWORK + test -z "$(UUID)" || \ + sed -i -e "s,,\n $(UUID)," \ + $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml +- test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \ +- ln -s ../default.xml \ +- $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml + endif + + uninstall-local:: +diff --git a/src/Makefile.in b/src/Makefile.in +index 5301dfc..143fe64 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -4197,9 +4197,6 @@ install-data-local: + @WITH_NETWORK_TRUE@ test -z "$(UUID)" || \ + @WITH_NETWORK_TRUE@ sed -i -e "s,,\n $(UUID)," \ + @WITH_NETWORK_TRUE@ $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml +-@WITH_NETWORK_TRUE@ test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \ +-@WITH_NETWORK_TRUE@ ln -s ../default.xml \ +-@WITH_NETWORK_TRUE@ $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml + + uninstall-local:: + rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt" ||: +-- --- libvirt-0.7.5.orig/debian/patches/0007-Implement-path-lookup-for-USB-by-vendor-product.patch +++ libvirt-0.7.5/debian/patches/0007-Implement-path-lookup-for-USB-by-vendor-product.patch @@ -0,0 +1,307 @@ +From: Cole Robinson +Date: Wed, 13 Jan 2010 15:50:05 -0500 +Subject: [PATCH] Implement path lookup for USB by vendor:product + +Based off how QEMU does it, look through /sys/bus/usb/devices/* for +matching vendor:product info, and if found, use info from the surrounding +files to build the device's /dev/bus/usb path. + +This fixes USB device assignment by vendor:product when running qemu +as non-root (well, it should, but for some reason I couldn't reproduce +the failure people are seeing in [1], but it appears to work properly) + +[1] https://bugzilla.redhat.com/show_bug.cgi?id=542450 + +v2: + Drop 'bus.addr only' checks in security drivers + Use various util helpers + +Signed-off-by: Cole Robinson +--- + po/POTFILES.in | 1 + + src/qemu/qemu_driver.c | 9 +-- + src/security/security_selinux.c | 25 ++++----- + src/security/virt-aa-helper.c | 32 +++++------ + src/util/hostusb.c | 110 +++++++++++++++++++++++++++++++++++++- + src/util/hostusb.h | 4 +- + 6 files changed, 141 insertions(+), 40 deletions(-) + +diff --git a/po/POTFILES.in b/po/POTFILES.in +index 1ab0859..22e9c3c 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -54,6 +54,7 @@ src/uml/uml_conf.c + src/uml/uml_driver.c + src/util/bridge.c + src/util/conf.c ++src/util/hostusb.c + src/util/json.c + src/util/logging.c + src/util/pci.c +diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c +index a6a1a5a..7dfa78f 100644 +--- a/src/qemu/qemu_driver.c ++++ b/src/qemu/qemu_driver.c +@@ -2099,14 +2099,11 @@ static int qemuDomainSetHostdevUSBOwnership(virConnectPtr conn, + struct qemuFileOwner owner = { uid, gid }; + int ret = -1; + +- /* XXX what todo for USB devs assigned based on product/vendor ? Doom :-( */ +- if (!def->source.subsys.u.usb.bus || +- !def->source.subsys.u.usb.device) +- return 0; +- + usbDevice *dev = usbGetDevice(conn, + def->source.subsys.u.usb.bus, +- def->source.subsys.u.usb.device); ++ def->source.subsys.u.usb.device, ++ def->source.subsys.u.usb.vendor, ++ def->source.subsys.u.usb.product); + + if (!dev) + goto cleanup; +diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c +index 000bc8a..cb585ed 100644 +--- a/src/security/security_selinux.c ++++ b/src/security/security_selinux.c +@@ -481,20 +481,17 @@ SELinuxSetSecurityHostdevLabel(virConnectPtr conn, + + switch (dev->source.subsys.type) { + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { +- if (dev->source.subsys.u.usb.bus && dev->source.subsys.u.usb.device) { +- usbDevice *usb = usbGetDevice(conn, +- dev->source.subsys.u.usb.bus, +- dev->source.subsys.u.usb.device); ++ usbDevice *usb = usbGetDevice(conn, ++ dev->source.subsys.u.usb.bus, ++ dev->source.subsys.u.usb.device, ++ dev->source.subsys.u.usb.vendor, ++ dev->source.subsys.u.usb.product); + +- if (!usb) +- goto done; ++ if (!usb) ++ goto done; + +- ret = usbDeviceFileIterate(conn, usb, SELinuxSetSecurityUSBLabel, vm); +- usbFreeDevice(conn, usb); +- } else { +- /* XXX deal with product/vendor better */ +- ret = 0; +- } ++ ret = usbDeviceFileIterate(conn, usb, SELinuxSetSecurityUSBLabel, vm); ++ usbFreeDevice(conn, usb); + break; + } + +@@ -556,7 +553,9 @@ SELinuxRestoreSecurityHostdevLabel(virConnectPtr conn, + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { + usbDevice *usb = usbGetDevice(conn, + dev->source.subsys.u.usb.bus, +- dev->source.subsys.u.usb.device); ++ dev->source.subsys.u.usb.device, ++ dev->source.subsys.u.usb.vendor, ++ dev->source.subsys.u.usb.product); + + if (!usb) + goto done; +diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c +index 35b29ad..3c8b49a 100644 +--- a/src/security/virt-aa-helper.c ++++ b/src/security/virt-aa-helper.c +@@ -836,24 +836,22 @@ get_files(vahControl * ctl) + virDomainHostdevDefPtr dev = ctl->def->hostdevs[i]; + switch (dev->source.subsys.type) { + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { +- if (dev->source.subsys.u.usb.bus && +- dev->source.subsys.u.usb.device) { +- usbDevice *usb = usbGetDevice(NULL, +- dev->source.subsys.u.usb.bus, +- dev->source.subsys.u.usb.device); +- if (usb == NULL) +- continue; +- rc = usbDeviceFileIterate(NULL, usb, +- file_iterate_cb, &buf); +- usbFreeDevice(NULL, usb); +- if (rc != 0) +- goto clean; +- else { +- /* TODO: deal with product/vendor better */ +- rc = 0; +- } +- } ++ usbDevice *usb = usbGetDevice(NULL, ++ dev->source.subsys.u.usb.bus, ++ dev->source.subsys.u.usb.device, ++ dev->source.subsys.u.usb.vendor, ++ dev->source.subsys.u.usb.product); ++ ++ if (usb == NULL) ++ continue; ++ ++ rc = usbDeviceFileIterate(NULL, usb, ++ file_iterate_cb, &buf); ++ usbFreeDevice(NULL, usb); ++ if (rc != 0) ++ goto clean; + break; ++ } + } + /* TODO: update so files in /sys are readonly + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: { +diff --git a/src/util/hostusb.c b/src/util/hostusb.c +index 07e10b1..8fbb486 100644 +--- a/src/util/hostusb.c ++++ b/src/util/hostusb.c +@@ -37,9 +37,10 @@ + #include "util.h" + #include "virterror_internal.h" + ++#define USB_SYSFS "/sys/bus/usb" + #define USB_DEVFS "/dev/bus/usb/" +-#define USB_ID_LEN 10 /* "XXXX XXXX" */ +-#define USB_ADDR_LEN 8 /* "XXX:XXX" */ ++#define USB_ID_LEN 10 /* "1234 5678" */ ++#define USB_ADDR_LEN 8 /* "123:456" */ + + struct _usbDevice { + unsigned bus; +@@ -57,11 +58,108 @@ struct _usbDevice { + virReportErrorHelper(conn, VIR_FROM_NONE, code, __FILE__, \ + __FUNCTION__, __LINE__, fmt) + ++static int usbSysReadFile(virConnectPtr conn, ++ const char *f_name, const char *d_name, ++ int base, unsigned *value) ++{ ++ int ret = -1, tmp; ++ char *buf = NULL; ++ char *filename = NULL; ++ char *ignore = NULL; ++ ++ tmp = virAsprintf(&filename, USB_SYSFS "/devices/%s/%s", d_name, f_name); ++ if (tmp < 0) { ++ virReportOOMError(conn); ++ goto error; ++ } ++ ++ if (virFileReadAll(filename, 1024, &buf) < 0) ++ goto error; ++ ++ if (virStrToLong_ui(buf, &ignore, base, value) < 0) { ++ usbReportError(conn, VIR_ERR_INTERNAL_ERROR, ++ _("Could not parse usb file %s"), filename); ++ goto error; ++ } ++ ++ ret = 0; ++error: ++ VIR_FREE(filename); ++ VIR_FREE(buf); ++ return ret; ++} ++ ++static int usbFindBusByVendor(virConnectPtr conn, ++ unsigned vendor, unsigned product, ++ unsigned *bus, unsigned *devno) ++{ ++ DIR *dir = NULL; ++ int ret = -1, found = 0; ++ char *ignore = NULL; ++ struct dirent *de; ++ ++ dir = opendir(USB_SYSFS "/devices"); ++ if (!dir) { ++ virReportSystemError(conn, errno, ++ _("Could not open directory %s"), ++ USB_SYSFS "/devices"); ++ goto error; ++ } ++ ++ while ((de = readdir(dir))) { ++ unsigned found_prod, found_vend; ++ if (de->d_name[0] == '.' || strchr(de->d_name, ':')) ++ continue; ++ ++ if (usbSysReadFile(conn, "idVendor", de->d_name, ++ 16, &found_vend) < 0) ++ goto error; ++ if (usbSysReadFile(conn, "idProduct", de->d_name, ++ 16, &found_prod) < 0) ++ goto error; ++ ++ if (found_prod == product && found_vend == vendor) { ++ /* Lookup bus.addr info */ ++ char *tmpstr = de->d_name; ++ unsigned found_bus, found_addr; ++ ++ if (STREQ(de->d_name, "usb")) ++ tmpstr += 3; ++ ++ if (virStrToLong_ui(tmpstr, &ignore, 10, &found_bus) < 0) { ++ usbReportError(conn, VIR_ERR_INTERNAL_ERROR, ++ _("Failed to parse dir name '%s'"), ++ de->d_name); ++ goto error; ++ } ++ ++ if (usbSysReadFile(conn, "devnum", de->d_name, ++ 10, &found_addr) < 0) ++ goto error; ++ ++ *bus = found_bus; ++ *devno = found_addr; ++ found = 1; ++ break; ++ } ++ } ++ ++ if (!found) ++ usbReportError(conn, VIR_ERR_INTERNAL_ERROR, ++ _("Did not find USB device %x:%x"), vendor, product); ++ else ++ ret = 0; ++ ++error: ++ return ret; ++} + + usbDevice * + usbGetDevice(virConnectPtr conn, + unsigned bus, +- unsigned devno) ++ unsigned devno, ++ unsigned vendor, ++ unsigned product) + { + usbDevice *dev; + +@@ -70,6 +168,12 @@ usbGetDevice(virConnectPtr conn, + return NULL; + } + ++ if (vendor) { ++ /* Look up bus.dev by vendor:product */ ++ if (usbFindBusByVendor(conn, vendor, product, &bus, &devno) < 0) ++ return NULL; ++ } ++ + dev->bus = bus; + dev->dev = devno; + +diff --git a/src/util/hostusb.h b/src/util/hostusb.h +index 7f75c8b..739a4aa 100644 +--- a/src/util/hostusb.h ++++ b/src/util/hostusb.h +@@ -28,7 +28,9 @@ typedef struct _usbDevice usbDevice; + + usbDevice *usbGetDevice (virConnectPtr conn, + unsigned bus, +- unsigned devno); ++ unsigned devno, ++ unsigned vendor, ++ unsigned product); + void usbFreeDevice (virConnectPtr conn, + usbDevice *dev); + +-- --- libvirt-0.7.5.orig/debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch +++ libvirt-0.7.5/debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch @@ -0,0 +1,49 @@ +From: Guido Guenther +Date: Thu, 26 Jun 2008 20:01:38 +0200 +Subject: [PATCH] allow libvirt group to access the socket + +--- + daemon/libvirtd.conf | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf +index 49de466..cc5f056 100644 +--- a/daemon/libvirtd.conf ++++ b/daemon/libvirtd.conf +@@ -78,7 +78,7 @@ + # without becoming root. + # + # This is restricted to 'root' by default. +-#unix_sock_group = "libvirt" ++unix_sock_group = "libvirt" + + # Set the UNIX socket permissions for the R/O socket. This is used + # for monitoring VM status only +@@ -95,7 +95,7 @@ + # + # If not using PolicyKit and setting group ownership for access + # control then you may want to relax this to: +-#unix_sock_rw_perms = "0770" ++unix_sock_rw_perms = "0770" + + # Set the name of the directory in which sockets will be found/created. + #unix_sock_dir = "/var/run/libvirt" +@@ -126,7 +126,7 @@ + # + # To restrict monitoring of domains you may wish to enable + # an authentication mechanism here +-#auth_unix_ro = "none" ++auth_unix_ro = "none" + + # Set an authentication scheme for UNIX read-write sockets + # By default socket permissions only allow root. If PolicyKit +@@ -135,7 +135,7 @@ + # + # If the unix_sock_rw_perms are changed you may wish to enable + # an authentication mechanism here +-#auth_unix_rw = "none" ++auth_unix_rw = "none" + + # Change the authentication scheme for TCP sockets. + # +-- --- libvirt-0.7.5.orig/debian/patches/0006-Terminate-nc-on-EOF.patch +++ libvirt-0.7.5/debian/patches/0006-Terminate-nc-on-EOF.patch @@ -0,0 +1,32 @@ +From: Gabor Gombas +Date: Fri, 8 Jan 2010 11:00:07 +0100 +Subject: [PATCH] Terminate nc on EOF + +Closes: #564053 +--- + src/remote/remote_driver.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c +index d6f5fce..a4055f8 100644 +--- a/src/remote/remote_driver.c ++++ b/src/remote/remote_driver.c +@@ -730,7 +730,7 @@ doRemoteOpen (virConnectPtr conn, + } + + case trans_ssh: { +- int j, nr_args = 6; ++ int j, nr_args = 8; + + if (username) nr_args += 2; /* For -l username */ + if (no_tty) nr_args += 5; /* For -T -o BatchMode=yes -e none */ +@@ -764,6 +764,8 @@ doRemoteOpen (virConnectPtr conn, + } + cmd_argv[j++] = strdup (priv->hostname); + cmd_argv[j++] = strdup (netcat ? netcat : "nc"); ++ cmd_argv[j++] = strdup ("-q"); ++ cmd_argv[j++] = strdup ("0"); + cmd_argv[j++] = strdup ("-U"); + cmd_argv[j++] = strdup (sockname ? sockname : + (flags & VIR_CONNECT_RO +-- --- libvirt-0.7.5.orig/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch +++ libvirt-0.7.5/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch @@ -0,0 +1,88 @@ +From: =?UTF-8?q?Guido=20G=C3=BCnther?= +Date: Thu, 26 Feb 2009 14:29:58 +0100 +Subject: [PATCH] fix Debian specific path to hvm loader + +Closes: #517059 +--- + src/xen/xen_hypervisor.c | 2 +- + tests/xencapsdata/xen-i686-pae-hvm.xml | 2 +- + tests/xencapsdata/xen-ia64-be-hvm.xml | 2 +- + tests/xencapsdata/xen-ia64-hvm.xml | 2 +- + tests/xencapsdata/xen-x86_64-hvm.xml | 4 ++-- + 5 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c +index 8279a74..5001d91 100644 +--- a/src/xen/xen_hypervisor.c ++++ b/src/xen/xen_hypervisor.c +@@ -2230,7 +2230,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, + "/usr/lib64/xen/bin/qemu-dm" : + "/usr/lib/xen/bin/qemu-dm"), + (guest_archs[i].hvm ? +- "/usr/lib/xen/boot/hvmloader" : ++ "/usr/lib/xen-default/boot/hvmloader" : + NULL), + 1, + machines)) == NULL) { +diff --git a/tests/xencapsdata/xen-i686-pae-hvm.xml b/tests/xencapsdata/xen-i686-pae-hvm.xml +index 42b099c..2886c09 100644 +--- a/tests/xencapsdata/xen-i686-pae-hvm.xml ++++ b/tests/xencapsdata/xen-i686-pae-hvm.xml +@@ -34,7 +34,7 @@ + + 32 + /usr/lib/xen/bin/qemu-dm +- /usr/lib/xen/boot/hvmloader ++ /usr/lib/xen-default/boot/hvmloader + xenfv + + +diff --git a/tests/xencapsdata/xen-ia64-be-hvm.xml b/tests/xencapsdata/xen-ia64-be-hvm.xml +index 732b693..cf3dfc1 100644 +--- a/tests/xencapsdata/xen-ia64-be-hvm.xml ++++ b/tests/xencapsdata/xen-ia64-be-hvm.xml +@@ -31,7 +31,7 @@ + + 64 + /usr/lib/xen/bin/qemu-dm +- /usr/lib/xen/boot/hvmloader ++ /usr/lib/xen-default/boot/hvmloader + xenfv + + +diff --git a/tests/xencapsdata/xen-ia64-hvm.xml b/tests/xencapsdata/xen-ia64-hvm.xml +index ef48a95..871cd65 100644 +--- a/tests/xencapsdata/xen-ia64-hvm.xml ++++ b/tests/xencapsdata/xen-ia64-hvm.xml +@@ -28,7 +28,7 @@ + + 64 + /usr/lib/xen/bin/qemu-dm +- /usr/lib/xen/boot/hvmloader ++ /usr/lib/xen-default/boot/hvmloader + xenfv + + +diff --git a/tests/xencapsdata/xen-x86_64-hvm.xml b/tests/xencapsdata/xen-x86_64-hvm.xml +index 52c12c6..83dac3e 100644 +--- a/tests/xencapsdata/xen-x86_64-hvm.xml ++++ b/tests/xencapsdata/xen-x86_64-hvm.xml +@@ -31,7 +31,7 @@ + + 32 + /usr/lib64/xen/bin/qemu-dm +- /usr/lib/xen/boot/hvmloader ++ /usr/lib/xen-default/boot/hvmloader + xenfv + + +@@ -49,7 +49,7 @@ + + 64 + /usr/lib64/xen/bin/qemu-dm +- /usr/lib/xen/boot/hvmloader ++ /usr/lib/xen-default/boot/hvmloader + xenfv + + +-- --- libvirt-0.7.5.orig/debian/patches/0005-Also-look-for-dmi-information-in-sys-class.patch +++ libvirt-0.7.5/debian/patches/0005-Also-look-for-dmi-information-in-sys-class.patch @@ -0,0 +1,41 @@ +From: =?UTF-8?q?Guido=20G=C3=BCnther?= +Date: Thu, 7 Jan 2010 10:13:51 +0100 +Subject: [PATCH] Also look for dmi information in /sys/class + +older kernels such as 2.6.26 have it there. +--- + src/node_device/node_device_udev.c | 7 ++++++- + src/node_device/node_device_udev.h | 1 + + 2 files changed, 7 insertions(+), 1 deletions(-) + +diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c +index 22c5f2b..7a9c1e5 100644 +--- a/src/node_device/node_device_udev.c ++++ b/src/node_device/node_device_udev.c +@@ -1407,7 +1407,12 @@ static int udevSetupSystemDev(void) + device = udev_device_new_from_syspath(udev, DMI_DEVPATH); + if (device == NULL) { + VIR_ERROR("Failed to get udev device for syspath '%s'\n", DMI_DEVPATH); +- goto out; ++ ++ device = udev_device_new_from_syspath(udev, DMI_DEVPATH_FALLBACK); ++ if (device == NULL) { ++ VIR_ERROR("Failed to get udev device for syspath '%s'\n", DMI_DEVPATH_FALLBACK); ++ goto out; ++ } + } + + data = &def->caps->data; +diff --git a/src/node_device/node_device_udev.h b/src/node_device/node_device_udev.h +index 0fd39ae..6c83412 100644 +--- a/src/node_device/node_device_udev.h ++++ b/src/node_device/node_device_udev.h +@@ -26,6 +26,7 @@ + #define SYSFS_DATA_SIZE 4096 + #define DRV_STATE_UDEV_MONITOR(ds) ((struct udev_monitor *)((ds)->privateData)) + #define DMI_DEVPATH "/sys/devices/virtual/dmi/id" ++#define DMI_DEVPATH_FALLBACK "/sys/class/dmi/id" + #define PROPERTY_FOUND 0 + #define PROPERTY_MISSING 1 + #define PROPERTY_ERROR -1 +-- --- libvirt-0.7.5.orig/debian/patches/series +++ libvirt-0.7.5/debian/patches/series @@ -0,0 +1,7 @@ +0001-remove-RHism.diff.patch +0002-qemu-disable-network.diff.patch +0003-allow-libvirt-group-to-access-the-socket.patch +0004-fix-Debian-specific-path-to-hvm-loader.patch +0005-Also-look-for-dmi-information-in-sys-class.patch +0006-Terminate-nc-on-EOF.patch +0007-Implement-path-lookup-for-USB-by-vendor-product.patch