Fix issue with default keyring usage. Fixes upstream: https://bugzilla.redhat.com/show_bug.cgi?id=603954 and bug #324027

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

4 files changed, 109 insertions, 2 deletions

diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog
index 704ef6f84bcd..8c887cc9b0f3 100644
--- a/app-emulation/virt-manager/ChangeLog
+++ b/app-emulation/virt-manager/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/virt-manager
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.32 2010/06/12 22:55:23 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.33 2010/06/15 17:29:16 cardoe Exp $
+
+*virt-manager-0.8.4-r2 (15 Jun 2010)
+
+  15 Jun 2010; Doug Goldstein <cardoe@gentoo.org>
+  +virt-manager-0.8.4-r2.ebuild,
+  +files/virt-manager-0.8.4-default-keyring.patch:
+  Fix issue with default keyring usage. Fixes upstream:
+  https://bugzilla.redhat.com/show_bug.cgi?id=603954 and bug #324027
 
   12 Jun 2010; Doug Goldstein <cardoe@gentoo.org>
   +files/virt-manager-0.8.2-ssh-tunnel-shutdown.patch:
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 103e2f917d15..587189918b74 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,8 +1,10 @@
 AUX virt-manager-0.8.2-ssh-tunnel-shutdown.patch 771 RMD160 adea4c43aca12e0d0000b77ffbca5bce5d079735 SHA1 c75731bde811b9e1ee3016e7a977d228dca6a708 SHA256 5ffbb3be721468e0a4e8e7bef34db26a83e29bb118db10015605956f436c40e0
 AUX virt-manager-0.8.4-customize-dialog-xmlparsedoc.patch 723 RMD160 9d390085db8ded74d953c4e6462794f90bd03dc0 SHA1 8b3ec66d07bc12244a8dca520821ef297b0209e2 SHA256 1df75fd9128c056a3f01e9d5bf1a0c389ae2c356986700c39ff94215bb60461b
+AUX virt-manager-0.8.4-default-keyring.patch 1735 RMD160 e18d9d945ba694418a48141cbd50a314880bf625 SHA1 916a1321e1a686e42dac68bd1ff3951bdde3492a SHA256 99b177aa59a5aeba3436cde972f0cb48458b1db6a716bd7f4d629a924607e886
 DIST virt-manager-0.8.3.tar.gz 2223324 RMD160 518bb80f65dc10a69194fada36a0c9c44a9ee6fa SHA1 44ca670397a2f347fb1e1dff014e7525926dbc01 SHA256 c84ba3cead5c1c027eca813049875b99e0683355302f8bdf1c182ff86db825aa
 DIST virt-manager-0.8.4.tar.gz 2319338 RMD160 7cc747bbe4f9fa5af6ae4158a3404ee2a0338d3d SHA1 cdc8e65c84164c28ac5027c3bba46a3cd7531e96 SHA256 b9f7e6c6e3a552d60d711e352c3ba9cc0c025f5ef920701b74876ddd62dc8f76
 EBUILD virt-manager-0.8.3.ebuild 1180 RMD160 a01dd05303a6bcd8ec9a6c19ee1aa5c471108c86 SHA1 de87c3e08124ddf5cd4ba356bff1725fe9dc4a7f SHA256 8fb86985f698bc305c4969dad13f1e1dd2ec13842bc42f1a03df08de3d112841
 EBUILD virt-manager-0.8.4-r1.ebuild 1868 RMD160 dc54e2d0c29141c807ae58750203e46346ea9527 SHA1 53525a5c8ceda29ba8fc209dee0fbd2288950d01 SHA256 f0c581e4cb85da97c3d1b52891d35138137811b9ba8a6012cd72d72dbc3a596a
-MISC ChangeLog 6322 RMD160 b3f0860a8f5905efe39002bcb75ffca34ce326a2 SHA1 494db1224aeb6324abbfb7cac50668b54479de8c SHA256 ac3a960da0acb2c344590c845a8380adb103c1659ada0167cc9c37b9efb71077
+EBUILD virt-manager-0.8.4-r2.ebuild 1917 RMD160 e46d41c9efc647b951e4dce6d2c1a65ceb2d1fe3 SHA1 c9424150ab5492dbb08c5730babcc16a5f51990e SHA256 089e76eab5a72c31bc8fad3ab6e9cac0fc6a456dc444187f91aa4c94cf237316
+MISC ChangeLog 6620 RMD160 ee661297e84d9561a2bb133e4b24643794a8485d SHA1 a664925d73a09265cdf7128b18099922a65979e5 SHA256 5c04a995b050e2e0a3dbba5da15abedf44bac8c489b0ac1d866fe2e875c77f2a
 MISC metadata.xml 369 RMD160 62906dbc1412445b82d3f9b8a98aded8b29fed46 SHA1 1b8343d037aa942777655e12abfeb26c4cd9bd70 SHA256 916da95eda8b9f06a902c3ee5e90f03043d916a3368823056bf817c526ae7fe5
diff --git a/app-emulation/virt-manager/files/virt-manager-0.8.4-default-keyring.patch b/app-emulation/virt-manager/files/virt-manager-0.8.4-default-keyring.patch
new file mode 100644
index 000000000000..2e836d7caef6
--- /dev/null
+++ b/app-emulation/virt-manager/files/virt-manager-0.8.4-default-keyring.patch
@@ -0,0 +1,33 @@
+diff -Nur virt-manager-0.8.4/AUTHORS virt-manager-0.8.4-default-keyring//AUTHORS
+--- virt-manager-0.8.4/AUTHORS	2010-03-23 13:25:27.000000000 -0500
++++ virt-manager-0.8.4-default-keyring//AUTHORS	2010-06-15 12:19:29.000000000 -0500
+@@ -63,6 +63,7 @@
+   Fred Leeflang <fredl-at-dutchie-dot-org>
+   Jon Nordby <jononor-at-gmail-dot-com>
+   Ales Zelinka <azelinka-at-redhat.com>
++  Matthias Fulz <olz1983-at-googlemail-dot-com>
+ 
+   <...send a patch & get your name here...>
+ 
+diff -Nur virt-manager-0.8.4/src/virtManager/keyring.py virt-manager-0.8.4-default-keyring//src/virtManager/keyring.py
+--- virt-manager-0.8.4/src/virtManager/keyring.py	2010-03-23 13:25:29.000000000 -0500
++++ virt-manager-0.8.4-default-keyring//src/virtManager/keyring.py	2010-06-15 12:21:53.000000000 -0500
+@@ -35,11 +35,15 @@
+     def __init__(self):
+         if haveKeyring:
+             try:
+-                if not("default" in gnomekeyring.list_keyring_names_sync()):
+-                    gnomekeyring.create_sync("default", None)
+                 self.keyring = gnomekeyring.get_default_keyring_sync()
+                 if self.keyring == None:
+-                    logging.warning("Failed to create default keyring")
++                    # Code borrowed from
++                    # http://trac.gajim.org/browser/src/common/passwords.py
++                    self.keyring = 'default'
++                    try:
++                        gnomekeyring.create_sync(self.keyring, None)
++                    except gnomekeyring.AlreadyExistsError:
++                        pass
+             except:
+                 logging.warning(("Keyring unavailable: '%s'") % (str((sys.exc_info())[0]) + " "  + str((sys.exc_info())[1])))
+                 self.keyring = None
diff --git a/app-emulation/virt-manager/virt-manager-0.8.4-r2.ebuild b/app-emulation/virt-manager/virt-manager-0.8.4-r2.ebuild
new file mode 100644
index 000000000000..8c50e17c8fcd
--- /dev/null
+++ b/app-emulation/virt-manager/virt-manager-0.8.4-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.8.4-r2.ebuild,v 1.1 2010/06/15 17:29:16 cardoe Exp $
+
+EAPI=2
+
+PYTHON_DEPEND="2:2.4"
+
+# Stop gnome2.eclass from doing stuff on USE=debug
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 python
+
+DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)"
+HOMEPAGE="http://virt-manager.org/"
+SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome-keyring policykit"
+RDEPEND=">=dev-python/pygtk-1.99.12
+	>=app-emulation/libvirt-0.7.0[python]
+	>=dev-libs/libxml2-2.6.23[python]
+	>=app-emulation/virtinst-0.500.3
+	>=gnome-base/librsvg-2
+	>=x11-libs/vte-0.12.2[python]
+	>=net-libs/gtk-vnc-0.3.8[python]
+	>=dev-python/dbus-python-0.61
+	>=dev-python/gconf-python-1.99.11
+	dev-python/urlgrabber
+	gnome-keyring? ( dev-python/gnome-keyring-python )
+	policykit? ( gnome-extra/polkit-gnome )"
+DEPEND="${RDEPEND}
+	app-text/rarian"
+
+src_prepare() {
+	sed -e "s/python/python2/" -i src/virt-manager.in || \
+		die "python2 update failed"
+
+	epatch "${FILESDIR}"/${P}-customize-dialog-xmlparsedoc.patch
+	epatch "${FILESDIR}"/${P}-default-keyring.patch
+
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+
+	insinto /usr/share/virt-manager/pixmaps/
+	doins "${S}"/pixmaps/*.png
+	doins "${S}"/pixmaps/*.svg
+
+	insinto /usr/share/virt-manager/pixmaps/hicolor/16x16/actions/
+	doins "${S}"/pixmaps/hicolor/16x16/actions/*.png
+
+	insinto /usr/share/virt-manager/pixmaps/hicolor/22x22/actions/
+	doins "${S}"/pixmaps/hicolor/22x22/actions/*.png
+
+	insinto /usr/share/virt-manager/pixmaps/hicolor/24x24/actions/
+	doins "${S}"/pixmaps/hicolor/24x24/actions/*.png
+
+	insinto /usr/share/virt-manager/pixmaps/hicolor/32x32/actions/
+	doins "${S}"/pixmaps/hicolor/32x32/actions/*.png
+}