Version bump. Added support for dropping privileges when USE=caps.

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

3 files changed, 330 insertions, 2 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index e5de8c9bcf74..8bea015b4140 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.181 2012/06/04 06:56:04 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.182 2012/06/04 07:59:24 cardoe Exp $
+
+*libvirt-0.9.12 (04 Jun 2012)
+
+  04 Jun 2012; Doug Goldstein <cardoe@gentoo.org> +libvirt-0.9.12.ebuild:
+  Version bump. Added support for dropping privileges when USE=caps.
 
   04 Jun 2012; Doug Goldstein <cardoe@gentoo.org> libvirt-0.9.11.3.ebuild:
   add missing depend on sys-power/pm-utils and remove no long necessary
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 3fa3949f258c..b0fe3f42b1af 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -5,10 +5,12 @@ AUX libvirtd.init-r8 3630 RMD160 777010696a9a2a28cc7dea97e0161d04a1d3f019 SHA1 8
 DIST libvirt-0.9.10-bp-1.tar.bz2 4359 RMD160 1b064c56007001f509cd0e940ec337d6281b19bb SHA1 ba11fd52aec15fb80e461a1fbc49c142e58ed3b5 SHA256 038791b47489a831718f98ba9cdf77cff88a6e26003f81a0c2f11581f0bde4a3
 DIST libvirt-0.9.10.tar.gz 19085438 RMD160 8f103b176fc7b943a88cf7196709865edc5db5e8 SHA1 cf32d6bea295cb30461901d987f049c9547ff1e8 SHA256 5b81d9f054ee4b395b0ab4f59845d082baaa6d6c2a038c966309156dde16e11d
 DIST libvirt-0.9.11.3.tar.gz 19615688 RMD160 dcfb5c7e9bd5a35d08c8940f3e24164f71a04276 SHA1 2bcb00a901113f53fb5eb3fd2d2a3b3e68dcc0f4 SHA256 aa73b329d2f6eb200991b9dc378d4636c15cd2f95ca224995d01b45257584fa2
+DIST libvirt-0.9.12.tar.gz 20054618 RMD160 16b38dc2e2f5df9b427ca89ab8c1fb25b63e17e1 SHA1 3743dc4f3e58d5912a98f568c3e854d97d81f216 SHA256 298ffc7f2a6d6e78aae46f11a0980f4bc17fa2928f5de6cd9e8abaf5990336e7
 DIST libvirt-0.9.8.tar.gz 18403525 RMD160 51bfb25dbd11a7cb5529c692d843f8ac2b1c9101 SHA1 09df699513af63b73444d776c2d02945dc9cee43 SHA256 31b20864e44bb18a2d01b7ac6569f114cbe1007689219bf24a07ddb7528abe0e
 EBUILD libvirt-0.9.10-r4.ebuild 8658 RMD160 7691ed9211245ed2462630ec8e381e6642155469 SHA1 fef44256645b351171db8c23990757f20d3ef8eb SHA256 bd7bb56f8da698a427c18eac46f58d1588766870164aa384516b182b6a38fded
 EBUILD libvirt-0.9.11.3.ebuild 8688 RMD160 1de6e70be7fdbb1c562a5dd27cf13c2a833265a0 SHA1 bc2e8ddcd6a12cdd753f653596f2293d3784ee82 SHA256 cbc4574d458e3251e35f36c822f8fdd75a2eeced01387a5cfad2f4e474483059
+EBUILD libvirt-0.9.12.ebuild 9384 RMD160 cb1f6162448633a42caa9a0874b29fd13e8ba4aa SHA1 314a4d97ed43635d989acf74f9427bcf33da53ec SHA256 20e8794f5d630b44650a5011feb129673610bef1bc48f1dc5a0d8243703fdb3c
 EBUILD libvirt-0.9.8.ebuild 8137 RMD160 2f7227550ec9d17fecf1e0ff0d33482e7dad2068 SHA1 698e1d44160d8ecffd3dafc1a10bdc8f48f19282 SHA256 2892e8b77eab033b317847974b67212bede163a77449b2be5097abd9ae9dfd44
 EBUILD libvirt-9999.ebuild 8670 RMD160 c337a70db3f2c8f18191fddc132c2818af391384 SHA1 e50e5ef31cc4a08f210b84d88654966134f9c89f SHA256 55309620dcbfa89f97511bbde97e9cc60293b1d55503dcc179c655f7d2ef716b
-MISC ChangeLog 36284 RMD160 985209e7b0900de8e3711bf91d5894b9dc398783 SHA1 9f2cc0e5738e428098f354842786b82fe1c5c9d5 SHA256 913c301b21bc4aed10006d585c08bcb439368bba4b0af3d4130af290bd2f67ac
+MISC ChangeLog 36459 RMD160 004e3b2d47d864d2b5a9bdf907fd70c4cd4afd10 SHA1 f13c187f8e2345f4c4e250fc94f9553e94866a05 SHA256 3f0ac70d91dd1f1c3e3ecb50fd80e8306a01792a4c58e6a4c52816484c87c869
 MISC metadata.xml 3132 RMD160 066870c02fd835f9a633b69328367737d4cc0b71 SHA1 940cc910ef4d1a75947afef95d73a3026bb91527 SHA256 e0eb882799f41f51c9930a1142cf5427061bdacf629a028ac4e8b65c1cf67ea4
diff --git a/app-emulation/libvirt/libvirt-0.9.12.ebuild b/app-emulation/libvirt/libvirt-0.9.12.ebuild
new file mode 100644
index 000000000000..7d071f38cfbb
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-0.9.12.ebuild
@@ -0,0 +1,321 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.12.ebuild,v 1.1 2012/06/04 07:59:24 cardoe Exp $
+
+EAPI=4
+
+#BACKPORTS=1
+#AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+	AUTOTOOLIZE=yes
+fi
+
+PYTHON_DEPEND="python? 2:2.5"
+#RESTRICT_PYTHON_ABIS="3.*"
+#SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils python user autotools
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-2
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
+		ftp://libvirt.org/libvirt/${MY_P}.tar.gz
+		${BACKPORTS:+
+			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-bp-${BACKPORTS}.tar.bz2}"
+	KEYWORDS="~amd64 ~x86"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="avahi +caps debug iscsi +libvirtd lvm +lxc macvtap nfs \
+	nls numa openvz parted pcap phyp policykit python qemu sasl selinux +udev \
+	uml virtualbox virt-network xen elibc_glibc"
+# IUSE=one : bug #293416 & bug #299011
+REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+	lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd )
+	virtualbox? ( libvirtd ) xen? ( libvirtd )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+RDEPEND="sys-libs/readline
+	sys-libs/ncurses
+	>=net-misc/curl-7.18.0
+	dev-libs/libgcrypt
+	>=dev-libs/libxml2-2.7.6
+	dev-libs/libnl:3
+	>=net-libs/gnutls-1.0.25
+	sys-apps/dmidecode
+	>=sys-apps/util-linux-2.17
+	sys-devel/gettext
+	>=net-analyzer/netcat6-1.0-r2
+	app-misc/scrub
+	avahi? ( >=net-dns/avahi-0.6[dbus] )
+	caps? ( sys-libs/libcap-ng )
+	iscsi? ( sys-block/open-iscsi )
+	lxc? ( sys-power/pm-utils )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
+	nfs? ( net-fs/nfs-utils )
+	numa? ( >sys-process/numactl-2.0.2 )
+	openvz? ( sys-kernel/openvz-sources )
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2
+	)
+	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 )
+		dev-libs/yajl
+		sys-power/pm-utils
+	)
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virtualbox? ( || ( app-emulation/virtualbox >=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 )
+	virt-network? ( net-dns/dnsmasq
+		>=net-firewall/iptables-1.4.10
+		net-firewall/ebtables
+		sys-apps/iproute2[-minimal] )
+	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
+# one? ( dev-libs/xmlrpc-c )
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-text/xhtml1"
+
+pkg_setup() {
+	use python && python_set_active_version 2
+	python_pkg_setup
+
+	enewgroup qemu 77
+	enewuser qemu 77 -1 -1 qemu
+}
+
+src_prepare() {
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	if [[ ${PV} = *9999* ]]; then
+
+		# git checkouts require bootstrapping to create the configure script.
+		# Additionally the submodules must be cloned to the right locations
+		# bug #377279
+		./bootstrap || die "bootstrap failed"
+		(
+			git submodule status | sed 's/^[ +-]//;s/ .*//'
+			git hash-object bootstrap.conf
+		) >.git-module-status
+	fi
+
+	epatch_user
+
+	[[ -n ${AUTOTOOLIZE} ]] && 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)"
+	 # leave it automagic as it depends on the version of xen used.
+	use xen || myconf+=" --without-libxl"
+
+	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)"
+	myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP
+	# 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 virt-network 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} --without-storage-rbd"
+	myconf="${myconf} $(use_with numa numactl)"
+	myconf="${myconf} --without-numad"
+	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 bits
+	myconf="${myconf} $(use_with macvtap)"
+	myconf="${myconf} $(use_with pcap libpcap)"
+
+	## other
+	myconf="${myconf} $(use_enable nls)"
+	myconf="${myconf} $(use_with python)"
+
+	# user privilege bits fir qemu/kvm
+	if use caps; then
+		myconf="${myconf} --with-qemu-user=qemu"
+		myconf="${myconf} --with-qemu-group=qemu"
+	else
+		myconf="${myconf} --with-qemu-user=root"
+		myconf="${myconf} --with-qemu-group=root"
+	fi
+
+	## stuff we don't yet support
+	myconf="${myconf} --without-netcf --without-audit"
+
+	# we use udev over hal
+	myconf="${myconf} --without-hal"
+
+	# locking support
+	myconf="${myconf} --without-sanlock"
+
+	# 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
+
+	if [[ ${PV} = *9999* ]]; then
+		# Restore gnulib's config.sub and config.guess
+		# bug #377279
+		(cd .gnulib && git reset --hard > /dev/null)
+	fi
+}
+
+src_test() {
+	# Explicitly allow parallel build of tests
+	HOME="${T}" 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-r8" libvirtd || die
+	newconfd "${FILESDIR}/libvirtd.confd-r3" 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
+
+	# Only sysctl files ending in .conf work
+	mv "${D}"/etc/sysctl.d/libvirtd "${D}"/etc/sysctl.d/libvirtd.conf
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize libvirt.py
+
+	# support for dropped privileges
+	fperms 0750 "${EROOT}/var/lib/libvirt/qemu"
+	fperms 0750 "${EROOT}/var/cache/libvirt/qemu"
+	if use caps && use qemu; then
+		fowners -R qemu:qemu "${EROOT}/var/lib/libvirt/qemu"
+		fowners -R qemu:qemu "${EROOT}/var/cache/libvirt/qemu"
+	else
+		fowners -R root:root "${EROOT}/var/lib/libvirt/qemu"
+		fowners -R root:root "${EROOT}/var/cache/libvirt/qemu"
+	fi
+
+	if ! use policykit; then
+		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 can enable the"
+	elog "'virt-network' USE flag."
+	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
+
+	if use caps && use qemu; then
+		elog "libvirt will now start qemu/kvm VMs with non-root privileges."
+		elog "Ensure any resources your VMs use are accessible by qemu:qemu"
+	fi
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup libvirt.py
+}