summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2010-06-12 22:55:24 +0000
committerDoug Goldstein <cardoe@gentoo.org>2010-06-12 22:55:24 +0000
commit7e39c6f9ccfdffdbebb98bf8dcd7619d83135264 (patch)
treeaef62ff202ad2b1b968136b070b6a1fa174b22c1 /app-emulation
parentUse gentoo mirrors (diff)
downloadhistorical-7e39c6f9ccfdffdbebb98bf8dcd7619d83135264.tar.gz
historical-7e39c6f9ccfdffdbebb98bf8dcd7619d83135264.tar.bz2
historical-7e39c6f9ccfdffdbebb98bf8dcd7619d83135264.zip
Add back patch that 0.8.3 needs. bug #323641
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/virt-manager/ChangeLog6
-rw-r--r--app-emulation/virt-manager/Manifest3
-rw-r--r--app-emulation/virt-manager/files/virt-manager-0.8.2-ssh-tunnel-shutdown.patch20
3 files changed, 27 insertions, 2 deletions
diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog
index 26dc457a669e..704ef6f84bcd 100644
--- a/app-emulation/virt-manager/ChangeLog
+++ b/app-emulation/virt-manager/ChangeLog
@@ -1,6 +1,10 @@
# 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.31 2010/06/04 18:47:29 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.32 2010/06/12 22:55:23 cardoe Exp $
+
+ 12 Jun 2010; Doug Goldstein <cardoe@gentoo.org>
+ +files/virt-manager-0.8.2-ssh-tunnel-shutdown.patch:
+ Add back patch that 0.8.3 needs. bug #323641
04 Jun 2010; Doug Goldstein <cardoe@gentoo.org>
-virt-manager-0.8.2.ebuild, -virt-manager-0.8.2-r1.ebuild,
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 25644f6a0134..103e2f917d15 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,7 +1,8 @@
+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
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 6169 RMD160 0df9931601bcb9013dbd05783f9018fafda60e81 SHA1 b38ce8532a243240a4eefbfa209c0c68dff83606 SHA256 d6b22df3f72c2b51d4f83f886dd4a1be272a397908a0454d6a058cdb851e93c3
+MISC ChangeLog 6322 RMD160 b3f0860a8f5905efe39002bcb75ffca34ce326a2 SHA1 494db1224aeb6324abbfb7cac50668b54479de8c SHA256 ac3a960da0acb2c344590c845a8380adb103c1659ada0167cc9c37b9efb71077
MISC metadata.xml 369 RMD160 62906dbc1412445b82d3f9b8a98aded8b29fed46 SHA1 1b8343d037aa942777655e12abfeb26c4cd9bd70 SHA256 916da95eda8b9f06a902c3ee5e90f03043d916a3368823056bf817c526ae7fe5
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):