Add a new revision with two backports so that libvirtd does not crash when a virtual machine is shut down.

Package-Manager: portage-2.2_rc58/cvs/Linux x86_64

3 files changed, 183 insertions, 5 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 650a70522bcf..a92176344515 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.41 2009/12/08 14:25:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.42 2009/12/11 12:33:01 flameeyes Exp $
+
+*libvirt-0.7.4-r2 (11 Dec 2009)
+
+  11 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +libvirt-0.7.4-r2.ebuild:
+  Add a new revision with two backports so that libvirtd does not crash when
+  a virtual machine is shut down.
 
 *libvirt-0.7.4-r1 (08 Dec 2009)
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index bdd662c1cebc..dd76076f546a 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -14,16 +14,18 @@ AUX libvirt-0.6.4-qemu-img-logic-fix.patch 714 RMD160 22e0b891c046d6d40ae0ebc81a
 AUX libvirtd.confd 476 RMD160 63b92da0cf0d589c1c6e76551982deb6b5fc8f9a SHA1 5b76082bb28705606758880c19af922dde1ccb01 SHA256 ff2c94d2a64058152be669256d8d2e241cde4356a77bd653eac9fa3b084666f6
 AUX libvirtd.init 2045 RMD160 b544578c242c6f84e2cf07682a06ce261bf40b8a SHA1 81976137c43f6b507e27ac926a6d7947e1a329d3 SHA256 96cbdf8e68a171d170f91167a4217a366325ca668b9e2621ec6800fd35d42c5c
 DIST libvirt-0.7.2.tar.gz 8689842 RMD160 2464e94d6b22508be44ae57033312b37214bf835 SHA1 db7bbf23152ab8cd5890cf6ff942f715d96621ce SHA256 75841838dfb83772192a55ad459695824274190a98e4e24b6e80cbb3063977f6
+DIST libvirt-0.7.4-backports-1.tar.bz2 4859 RMD160 72aae4d105e48ad9de95b358a1ba2ef071a8ba0b SHA1 7546c3b84664206375854be36ebfb8759df7e39f SHA256 3e58c5d22fe40c8a26f677ca0c5d67db34dc05e813e024b59bc1ebb3b11138ed
 DIST libvirt-0.7.4.tar.gz 8880507 RMD160 16a6718bf5d71935d4e47524a29671ff03db9ff8 SHA1 0677a9bf365cbf6a5c1b8559e040b4ea4b5b1e59 SHA256 91e3af2f660baa96a3014b2fd3942784df34bafac38b918b6eb325c9e9771316
 EBUILD libvirt-0.7.2.ebuild 4495 RMD160 dcad24bd3a7e07c70b070813ff3d4cf7262edc64 SHA1 223135be2c3567b7fe1c58d727baa118a1b286e9 SHA256 f045ba5e907b7ea3b1a83dacdfadb35daf3ea151c42670af442975d77b581978
 EBUILD libvirt-0.7.4-r1.ebuild 4990 RMD160 f7f28c9ef9e489d15c9c8f6d3f63ec08d505e104 SHA1 8646b43b18329b37b6d16d28db6d360514e4bef3 SHA256 ba8242ed11b455f28cd5ba7e02999779d058b69b90fce3d6543d4f8c105f3b37
+EBUILD libvirt-0.7.4-r2.ebuild 5134 RMD160 8c54d01392d95773ae1a5804e26f52344e801d42 SHA1 1f1bcf63e3d03722aa8361a74737791e9db107cc SHA256 fde9d2e25f08a2ec82660cba8553499a51e8d89e5a9408cfce4e8589c7d9fde1
 EBUILD libvirt-0.7.4.ebuild 4696 RMD160 8b7e62d29813ead347e4688805758c9b932e19ba SHA1 e25294293f2641ec9a9e26d88686029ff89a45a6 SHA256 900f752aff82290c28dc19854adced011a1f9cdd29902ede4dbf3aaf597517f2
-MISC ChangeLog 9668 RMD160 0bd096ec7bf9b92fc3c68e4e7ec659d110860202 SHA1 81244fe8dc80668f303d674a99cb3432174cf56b SHA256 704d820ffdc524b07621a40db852135a99c72812a01b0dded1e5e36e4c44a9ac
+MISC ChangeLog 9897 RMD160 09959658c6df7c035023d0be596ab0929ed79814 SHA1 0da9906e538494abf00ed7381506cd852237429f SHA256 294a7af68764a770c1931b92120e8f0e2b356d81a7c1a8684bcb9311c9f174fa
 MISC metadata.xml 1878 RMD160 ba1bd617952dd7f889717b7ebb6d2f4291ddb2e4 SHA1 e8b7995d40a95dbdcf48da784df37b63dad8825d SHA256 fc2ff132038aa47f9339d28be4016503cb0613033c4365cbf2c503cb8a943d67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkseYa4ACgkQAiZjviIA2XjNLQCggAYWBP9ga1YR4vKn84xPjntb
-MBQAn3uDawHTkckJG30BUkna95g3bn1B
-=4pTZ
+iEYEARECAAYFAksiPAYACgkQAiZjviIA2Xhe5QCdF1Bxg7tCala8is/CFMbaMTau
+Q6QAnA4mUtEKsKXwJI8cwPbbkgsH0zVy
+=dYcM
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-0.7.4-r2.ebuild b/app-emulation/libvirt/libvirt-0.7.4-r2.ebuild
new file mode 100644
index 000000000000..69e8ee90b49f
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-0.7.4-r2.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.7.4-r2.ebuild,v 1.1 2009/12/11 12:33:01 flameeyes Exp $
+
+BACKPORTS=1
+
+EAPI="2"
+
+inherit eutils python
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+SRC_URI="http://libvirt.org/sources/${P}.tar.gz
+	mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="avahi caps iscsi kvm +libvirtd lvm +lxc +network nfs one nls numa openvz \
+	parted phyp policykit python qemu sasl selinux uml virtualbox xen udev"
+# devicekit isn't in portage
+
+RDEPEND="sys-libs/readline
+	sys-libs/ncurses
+	net-misc/curl
+	>=dev-libs/libxml2-2.5
+	>=net-libs/gnutls-1.0.25
+	dev-lang/python
+	sys-fs/sysfsutils
+	sys-apps/util-linux
+	>=net-analyzer/netcat6-1.0-r2
+	avahi? ( >=net-dns/avahi-0.6 )
+	caps? ( sys-libs/libcap-ng )
+	iscsi? ( sys-block/open-iscsi )
+	kvm? ( app-emulation/qemu-kvm )
+	libvirtd? ( net-misc/bridge-utils )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
+	nfs? ( net-fs/nfs-utils )
+	numa? ( sys-process/numactl )
+	one? ( dev-libs/xmlrpc-c )
+	openvz? ( sys-kernel/openvz-sources )
+	parted? ( >=sys-apps/parted-1.8 )
+	phyp? ( net-libs/libssh2 )
+	policykit? ( >=sys-auth/policykit-0.6 )
+	qemu? ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( sys-libs/libselinux )
+	virtualbox? ( || ( >=app-emulation/virtualbox-ose-2.2.0 >=app-emulation/virtualbox-bin-2.2.0 ) )
+	xen? ( app-emulation/xen-tools app-emulation/xen )
+	udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" epatch
+}
+
+src_configure() {
+	local myconf=""
+
+	## enable/disable daemon, otherwise client only utils
+	myconf="${myconf} $(use_with libvirtd)"
+
+	## enable/disable the daemon using avahi to find VMs
+	myconf="${myconf} $(use_with avahi)"
+
+	## hypervisors on the local host
+	myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
+	if ! use policykit && use xen; then
+		myconf="${myconf} --with-xen-proxy"
+	fi
+	myconf="${myconf} $(use_with openvz)"
+	myconf="${myconf} $(use_with lxc)"
+	myconf="${myconf} $(use_with virtualbox vbox)"
+	myconf="${myconf} $(use_with uml)"
+	if use qemu || use kvm ; then
+		myconf="${myconf} --with-qemu"
+	else
+		myconf="${myconf} --without-qemu"
+	fi
+	# doesn't belong with hypervisors but links to libvirtd for some reason
+	myconf="${myconf} $(use_with one)"
+
+	## hypervisor protocols
+	myconf="${myconf} $(use_with phyp)"
+	myconf="${myconf} --with-esx"
+
+	## additional host drivers
+	myconf="${myconf} $(use_with network)"
+	myconf="${myconf} --with-storage-fs"
+	myconf="${myconf} $(use_with lvm storage-lvm)"
+	myconf="${myconf} $(use_with iscsi storage-iscsi)"
+	myconf="${myconf} $(use_with parted storage-disk)"
+	myconf="${myconf} $(use_with lvm storage-mpath)"
+	myconf="${myconf} $(use_with numa numactl)"
+	myconf="${myconf} $(use_with selinux)"
+
+	# udev for device support details
+	myconf="${myconf} $(use_with udev)"
+
+	# linux capability support so we don't need privileged accounts
+	myconf="${myconf} $(use_with caps capng)"
+
+	## auth stuff
+	myconf="${myconf} $(use_with policykit polkit)"
+	myconf="${myconf} $(use_with sasl)"
+
+	## other
+	myconf="${myconf} $(use_enable nls)"
+	myconf="${myconf} $(use_with python)"
+
+	## stuff we don't yet support
+	myconf="${myconf} --without-devkit"
+	myconf="${myconf} --without-netcf"
+
+	# we use udev over hal
+	myconf="${myconf} --without-hal"
+
+	econf \
+		${myconf} \
+		--with-remote \
+		--disable-iptables-lokkit \
+		--localstatedir=/var \
+		--with-remote-pid-file=/var/run/libvirtd.pid
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	mv "${D}"/usr/share/doc/{${PN}-python*,${P}/python}
+
+	newinitd "${FILESDIR}/libvirtd.init" libvirtd
+	newconfd "${FILESDIR}/libvirtd.confd" libvirtd
+
+	keepdir /var/lib/libvirt/images
+}
+
+pkg_preinst() {
+	# we only ever want to generate this once
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+	fi
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize $(python_get_sitedir)/libvirt.py
+
+	elog "To allow normal users to connect to libvirtd you must change the"
+	elog " unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
+	elog
+	elog "For the basic networking support (bridged and routed networks)"
+	elog "you don't need any extra software. For more complex network modes"
+	elog "including but not limited to NATed network, you'll need the"
+	elog "following packages":
+	elog
+	elog "	net-dns/dnsmasq"
+	elog "	net-firewall/iptables"
+	elog "	net-firewall/ebtables"
+	elog
+	ewarn "If you have a DNS server setup on your machine, you will have"
+	ewarn "to configure /etc/dnsmasq.conf to enable the following settings: "
+	ewarn " bind-interfaces"
+	ewarn " interface or except-interface"
+	elog
+	ewarn "Otherwise you might have issues with your existing DNS server."
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup
+}