Handful of upstream fixes for phyp overflows, documentation errors, qemu PCI device deletion. Local fixes for LXC tun/tap manipulation (pushed upstream).

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 248 insertions, 12 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 1402ceeaae4d..3169f652910e 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.67 2010/08/07 02:43:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.68 2010/08/10 21:23:37 cardoe Exp $
+
+*libvirt-0.8.3-r1 (10 Aug 2010)
+
+  10 Aug 2010; Doug Goldstein <cardoe@gentoo.org> +libvirt-0.8.3-r1.ebuild:
+  Handful of upstream fixes for phyp overflows, documentation errors, qemu
+  PCI device deletion. Local fixes for LXC tun/tap manipulation (pushed
+  upstream).
 
   07 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   libvirt-0.8.3.ebuild:
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 9ce0e9da4cd8..be6fd0402527 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libvirtd.confd 476 RMD160 63b92da0cf0d589c1c6e76551982deb6b5fc8f9a SHA1 5b76082bb28705606758880c19af922dde1ccb01 SHA256 ff2c94d2a64058152be669256d8d2e241cde4356a77bd653eac9fa3b084666f6
 AUX libvirtd.confd-r1 1248 RMD160 ebd5f28c671f2d26e9ff5d4879f959c11d72d7e3 SHA1 4789a80343f06b535d6bc27ef4206704c548c078 SHA256 851ab3f9678f0fa9c3ee03f7fc7bd00c4ee86d5f0777eecf9eb1ffe3243adfd1
 AUX libvirtd.init 2045 RMD160 b544578c242c6f84e2cf07682a06ce261bf40b8a SHA1 81976137c43f6b507e27ac926a6d7947e1a329d3 SHA256 96cbdf8e68a171d170f91167a4217a366325ca668b9e2621ec6800fd35d42c5c
 AUX libvirtd.init-r1 2558 RMD160 d87b527e9917ef926045fa07e809dc4527f04af7 SHA1 b483a176d650cbf80d64d8da2b5165f62fc23e7f SHA256 03020823683a3374f05a0a45e023037433b2b6fc4c7c8d52ed90f61f3d3f5b7b
 DIST libvirt-0.8.2.tar.gz 12230368 RMD160 280c95e74c41c56686a50892105b2c41b196a107 SHA1 553c984e1fc1eae288d32ff911ba5614010bece4 SHA256 69d2bbf2d4057bdb2781a2ba45b2628a0f0312597ef7dd15a6a3d34720b33e60
 DIST libvirt-0.8.3-backports-2.tar.bz2 3667 RMD160 609e1fe166e9c27ed8d3fac04a1db6d2fd374b54 SHA1 5a7faada120ec91088c7e8a357e6554729e3d2c3 SHA256 0dc2d15229acabb6bec3ce1dcf41f483d0a180e82605c274b52af658a4b19529
+DIST libvirt-0.8.3-backports-3.tar.bz2 10617 RMD160 95c85f39cf670cbf9ad5151a00870205791bcb68 SHA1 0ce917e4a1d2210d7528323ef3a892391d3ffb49 SHA256 d9077e107b8e3976a7404090dbf158776fd99837225b4cec65dcca5fd00b0d4c
 DIST libvirt-0.8.3.tar.gz 12430752 RMD160 0ff7561efc45f472c44fc950153cba180222096b SHA1 4dc92139031f2af3141c2b1d0813b57ecd735c5d SHA256 35e1836c3947ac3edd7b4a1948cf13f5f13dd3e5bb31933d627d771b1e997a1f
 EBUILD libvirt-0.8.2-r1.ebuild 6926 RMD160 8bc5173a4ddae68c85d327e24da01dbe0c4d961a SHA1 9a478ef5c144935dc40f6b4992c985b9e0d63a01 SHA256 e85e5e042f9d8a3d5fb61d8e721995883712f26ce2a1139038b0a614036972da
+EBUILD libvirt-0.8.3-r1.ebuild 7085 RMD160 54906eb229a900bec51538324703f4caa7b75dbf SHA1 7cba797b2b7feb8afe6f860c78748c6bad5f3d18 SHA256 7eba4686890d24bcc1e04eb80e60e5f7e2b4aa8178917426e00b16de7ecc3cfb
 EBUILD libvirt-0.8.3.ebuild 7063 RMD160 e930998fc5d293d1411ad39f749c8097b24144b7 SHA1 a78b3a44dc06fcb914382a6b4f9a1c7ada7ab583 SHA256 06ad01a3bef73b8264e71d9ee92dfef924d7ea100bd2a98610f0740104152ae4
-MISC ChangeLog 15666 RMD160 f90327c06999469460b33a3ca2202741b2f6119e SHA1 7c7dd3a2572008b11d9f70ac0337ebd713c50c11 SHA256 021f8ecdf52a7129914e922437d9f23fe413c1b884e24c35391a7b70353b6658
+MISC ChangeLog 15933 RMD160 7a1226bdb09d19315a5cdae0e6df52fe3e8c276e SHA1 91e435341450e4e69a981a3e931b82ab47a1c4e4 SHA256 5c9be210b04e7ffc33d35f9e916b01b1c7c8ae3ad78de71e567f116c7bf7e237
 MISC metadata.xml 1983 RMD160 c6b39d8d0adfd2a7acd32fecc80ffbdaf667d690 SHA1 1a5a6b78fd2b9e536742301441aebfc4e65bb8ad SHA256 1a781681093c05d500a676f4c72146a87f61144b1b5eabbeb987f1dbb885102d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkxcyIMACgkQAiZjviIA2XhcQACg1860zBXfh8qr7kO6VO6rONW2
-5JAAoPKxDBeTIJ4gFS8sAXfbrtdVBNlo
-=c5pS
------END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-0.8.3-r1.ebuild b/app-emulation/libvirt/libvirt-0.8.3-r1.ebuild
new file mode 100644
index 000000000000..c118ab495175
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-0.8.3-r1.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.8.3-r1.ebuild,v 1.1 2010/08/10 21:23:37 cardoe Exp $
+
+BACKPORTS=3
+
+EAPI="2"
+
+PYTHON_DEPEND="python? 2:2.4"
+#RESTRICT_PYTHON_ABIS="3.*"
+#SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils python autotools
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+SRC_URI="http://libvirt.org/sources/${P}.tar.gz
+	${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="avahi caps debug iscsi +libvirtd lvm +lxc macvtap +network nfs nls \
+	numa openvz parted pcap phyp policykit python qemu sasl selinux
+	uml virtualbox xen udev"
+# IUSE=one : bug #293416 & bug #299011
+
+RDEPEND="sys-libs/readline
+	sys-libs/ncurses
+	>=net-misc/curl-7.18.0
+	>=dev-libs/libxml2-2.7.6
+	>=net-libs/gnutls-1.0.25
+	sys-fs/sysfsutils
+	sys-apps/util-linux
+	>=net-analyzer/netcat6-1.0-r2
+	avahi? ( >=net-dns/avahi-0.6[dbus] )
+	caps? ( sys-libs/libcap-ng )
+	iscsi? ( sys-block/open-iscsi )
+	libvirtd? ( net-misc/bridge-utils )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
+	macvtap? ( >=dev-libs/libnl-1.1 )
+	nfs? ( net-fs/nfs-utils )
+	numa? ( sys-process/numactl )
+	openvz? ( sys-kernel/openvz-sources )
+	parted? ( >=sys-apps/parted-1.8 )
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	phyp? ( net-libs/libssh2 )
+	policykit? ( >=sys-auth/polkit-0.9 )
+	qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	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 )"
+# one? ( dev-libs/xmlrpc-c )
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	myconf="${myconf} $(use_enable debug)"
+
+	## 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)"
+	if use virtualbox && has_version app-emulation/virtualbox-ose; then
+		myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
+	else
+		myconf="${myconf} $(use_with virtualbox vbox)"
+	fi
+	myconf="${myconf} $(use_with uml)"
+	myconf="${myconf} $(use_with qemu)"
+	# 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)"
+
+	# network biits
+	myconf="${myconf} $(use_with pcap libpcap)"
+	myconf="${myconf} $(use_with macvtap)"
+
+	## other
+	myconf="${myconf} $(use_enable nls)"
+	myconf="${myconf} $(use_with python)"
+
+	## stuff we don't yet support
+	myconf="${myconf} --without-netcf"
+
+	# we use udev over hal
+	myconf="${myconf} --without-hal"
+
+	# this is a nasty trick to work around the problem in bug
+	# #275073. The reason why we don't solve this properly is that
+	# it'll require us to rebuild autotools (and we don't really want
+	# to do that right now). The proper solution has been sent
+	# upstream and should hopefully land in 0.7.7, in the mean time,
+	# mime the same functionality with this.
+	case ${CHOST} in
+		*cygwin* | *mingw* )
+			;;
+		*)
+			ac_cv_prog_WINDRES=no
+			;;
+	esac
+
+	econf \
+		${myconf} \
+		--disable-static \
+		--docdir=/usr/share/doc/${PF} \
+		--with-remote \
+		--localstatedir=/var \
+		--with-remote-pid-file=/var/run/libvirtd.pid
+}
+
+src_test() {
+	# Explicitly allow parallel build of tests
+	emake check || die "tests failed"
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		HTML_DIR=/usr/share/doc/${PF}/html \
+		DOCS_DIR=/usr/share/doc/${PF}/python \
+		EXAMPLE_DIR=/usr/share/doc/${PF}/python/examples \
+		|| die "emake install failed"
+
+	find "${D}" -name '*.la' -delete || die
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newinitd "${FILESDIR}/libvirtd.init-r1" libvirtd || die
+	newconfd "${FILESDIR}/libvirtd.confd-r1" libvirtd || die
+
+	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
+
+	# We really don't want to use or support old PolicyKit cause it
+	# screws with the new polkit integration
+	if has_version sys-auth/policykit; then
+		rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
+	fi
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize $(python_get_sitedir)/libvirt.py
+
+	elog
+	if use policykit && has_version sys-auth/policykit; then
+		elog "You must have run the following at least once:"
+		elog
+		elog "$ polkit-auth --grant org.libvirt.unix.manage --user \"USERNAME\""
+		elog
+		elog "to grant USERNAME access to libvirt when using USE=policykit"
+	else
+		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"
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	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
+	if has_version net-dns/dnsmasq; then
+		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"
+		ewarn
+		ewarn "Otherwise you might have issues with your existing DNS server."
+	fi
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup $(python_get_sitedir)/libvirt.py
+}