fix issue when nc doesn't handle the EOF on socket close correctly. According to upstream Debian has an issue with it but they're patching up their nc to respect EOF better. So, the only solution is to kill the ssh tunnel instead of just assuming it'll close eventually

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

4 files changed, 75 insertions, 7 deletions

diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog
index efcc514ed919..7ba6d35805f4 100644
--- a/app-emulation/virt-manager/ChangeLog
+++ b/app-emulation/virt-manager/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/virt-manager
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.24 2009/12/23 17:19:47 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.25 2010/02/04 17:48:37 cardoe Exp $
+
+*virt-manager-0.8.2-r1 (04 Feb 2010)
+
+  04 Feb 2010; Doug Goldstein <cardoe@gentoo.org>
+  +virt-manager-0.8.2-r1.ebuild,
+  +files/virt-manager-0.8.2-ssh-tunnel-shutdown.patch:
+  fix issue when nc doesn't handle the EOF on socket close correctly.
+  According to upstream Debian has an issue with it but they're patching up
+  their nc to respect EOF better. So, the only solution is to kill the ssh
+  tunnel instead of just assuming it'll close eventually
 
   23 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
   Drop unused local flag.
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 1255b768dd48..3e78fbf14f24 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -6,14 +6,16 @@ AUX virt-manager-0.7.0-fix-button-ordering.patch 17168 RMD160 4d8768148feccd75f6
 AUX virt-manager-0.7.0-fix-vcpu-cap.patch 2657 RMD160 754522ee0a2acff21236ae8a0c5f65f0ec30f72e SHA1 f3ea3c0aef7d735498c6e5ae39939a6940b9f3ba SHA256 e6d313d0517fd0f0a4884806018a1e27dc766b7d0201d5ad4736a2d9dcfc5e69
 AUX virt-manager-0.7.0-old-xen-compat.patch 6475 RMD160 3030240288598a7dc1a2be40ed60d379dc3f5739 SHA1 3161263a14e3adb7a5f940ae79e1055c27ebaa10 SHA256 470e64aaeffe4e148f365d88997f770c25cacf7bed0c31ecc655e823bb161084
 AUX virt-manager-0.7.0-vm-migrate-list.patch 2578 RMD160 809b937b2652ed6caece5faab36a4da11cdbb7a8 SHA1 e65a1a33a538f4e2c6567b3d9391aa3e24beffbe SHA256 3e9c6215b8852d87093502b6af15e604f148029749f2eb557a19c009a8809289
+AUX virt-manager-0.8.2-ssh-tunnel-shutdown.patch 771 RMD160 adea4c43aca12e0d0000b77ffbca5bce5d079735 SHA1 c75731bde811b9e1ee3016e7a977d228dca6a708 SHA256 5ffbb3be721468e0a4e8e7bef34db26a83e29bb118db10015605956f436c40e0
 DIST virt-manager-0.8.2.tar.gz 2137638 RMD160 56b2b6218b0291d4cfa792970e7fe3e06892a2aa SHA1 2b5b80486e3c526793f05ad5db223c15c0c10b65 SHA256 8aec4721132edb38efbaa208e5e157f5b3a0bcfff26d728a7853c8e85c257a00
+EBUILD virt-manager-0.8.2-r1.ebuild 1102 RMD160 cd650e4eea02b5705c32383997b67861a1b39645 SHA1 91bbd06b4ceca05f20e079826d135141d7e1b209 SHA256 592876bb03bcaacd49adbf58d73c2c3e58a13ab61ed0f05aedec17e2b360a396
 EBUILD virt-manager-0.8.2.ebuild 1030 RMD160 cf1651171a9be11edda5461653bcd347acf0ed5e SHA1 be3ff6b1bde0a56ede975cbe589187a1aa7ce376 SHA256 7941f00699af80198ab5bbb39fcd7801ddcfa1659fe9b12ea00f55ec04207996
-MISC ChangeLog 4325 RMD160 acdafb2a2e8c1e76d8398545eb07812506e4b7ac SHA1 2cbac0d23ac7c901b08c8e53df2ef41d77d35454 SHA256 0951e794fe67b6a66fe17c4fa3316f0d7be1121535b8a7da6ef0cee44d64292e
-MISC metadata.xml 253 RMD160 b408fb14862c6ec0c345cecb345811732130fe37 SHA1 fbadc7db87642356d299e3fd21e825e84da0eefd SHA256 e33e2dfd04b01b806c61c98ddaafd8573a823281661b447fa70c8266e50c4e78
+MISC ChangeLog 4874 RMD160 df7999208fcedb97084e1becbd2d1da3c549c2e6 SHA1 cf270dfd1b45ed52b281c688f9a1684c813318d5 SHA256 f2bb8ca7bd59266bbfe45a1ba05573e96a73d267d02782f2b55271d983fc210a
+MISC metadata.xml 169 RMD160 8c3a83aab0bc71fd088038ee84f7e517a2b60f26 SHA1 1660e81f250e2f55f5ab20b6a2282d989b84c2c2 SHA256 109fcb84d49e62bc251372d3fe4893ce793cf572bf4ba9d31ae10632539c0a09
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAksyUGgACgkQAiZjviIA2XgEowCfePSg4LEacadRoDcdCS+Kj75Y
-GmEAnj37IkGP3XuKdQJZtMsipLoPEDTR
-=Ivoh
+iEYEARECAAYFAktrCIMACgkQoeSe8B0zEfzefACfZd/s9eGVjC4Lxngtq7vJK8Eo
+CU4AnAideXW+JHFgBbFjTdjATjT6iLYd
+=Lgze
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virt-manager/files/virt-manager-0.8.2-ssh-tunnel-shutdown.patch b/app-emulation/virt-manager/files/virt-manager-0.8.2-ssh-tunnel-shutdown.patch
new file mode 100644
index 000000000000..cc7040a3e732
--- /dev/null
+++ b/app-emulation/virt-manager/files/virt-manager-0.8.2-ssh-tunnel-shutdown.patch
@@ -0,0 +1,20 @@
+diff -Nur virt-manager-0.8.2/src/virtManager/console.py virt-manager-0.8.2-ssh-tunnel/src/virtManager/console.py
+--- virt-manager-0.8.2/src/virtManager/console.py	2009-12-14 16:40:30.000000000 -0600
++++ virt-manager-0.8.2-ssh-tunnel/src/virtManager/console.py	2010-02-04 11:40:17.000000000 -0600
+@@ -29,6 +29,7 @@
+ import gtkvnc
+ import os
+ import socket
++import signal
+ 
+ from virtManager.error import vmmErrorDialog
+ 
+@@ -534,7 +535,7 @@
+         logging.debug("Shutting down tunnel PID %d FD %d" %
+                       (self.vncTunnel[1], self.vncTunnel[0].fileno()))
+         self.vncTunnel[0].close()
+-        os.waitpid(self.vncTunnel[1], 0)
++        os.kill(self.vncTunnel[1], signal.SIGTERM)
+         self.vncTunnel = None
+ 
+     def try_login(self, src=None):
diff --git a/app-emulation/virt-manager/virt-manager-0.8.2-r1.ebuild b/app-emulation/virt-manager/virt-manager-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..f6bba773b19a
--- /dev/null
+++ b/app-emulation/virt-manager/virt-manager-0.8.2-r1.ebuild
@@ -0,0 +1,36 @@
+# 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.2-r1.ebuild,v 1.1 2010/02/04 17:48:37 cardoe Exp $
+
+EAPI=2
+
+# Stop gnome2.eclass from doing stuff on USE=debug
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+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"
+RDEPEND=">=dev-lang/python-2.4.0
+	>=dev-python/pygtk-1.99.12
+	>=app-emulation/libvirt-0.4.5[python]
+	>=dev-libs/libxml2-2.6.23[python]
+	>=app-emulation/virtinst-0.500.1
+	>=gnome-base/librsvg-2
+	>=x11-libs/vte-0.12.2[python]
+	>=net-libs/gtk-vnc-0.3.4[python]
+	>=dev-python/dbus-python-0.61
+	>=dev-python/gconf-python-1.99.11
+	dev-python/libgnome-python
+	gnome-keyring? ( dev-python/gnome-keyring-python )"
+DEPEND="${RDEPEND}
+	app-text/rarian"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ssh-tunnel-shutdown.patch
+}