Fix for the reload rule in the init script to use the original start rule so we don't accidently drop some options/config.

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

4 files changed, 383 insertions, 12 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 28a2e7df4747..5d2bf7d59fd4 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.101 2011/04/04 14:51:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.102 2011/04/12 21:36:28 cardoe Exp $
+
+*libvirt-0.9.0-r1 (12 Apr 2011)
+
+  12 Apr 2011; Doug Goldstein <cardoe@gentoo.org> +libvirt-0.9.0-r1.ebuild,
+  +files/libvirtd.init-r3:
+  Fix for the reload rule in the init script to use the original start rule so
+  we don't accidently drop some options/config.
 
 *libvirt-0.9.0 (04 Apr 2011)
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 18f7349b729c..3eab67afa040 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libvirtd.confd-r1 1248 RMD160 ebd5f28c671f2d26e9ff5d4879f959c11d72d7e3 SHA1 4789a80343f06b535d6bc27ef4206704c548c078 SHA256 851ab3f9678f0fa9c3ee03f7fc7bd00c4ee86d5f0777eecf9eb1ffe3243adfd1
 AUX libvirtd.confd-r2 1749 RMD160 30c662b9a14a3dc635674d0aee6452076da60102 SHA1 ae7a2b801ca0f9f610c015eb0fe06640596ac614 SHA256 93040599a7cb878b54b8b963ef4963e9450bc25e982e390cef3e5b7e8039757c
 AUX libvirtd.init-r1 2558 RMD160 d87b527e9917ef926045fa07e809dc4527f04af7 SHA1 b483a176d650cbf80d64d8da2b5165f62fc23e7f SHA256 03020823683a3374f05a0a45e023037433b2b6fc4c7c8d52ed90f61f3d3f5b7b
 AUX libvirtd.init-r2 3407 RMD160 9a5cf8a0d3bc4097871d8cf1581fc5a858e22abd SHA1 79e3d9848f03f66fc3bd5c438231a84b1bf3588e SHA256 8fb9a912cdf4974cfa7d23762468f67b5b2ef74620ce0c7270c72b4a8a691eef
+AUX libvirtd.init-r3 3319 RMD160 c28af7ed59542ce643035bc61a4a64a0b2a48296 SHA1 12a98743f532a7bab0ecbf7a993d9413bfe0220d SHA256 f0d4ea1125c8c3f02adae1c1d918ff3f393009f867aedb678ccb1dbb9babbb88
 DIST libvirt-0.8.5-backports-2.tar.bz2 4213 RMD160 9d146f0f5e40d8e7d56d76561c67b40f30181b3c SHA1 aaeb6c97df52393d419ece2b1eec609cb3c7e9bf SHA256 4ad5b0aa099c31e6c653509ce361f405c13c6a2e3da23b47b12b6ba81ba30cf2
 DIST libvirt-0.8.5.tar.gz 13054019 RMD160 76c16d6b96fce74ab805e1f5cd4f7568dec6f48b SHA1 357da4d90d7730e6e529f086271d425a406c9c46 SHA256 0d4e6aa61ecbfccd3f3289a9821742d599db546eb3f37fe05036a616b3a9df8d
 DIST libvirt-0.8.8-backports-1.tar.bz2 1321 RMD160 e10e1062abe8c03fb3d872bd0ce5700ec8e6dc08 SHA1 383181c7e2df7f5111ef26e93b48c2d7da13820b SHA256 15135a4f5170fc04dbc0a26a8c17783e343a3a48768dfbfa21108c621e82b8b3
@@ -12,14 +10,8 @@ DIST libvirt-0.8.8.tar.gz 14150587 RMD160 2009761fa7cb01300d7c8c566ea8613f232899
 DIST libvirt-0.9.0.tar.gz 14565612 RMD160 1a0e7483e4bd27ed132e54632eee086c92921d38 SHA1 c540578acbd59ff77540664b99b7521bc94c4898 SHA256 7ebdc1fc1295db5bd11ca7b0f11c4abc6ec39b83005f00b3043bc9f711b09066
 EBUILD libvirt-0.8.5-r2.ebuild 7268 RMD160 27f3307e8dcbdbd57fff5c21caab67b38fa8ff86 SHA1 76e5534c0f341f6e39a9080081a72c84c2a1152b SHA256 2f9d79266501279652972a5ad8467a6a3002ce70a645f2d4d8cb8770ad98138f
 EBUILD libvirt-0.8.8-r1.ebuild 7548 RMD160 d34bbb2e76df333473088c4b12c8013da3fa5967 SHA1 fca2bd636d90ff41831cc72ef0dda5d6efd48abb SHA256 c90192d013ef4d8335c6c372e29ab615706e65cd799d2c67e2dc2b8bd778ff26
+EBUILD libvirt-0.9.0-r1.ebuild 7674 RMD160 d3167e935533f5cc0e30b24bd84d8497675e80b2 SHA1 1e3458671ad72c88fe8684ef0860ad80242ae271 SHA256 9dcfd55b0af9e280f577ff6a8f7f244c419e5d5b947caf93c5fec93582433e7f
 EBUILD libvirt-0.9.0.ebuild 7674 RMD160 7c6791c4ae5f811df74c5e8feb6672f526c041b6 SHA1 bab9358cc665cdc9a9ce2d40763e02d003525c6e SHA256 62f5d3e4e65916cf9fd37f07e1a55e7283d0bb2844ed2c03173f0f2384a8354d
 EBUILD libvirt-9999.ebuild 8054 RMD160 50f8c88a144ae2045d2e82b6825029230242f132 SHA1 5237c1aaa51cdd6af86c483ebff824860425e068 SHA256 c99762c8e13609ca0965b3584a0d26a356d76ecfb508f056992c9b3b71c84e8c
-MISC ChangeLog 22450 RMD160 8f62f574e0b87b2ad39ead1bab6ba0f1ec67a7fe SHA1 9958102081ca4efb33bc484c615dbe1a19c785bc SHA256 c3f505a1e75222b01d57d483b00a19a7a1985969465711ad4af66e8763c295e5
+MISC ChangeLog 22711 RMD160 ddca8453f810000317f15e29dfffb33fef305fb8 SHA1 fb259a7b3d2dc786c43531c7db50f641d458f4f7 SHA256 abaac1a7629f02afa6d7323a5662f47cd6634b7c4731f56e6c271c9057aa6d70
 MISC metadata.xml 3026 RMD160 c45bdcd924b283330b1211abc505e106f2ceb2b1 SHA1 ca4308eec5a3e7c6419a24f9ca06fdea64ccec8e SHA256 7f7722b3a05787803ae3bda78ceccbc1c48a8d53d80f98a7a1327e988fe9ea41
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2Z2v4ACgkQAiZjviIA2XgtEwCfWJn2aisVVPhFxVozTHLuhHq6
-cJAAoIKZBnqt2d2jbIWhjICi/4VZXZmj
-=hR2H
------END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/files/libvirtd.init-r3 b/app-emulation/libvirt/files/libvirtd.init-r3
new file mode 100755
index 000000000000..87f2e87d64d8
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirtd.init-r3
@@ -0,0 +1,119 @@
+#!/sbin/runscript
+
+opts="start stop status reload restart"
+
+depend() {
+    need net
+    before sshd ntp-client ntpd nfs nfsmount rsyncd portmap dhcp
+}
+
+libvirtd_virsh() {
+    # Silence errors because virsh always throws an error about
+    # not finding the hypervisor version when connecting to libvirtd
+    LC_ALL=C virsh -c qemu:///system "$@" 2>/dev/null
+}
+
+libvirtd_dom_list() {
+    # Make sure that it wouldn't be confused if the domain name
+    # contains the word running.
+    libvirtd_virsh list | awk '$3 == "running" { print $1 }'
+}
+
+libvirtd_dom_count() {
+    # Make sure that it wouldn't be confused if the domain name
+    # contains the word running.
+    libvirtd_virsh list | awk 'BEGIN { count = 0 } \
+		$3 == "running" { count++ } \
+		END { print count }'
+}
+
+libvirtd_net_list() {
+	# The purpose of the awk is to avoid networks with 'active' in the name
+	libvirtd_virsh net-list | awk '$2 == "active" { print $1 }'
+}
+
+libvirtd_net_count() {
+	# The purpose of the awk is to avoid networks with 'active' in the name
+	libvirtd_virsh net-list | awk 'BEGIN { count = 0 } \
+		$2 == "active" { count++ } \
+		END { print count }'
+}
+
+
+start() {
+    ebegin "Starting libvirtd"
+    start-stop-daemon --start \
+        --env KRB5_KTNAME=/etc/libvirt/krb5.tab \
+        --exec /usr/sbin/libvirtd -- -d ${LIBVIRTD_OPTS}
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping libvirtd"
+    # try to shutdown all (KVM/Qemu) domains
+    DOM_COUNT="$(libvirtd_dom_count)"
+    if [ "${LIBVIRTD_KVM_SHUTDOWN}" != "none" ] \
+        && [ "${DOM_COUNT}" != "0" ] ; then
+
+        einfo " Shutting down domain(s):"
+        for DOM_ID in $(libvirtd_dom_list) ; do
+            NAME="$(libvirtd_virsh domname ${DOM_ID} | head -n 1)"
+            einfo "   ${NAME}"
+            libvirtd_virsh ${LIBVIRTD_KVM_SHUTDOWN} ${DOM_ID} > /dev/null
+        done
+
+        if [ -n "${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}" ] ; then
+            COUNTER="${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}"
+        else
+            COUNTER=500
+        fi
+
+		if [ "${LIBVIRTD_KVM_SHUTDOWN}" = "shutdown" ]; then
+			einfo " Waiting ${COUNTER} seconds while domains shutdown ..."
+			DOM_COUNT="$(libvirtd_dom_count)"
+			while [ ${DOM_COUNT} -gt 0 ] && [ ${COUNTER} -gt 0 ] ; do
+				DOM_COUNT="$(libvirtd_dom_count)"
+					sleep 1
+					COUNTER=$((${COUNTER} - 1))
+					echo -n "."
+			done
+		fi
+
+        DOM_COUNT="$(libvirtd_dom_count)"
+        if [ "${DOM_COUNT}" != "0" ] ; then
+            eerror " !!! Some guests are still running, stopping anyway"
+        fi
+
+    fi
+
+	NET_COUNT="$(libvirtd_net_count)"
+	if [ "${LIBVIRTD_NET_SHUTDOWN}" != "no" ] \
+		&& [ "${NET_COUNT}" != "0" ]; then
+
+		einfo " Shutting down network(s):"
+			for NET_NAME in $(libvirtd_net_list); do
+				einfo "   ${NET_NAME}"
+				libvirtd_virsh net-destroy ${NET_NAME} > /dev/null
+			done
+
+		NET_COUNT="$(libvirtd_net_count)"
+		if [ "${NET_COUNT}" != "0" ]; then
+			eerror " !!! Some networks are still active, stopping anyway"
+		fi
+	fi
+
+	# Now actually stop the daemon
+    start-stop-daemon --stop --quiet --exec \
+		/usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
+    eend $?
+}
+
+reload() {
+    ebegin "Stopping libvirtd without shutting down your VMs"
+    start-stop-daemon --stop --quiet --exec \
+		/usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
+	eend $?
+
+	# Call the original start function
+	start
+}
diff --git a/app-emulation/libvirt/libvirt-0.9.0-r1.ebuild b/app-emulation/libvirt/libvirt-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..25ed95888307
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-0.9.0-r1.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.0-r1.ebuild,v 1.1 2011/04/12 21:36:28 cardoe Exp $
+
+#BACKPORTS=1
+#AUTOTOOLIZE=yes
+
+EAPI="2"
+
+MY_P="${P/_rc/-rc}"
+
+PYTHON_DEPEND="python? 2:2.4"
+#RESTRICT_PYTHON_ABIS="3.*"
+#SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils python ${AUTOTOOLIZE+autotools}
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
+	ftp://libvirt.org/libvirt/${MY_P}.tar.gz
+	${BACKPORTS:+
+		http://dev.gentoo.org/~flameeyes/${PN}/${MY_P}-backports-${BACKPORTS}.tar.bz2
+		http://dev.gentoo.org/~cardoe/${PN}/${MY_P}-backports-${BACKPORTS}.tar.bz2}"
+S="${WORKDIR}/${P%_rc*}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="avahi caps debug iscsi +json +libvirtd lvm +lxc macvtap +network nfs \
+	nls numa openvz parted pcap phyp policykit python qemu sasl selinux udev \
+	uml virtualbox virt-network xen"
+# IUSE=one : bug #293416 & bug #299011
+
+# 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/libxml2-2.7.6
+	>=dev-libs/libnl-1.1
+	>=net-libs/gnutls-1.0.25
+	sys-fs/sysfsutils
+	sys-apps/util-linux
+	sys-devel/gettext
+	>=net-analyzer/netcat6-1.0-r2
+	avahi? ( >=net-dns/avahi-0.6[dbus] )
+	caps? ( sys-libs/libcap-ng )
+	iscsi? ( sys-block/open-iscsi )
+	json? ( dev-libs/yajl )
+	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-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 app-emulation/qemu-kvm-spice ) )
+	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 )"
+# one? ( dev-libs/xmlrpc-c )
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	[[ -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)"
+	# 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 macvtap)"
+	myconf="${myconf} $(use_with pcap libpcap)"
+
+	## other
+	myconf="${myconf} $(use_enable nls)"
+	myconf="${myconf} $(use_with python)"
+	myconf="${myconf} $(use_with json yajl)"
+
+	## stuff we don't yet support
+	myconf="${myconf} --without-netcf --without-audit"
+
+	# 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-r3" libvirtd || die
+	newconfd "${FILESDIR}/libvirtd.confd-r2" 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 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
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup $(python_get_sitedir)/libvirt.py
+}