From d41accd2f8588f9868b6318451a478da0cf1a030 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Thu, 28 May 2009 21:57:26 +0000 Subject: upstream patch to not print out the raw uuid and print out an ascii capable copy Package-Manager: portage-2.1.6.13/cvs/Linux x86_64 --- app-emulation/libvirt/ChangeLog | 9 +- app-emulation/libvirt/Manifest | 10 +- .../files/libvirt-0.6.3-print-ascii-uuid.patch | 21 ++++ app-emulation/libvirt/libvirt-0.6.3-r3.ebuild | 122 +++++++++++++++++++++ 4 files changed, 157 insertions(+), 5 deletions(-) create mode 100644 app-emulation/libvirt/files/libvirt-0.6.3-print-ascii-uuid.patch create mode 100644 app-emulation/libvirt/libvirt-0.6.3-r3.ebuild (limited to 'app-emulation') diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog index 64c2216de478..3b5c55f1fc13 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.25 2009/05/28 16:27:25 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.26 2009/05/28 21:57:26 cardoe Exp $ + +*libvirt-0.6.3-r3 (28 May 2009) + + 28 May 2009; Doug Goldstein +libvirt-0.6.3-r3.ebuild, + +files/libvirt-0.6.3-print-ascii-uuid.patch: + upstream patch to not print out the raw uuid and print out an ascii + capable copy *libvirt-0.6.3-r2 (28 May 2009) diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index 12530eec3ef3..570ce79c2dec 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -16,6 +16,7 @@ AUX libvirt-0.6.2-storage-fix.patch 529 RMD160 201adef5a0df14d79cec60133e7dfa6b9 AUX libvirt-0.6.3-hostdev-managed.patch 1555 RMD160 43e43885281d672f6d50221db4c92f55f1b34fa8 SHA1 8fb24ef22a59d835a7478539f5e32021092a3b93 SHA256 de786ab66a9c0fa300ebf28cb6d085dea065be25df034efa54e01aef75d4b9d1 AUX libvirt-0.6.3-kvm-85-argv-detection.patch 2965 RMD160 2da23e5716286923d8b6ee006064877199d474b4 SHA1 86224a000b9c19aff7f65cabaf6da95c7c9b1c3f SHA256 5b6d0739de10766d834e7db2cf72e713344ac0ce4e5a8fe8632fab7301588d89 AUX libvirt-0.6.3-kvm-img.patch 9798 RMD160 f656b7a23c03f40d4f19ef9d02b531cca2d6d01b SHA1 407fbcf9278f4624a273f28ad07faa480c6a29a2 SHA256 58fc0f213e326220842759a46bca9242bf11b0acf0d54dd314062767c05dcd6e +AUX libvirt-0.6.3-print-ascii-uuid.patch 755 RMD160 07483a7786db905808d395880ffc306298043111 SHA1 103b297df087a31a5a69864be3df69fd59370ef9 SHA256 02c3cab750cb27667209ab1a909207c68e0cb768121a48640a9599d6caf108b0 AUX libvirt-0.6.3-refresh-qemu-caps.patch 2456 RMD160 0ead0b48db4f9d242fdc8b7669f019bd7cf88531 SHA1 7b53245b4f8c6d015ff81463f709207702e597a8 SHA256 5080be32e2ecfe00fac2cff36036b1d3b05028c39677b2840b87d6ab10213b20 AUX libvirtd.confd 476 RMD160 63b92da0cf0d589c1c6e76551982deb6b5fc8f9a SHA1 5b76082bb28705606758880c19af922dde1ccb01 SHA256 ff2c94d2a64058152be669256d8d2e241cde4356a77bd653eac9fa3b084666f6 AUX libvirtd.init 2045 RMD160 b544578c242c6f84e2cf07682a06ce261bf40b8a SHA1 81976137c43f6b507e27ac926a6d7947e1a329d3 SHA256 96cbdf8e68a171d170f91167a4217a366325ca668b9e2621ec6800fd35d42c5c @@ -28,13 +29,14 @@ EBUILD libvirt-0.5.1.ebuild 2905 RMD160 6733abae4fbaf18cc20dd9bef5b40e752b9deefa EBUILD libvirt-0.6.2.ebuild 2849 RMD160 8141f7fdb011bb429835d7cbc3a06edcb989168e SHA1 b35409b28d0ec4a083f0ce7eb8781c061ede7f45 SHA256 aa03f0f69c23602034a895c0ba485b36b67174c0c9ce9987a4775f832e7c54ba EBUILD libvirt-0.6.3-r1.ebuild 2987 RMD160 4493936640e06682a80c41bded9eabfc77ebccd4 SHA1 da25bcea725f0cb7a45fb18363243b2cd5f0c52b SHA256 0feda2adfa6cd507023dd7f4f54b1b6ccb608a55eb5ca1cac31b651f3092e428 EBUILD libvirt-0.6.3-r2.ebuild 3713 RMD160 2f096a98706147aa4524a50190db3603fdab3831 SHA1 17e30f16be072f54e023825431a0b5e3129064cc SHA256 7afab22c8571f9ed626b7c4832b88cf83c2d38cfbcf8bcc18f117a25ba2e25ea +EBUILD libvirt-0.6.3-r3.ebuild 3823 RMD160 ad581388122243e3c9769239e8671305f48e0756 SHA1 1ba3110c41faea6100a4e512310bb3afc8655416 SHA256 febffabbc7db7ad1f57d7d5b91d0426dd5db095113cf0ff044ce62a1d00613a2 EBUILD libvirt-0.6.3.ebuild 2869 RMD160 13feccad2c48a8c8a2fd31f700390accbe0132e3 SHA1 88ed24d66d0081bcba9e73190b1bea8d1c1a4aa6 SHA256 f9a369c53414c0b0b8f0c536a6d277be419ead42e955eefd2e6b173b05a981eb -MISC ChangeLog 6390 RMD160 2523c0d64d5235a8997360e2f9180926cbd755b0 SHA1 7232e9eb92aa432f4f95f76ca82b9ac407e9ec79 SHA256 b6b7a668706491001467cb42fef32b2f53d3b7485ee64893dc761bb0d0eaf5ac +MISC ChangeLog 6632 RMD160 98e12692c5aa11747ea4ead5da82f6f69a433709 SHA1 4956794cf9ae97d49a12aceb2110140e5fd32ba8 SHA256 933d54026c7a05d8a14087d4979bd4dc87c29ba8c189230375b8a8414493909c MISC metadata.xml 1449 RMD160 0336423f85fef23bc6c85866649eeb089ad5010d SHA1 159a4f62926dcdfdc09d646d7854741d3dc7bb24 SHA256 f3a5571f781eb774cd57d873b24c8058704ab4fb2c63ce25ae7caee87ed9db12 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkoeu74ACgkQoeSe8B0zEfyScgCfR17Sb89sUzxsTDiuqpF/AYqF -Mi8AoIPzwKSj0QgbKM/+HxJgbmoZF/4/ -=CpLu +iEYEARECAAYFAkofCOAACgkQoeSe8B0zEfwWFwCfVTxTHrOzDNv69s6iz7HA8Sg8 +YKcAn24ZqSVy+NsMcfJxYs23dKPzQ1rK +=OWpt -----END PGP SIGNATURE----- diff --git a/app-emulation/libvirt/files/libvirt-0.6.3-print-ascii-uuid.patch b/app-emulation/libvirt/files/libvirt-0.6.3-print-ascii-uuid.patch new file mode 100644 index 000000000000..054a5716cbb8 --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-0.6.3-print-ascii-uuid.patch @@ -0,0 +1,21 @@ +Currently we print the raw UUID which isn't very useful in ascii format. + +Signed-off-by: Cole Robinson +--- + src/qemu_driver.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/qemu_driver.c b/src/qemu_driver.c +index 40f5790..9bd7d03 100644 +--- a/src/qemu_driver.c ++++ b/src/qemu_driver.c +@@ -2043,7 +2043,7 @@ static virDomainPtr qemudDomainLookupByUUID(virConnectPtr conn, + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(uuid, uuidstr); + qemudReportError(conn, NULL, NULL, VIR_ERR_NO_DOMAIN, +- _("no domain with matching uuid '%s'"), uuid); ++ _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + diff --git a/app-emulation/libvirt/libvirt-0.6.3-r3.ebuild b/app-emulation/libvirt/libvirt-0.6.3-r3.ebuild new file mode 100644 index 000000000000..eafb466a100d --- /dev/null +++ b/app-emulation/libvirt/libvirt-0.6.3-r3.ebuild @@ -0,0 +1,122 @@ +# 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.6.3-r3.ebuild,v 1.1 2009/05/28 21:57:26 cardoe Exp $ + +EAPI="2" + +inherit eutils autotools confutils + +DESCRIPTION="C toolkit to manipulate virtual machines" +HOMEPAGE="http://www.libvirt.org/" +SRC_URI="http://libvirt.org/sources/${P}.tar.gz" +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="avahi iscsi hal kvm lvm +lxc +network nls numa openvz policykit \ + parted qemu sasl selinux uml virtualbox xen" +# devicekit isn't in portage + +RDEPEND="sys-libs/readline + sys-libs/ncurses + >=dev-libs/libxml2-2.5 + >=net-libs/gnutls-1.0.25 + dev-lang/python + sys-fs/sysfsutils + net-analyzer/netcat + avahi? ( >=net-dns/avahi-0.6 ) + iscsi? ( sys-block/open-iscsi ) + kvm? ( app-emulation/kvm ) + lvm? ( sys-fs/lvm2 ) + network? ( net-misc/bridge-utils net-dns/dnsmasq net-firewall/iptables ) + numa? ( sys-process/numactl ) + openvz? ( sys-kernel/openvz-sources ) + parted? ( >=sys-apps/parted-1.8 ) + policykit? ( >=sys-auth/policykit-0.6 ) + qemu? ( >=app-emulation/qemu-0.10.0 ) + sasl? ( dev-libs/cyrus-sasl ) + selinux? ( sys-libs/libselinux ) + virtualbox? ( >=app-emulation/virtualbox-bin-2.2.0 ) + xen? ( app-emulation/xen-tools app-emulation/xen )" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +src_prepare() { + # Fix argv handling for KVM 85 and newer + epatch "${FILESDIR}/${P}-kvm-85-argv-detection.patch" + # Patch sent upstream for working with kvm-img + epatch "${FILESDIR}/${P}-kvm-img.patch" + # upstream patch. fix shared/read-only disk labeling + epatch "${FILESDIR}/${PN}-0.6.2-shared-readonly-label.patch" + # upstream patch. fix + epatch "${FILESDIR}/${P}-hostdev-managed.patch" + # upstream patch. refresh qemu caps when getCapabilities is called + epatch "${FILESDIR}/${P}-refresh-qemu-caps.patch" + # upstream patch. enable migration support which appeared in QEMU 0.10.0 + epatch "${FILESDIR}/${PN}-0.6.2-enable-qemu-0-10-migration.patch" + # upstream patch. don't try to label a disk with no path (empty cdrom) + epatch "${FILESDIR}/${PN}-0.6.2-fix-nosource-label.patch" + # upstream patch. don't print raw uuid instead print ascii + epatch "${FILESDIR}/${P}-print-ascii-uuid.patch" + + eautoreconf +} + +pkg_setup() { + confutils_require_any lxc kvm openvz qemu uml virtualbox xen +} + +src_configure() { + local my_conf="" + if use qemu || use kvm ; then + my_conf="--with-qemu" + else + my_conf="--without-qemu" + fi + + econf \ + $(use_with iscsi storage-iscsi) \ + $(use_with lvm storage-lvm) \ + $(use_with parted storage-disk) \ + $(use_with lxc) \ + $(use_with openvz) \ + $(use_with uml) \ + $(use_with virtualbox vbox) \ + $(use_with xen) \ + $(use_with xen xen-inotify) \ + $(use_with avahi) \ + $(use_with hal) \ + $(use_with sasl) \ + $(use_with network) \ + $(use_with policykit polkit) \ + $(use_with selinux) \ + $(use_enable nls) \ + $(use_with numa numactl) \ + ${my_conf} \ + --without-devkit \ + --with-remote \ + --disable-iptables-lokkit \ + --localstatedir=/var \ + --with-remote-pid-file=/var/run/libvirtd.pid +} + +src_install() { + emake DESTDIR="${D}" install || die "emake instal lfailed" + 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_postinst() { + 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 + 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." +} -- cgit v1.2.3-65-gdbad