Fix "grab keyboard" problem, bug 260308.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

4 files changed, 76 insertions, 2 deletions

diff --git a/net-misc/ssh-askpass-fullscreen/ChangeLog b/net-misc/ssh-askpass-fullscreen/ChangeLog
index 3d7fd9c3813c..a2644ec90ff7 100644
--- a/net-misc/ssh-askpass-fullscreen/ChangeLog
+++ b/net-misc/ssh-askpass-fullscreen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/ssh-askpass-fullscreen
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh-askpass-fullscreen/ChangeLog,v 1.11 2009/01/23 12:00:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh-askpass-fullscreen/ChangeLog,v 1.12 2009/02/25 22:26:59 ulm Exp $
+
+*ssh-askpass-fullscreen-0.4-r2 (25 Feb 2009)
+
+  25 Feb 2009; Ulrich Mueller <ulm@gentoo.org>
+  +files/ssh-askpass-fullscreen-0.4-fix-grab.patch,
+  +ssh-askpass-fullscreen-0.4-r2.ebuild:
+  Fix "grab keyboard" problem, bug 260308.
 
   23 Jan 2009; Raúl Porcel <armin76@gentoo.org>
   ssh-askpass-fullscreen-0.4-r1.ebuild:
diff --git a/net-misc/ssh-askpass-fullscreen/Manifest b/net-misc/ssh-askpass-fullscreen/Manifest
index 002c892f117b..640de5788322 100644
--- a/net-misc/ssh-askpass-fullscreen/Manifest
+++ b/net-misc/ssh-askpass-fullscreen/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 99ssh_askpass 44 RMD160 1b3bdf2dd8d2fc12281fb5a899e0b9e46e47d466 SHA1 bd80472120d8db545d784d6b5c322f20347aa003 SHA256 74ffd45f2a913bb8f26736d757e4467d9808f4b99400a0a5104cc051bd95ee98
+AUX ssh-askpass-fullscreen-0.4-fix-grab.patch 465 RMD160 31356597709e6717f1caad67d402bdb616642565 SHA1 9a01bfdbbaf1d8c1355a5cf717d9df5d9218b396 SHA256 673ff851f60b7cf442ef3f6ca2cac18c725d11150d1d072bcce23f1631860998
 DIST ssh-askpass-fullscreen-0.4.tar.gz 10737 RMD160 1b9e89647a6bc36a23e6e37b661ff16bd959ee87 SHA1 4c24db86e59636626052daf2be8fad13055b3cf0 SHA256 07409cb813688261a151d1918690a025eeb7ccc871f93d435795d1c38b4f14ac
 EBUILD ssh-askpass-fullscreen-0.4-r1.ebuild 1057 RMD160 0e03b34b71512bad9480499f5777a17d81caac4c SHA1 61f72ad73caebdf48e7998a472d62f2e43fbab40 SHA256 659da0a703f4668ed8ca229871e05c80f4e8768b12fde6ff7090d71a420be2c7
+EBUILD ssh-askpass-fullscreen-0.4-r2.ebuild 1108 RMD160 7609bd0e0a06443d40412ff50ff7a12cf5d0daa4 SHA1 cc9a64ff5c1006d6b5bdb14749d2e26390fe8c98 SHA256 cb7834d8be8fdb255524298b4bb210dbee8c2f11cfa966c98a21161d980de4b5
 EBUILD ssh-askpass-fullscreen-0.4.ebuild 927 RMD160 2298ee4f32847e81b4323066f81838975b9196d2 SHA1 a8ddd751787ba3ad428bb988905d8d7ac4774123 SHA256 5b9211ee3e8607624529bdf4c42fcff60198ea6333f008783087355116454db1
-MISC ChangeLog 1923 RMD160 fc44fe23eb3f5014032d81833cd38afb9061daa0 SHA1 3ca3e54f552c0f22eb3acce3d3c657c75287c78e SHA256 e3bada8442eb31b975469a3243466963350dc779b3c8b11eef51d6e9ab57ee24
+MISC ChangeLog 2149 RMD160 8dd7ed247bc18396a19643bfb33b0614b7c9a121 SHA1 44df5162f70a9ebea04c40c97843d5f3b9e6c1ab SHA256 937cef3b512afcc071837ca16b7898708dd91fa8abc4faff05db998181b84ce0
 MISC metadata.xml 223 RMD160 ad2d0af4d8594ea18c4c264208f5732b69daf6d3 SHA1 9558ee63b59c24590554c88724110ca703349dd9 SHA256 a792d79fa68d95d371bdf64ea0b2255490ffd7f45a7bc797043d73c0188dd72c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAkmlxf8ACgkQOeoy/oIi7uyF0gCfcnRqnsgCzzXiePG2fwTlnAcL
+6/kAoMqx/LmsN4yoKfV2BsXdHdy1dzcr
+=GCB0
+-----END PGP SIGNATURE-----
diff --git a/net-misc/ssh-askpass-fullscreen/files/ssh-askpass-fullscreen-0.4-fix-grab.patch b/net-misc/ssh-askpass-fullscreen/files/ssh-askpass-fullscreen-0.4-fix-grab.patch
new file mode 100644
index 000000000000..c3d91f5e1f43
--- /dev/null
+++ b/net-misc/ssh-askpass-fullscreen/files/ssh-askpass-fullscreen-0.4-fix-grab.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/260308
+
+--- ssh-askpass-fullscreen-0.4-orig/ssh-askpass-fullscreen.c	2006-01-16 13:49:38.000000000 +0100
++++ ssh-askpass-fullscreen-0.4/ssh-askpass-fullscreen.c	2009-02-25 22:44:47.000000000 +0100
+@@ -247,7 +247,7 @@
+ 	GdkColor color;
+ 	gchar *str;
+         GdkGrabStatus status;
+-        int grab_tries;
++        int grab_tries = 0;
+         const char *failed;
+         
+  	grab_server = (getenv("GNOME_SSH_ASKPASS_GRAB_SERVER") != NULL); 
diff --git a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-0.4-r2.ebuild b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-0.4-r2.ebuild
new file mode 100644
index 000000000000..58b7cddc8b9e
--- /dev/null
+++ b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-0.4-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-0.4-r2.ebuild,v 1.1 2009/02/25 22:26:59 ulm Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A small SSH Askpass replacement written with GTK2."
+HOMEPAGE="https://www.cgabriel.org/software/wiki/SshAskpassFullscreen"
+SRC_URI="http://www.cgabriel.org/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.0
+	!net-misc/gtk2-ssh-askpass"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-fix-grab.patch"
+	sed -i -e '2 s/$/$\(LDFLAGS\)/' Makefile
+}
+
+src_compile() {
+
+	sed "s:gcc:$(tc-getCC) ${CFLAGS}:g" \
+	-i Makefile
+
+	emake LDFLAGS="${LDFLAGS}" || \
+	die "compile failed"
+}
+
+src_install() {
+	dobin ssh-askpass-fullscreen || die "dobin failed"
+	doenvd "${FILESDIR}"/99ssh_askpass || die "doenvd failed"
+	dodoc README AUTHORS
+	#doman debian/gtk2-ssh-askpass.1
+}