Fix gtk2+ grab issue, bug#165493, thanks to Vincent Pit

Package-Manager: portage-2.1.2.9

5 files changed, 116 insertions, 15 deletions

diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog
index 9a5fcc367782..fe62b452f6c9 100644
--- a/app-crypt/pinentry/ChangeLog
+++ b/app-crypt/pinentry/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/pinentry
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.60 2007/04/24 20:11:55 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.61 2007/06/15 16:25:32 alonbl Exp $
+
+*pinentry-0.7.2-r4 (15 Jun 2007)
+
+  15 Jun 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/pinentry-0.7.2-grab.patch, +pinentry-0.7.2-r4.ebuild:
+  Fix gtk2+ grab issue, bug#165493, thanks to Vincent Pit
 
   24 Apr 2007; Sven Wegener <swegener@gentoo.org> -pinentry-0.7.2-r2.ebuild:
   Cleanup.
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index bb657cd3bb8d..3571bf143a9d 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.7.2-info.patch 541 RMD160 c62e0e0b2ef45d4b9f0134a3468863c28074cf86 SHA1 0136f0332d29e0396510b3492f5eb27f43972774 SHA256 284c24b0f8a5199e1833837ef33fd8c94c7da451e688fdf7f195ab11cb6d9359
 MD5 b1aa0b2f16116dba002a39358a734b2b files/0.7.2-info.patch 541
 RMD160 c62e0e0b2ef45d4b9f0134a3468863c28074cf86 files/0.7.2-info.patch 541
@@ -9,15 +6,23 @@ AUX 0.7.2-libcap.patch 910 RMD160 21292ff64730826431d78d1f96a1909cb2c8997c SHA1
 MD5 136f0f72a38f70865f50397f0a5a3412 files/0.7.2-libcap.patch 910
 RMD160 21292ff64730826431d78d1f96a1909cb2c8997c files/0.7.2-libcap.patch 910
 SHA256 4d142f836bcbcbfcf21412d891335e6d4351ebced3c5a699e493e5f6a4599701 files/0.7.2-libcap.patch 910
+AUX pinentry-0.7.2-grab.patch 658 RMD160 6ea97caf552316ba3dad87fc976f3fd2407237e2 SHA1 f5b15301427217ff8cf9144343ded6fcf74f7151 SHA256 061d9c0f7d9c1c6902eacebb4ffc520260259d8f9de5abca254c606ed6276259
+MD5 76ef8c43a556ca4ced2ce7b2c12d16a2 files/pinentry-0.7.2-grab.patch 658
+RMD160 6ea97caf552316ba3dad87fc976f3fd2407237e2 files/pinentry-0.7.2-grab.patch 658
+SHA256 061d9c0f7d9c1c6902eacebb4ffc520260259d8f9de5abca254c606ed6276259 files/pinentry-0.7.2-grab.patch 658
 DIST pinentry-0.7.2.tar.gz 398775 RMD160 db667256801545ef065d9d47cafe5e67137fa6ce SHA1 aa113b08e315d22b6f70a634f459fdfbaa4dcaba SHA256 fbdb15ef6b05c5435745d1dde90cf4c82dd512c983d7a178cd25bdbe882dd668
 EBUILD pinentry-0.7.2-r3.ebuild 2245 RMD160 c5075a97b980fec9a9a7feacf700645f821471e7 SHA1 a303b4c5dddff7fd2411363fda1ce8c5c5014e68 SHA256 76763794f6788e810f7ebea77502f42b787be8f42cb357082dd954f04776530a
 MD5 05fa53af4791a73f562c38b459f7dde9 pinentry-0.7.2-r3.ebuild 2245
 RMD160 c5075a97b980fec9a9a7feacf700645f821471e7 pinentry-0.7.2-r3.ebuild 2245
 SHA256 76763794f6788e810f7ebea77502f42b787be8f42cb357082dd954f04776530a pinentry-0.7.2-r3.ebuild 2245
-MISC ChangeLog 8087 RMD160 7153d248adcb245ade5eaf8b7192105471e08e0a SHA1 54870b614b850e22922bcfc085a0ccc3e4c45dea SHA256 961f075b9e56f78a375269dffee796a5ee7764ab5bd98c107f4ebea1ef1d9a75
-MD5 3567c602d1dd1b8998de14255ddda49b ChangeLog 8087
-RMD160 7153d248adcb245ade5eaf8b7192105471e08e0a ChangeLog 8087
-SHA256 961f075b9e56f78a375269dffee796a5ee7764ab5bd98c107f4ebea1ef1d9a75 ChangeLog 8087
+EBUILD pinentry-0.7.2-r4.ebuild 2295 RMD160 c34796a7189d6ef50d8775edc35c71f1c68fe086 SHA1 3f9f6bc702c33cbde69a2c2b5bfd3b74dfc415e8 SHA256 b0f67ba31b0a80fe0844bac3ef07336cbab9fc21be4c74f51afbd4d0a715d039
+MD5 9f7f2cc0bf3c15b7d2c6d2e0aac26e4a pinentry-0.7.2-r4.ebuild 2295
+RMD160 c34796a7189d6ef50d8775edc35c71f1c68fe086 pinentry-0.7.2-r4.ebuild 2295
+SHA256 b0f67ba31b0a80fe0844bac3ef07336cbab9fc21be4c74f51afbd4d0a715d039 pinentry-0.7.2-r4.ebuild 2295
+MISC ChangeLog 8289 RMD160 e03a0476d1b7c0f72fffc78364d47d6d0a432bf8 SHA1 3310a2d8f25687cb656c6474b262bd5d69408fdb SHA256 c686fb4ef440d04024890c6c37e092d89e237ee64c111c3cb637db0a18367ab0
+MD5 684ec084851ef68213416f006a14aeff ChangeLog 8289
+RMD160 e03a0476d1b7c0f72fffc78364d47d6d0a432bf8 ChangeLog 8289
+SHA256 c686fb4ef440d04024890c6c37e092d89e237ee64c111c3cb637db0a18367ab0 ChangeLog 8289
 MISC metadata.xml 275 RMD160 7aca4724ede81b0eaad9b4536f00a6a805727cef SHA1 b1a92ff0d6bfacd26122ac4dbd4725ef2b023f81 SHA256 1e9c7343efc06a4d4143421f4bf3740c30f71ed6ce5011231505e7e911f31548
 MD5 f5775272cd7e22ae38566107c416c1e4 metadata.xml 275
 RMD160 7aca4724ede81b0eaad9b4536f00a6a805727cef metadata.xml 275
@@ -25,10 +30,6 @@ SHA256 1e9c7343efc06a4d4143421f4bf3740c30f71ed6ce5011231505e7e911f31548 metadata
 MD5 354793966a5b246e80341cc5a226df68 files/digest-pinentry-0.7.2-r3 244
 RMD160 8f5e8a1f54f1213dbb5274acc96f8d3860ffa7a5 files/digest-pinentry-0.7.2-r3 244
 SHA256 1c9c61d95b78cea1c7b5911f093d02947f015e0420a87eb24f0ea9e0a4b18c32 files/digest-pinentry-0.7.2-r3 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGLmSaI1lqEGTUzyQRAv/MAKDPJqR+/xYLaiv+6M/jtBnV1Yy3LwCfdSjn
-pasUrihlhunlP9VIUIzojfQ=
-=m/oM
------END PGP SIGNATURE-----
+MD5 354793966a5b246e80341cc5a226df68 files/digest-pinentry-0.7.2-r4 244
+RMD160 8f5e8a1f54f1213dbb5274acc96f8d3860ffa7a5 files/digest-pinentry-0.7.2-r4 244
+SHA256 1c9c61d95b78cea1c7b5911f093d02947f015e0420a87eb24f0ea9e0a4b18c32 files/digest-pinentry-0.7.2-r4 244
diff --git a/app-crypt/pinentry/files/digest-pinentry-0.7.2-r4 b/app-crypt/pinentry/files/digest-pinentry-0.7.2-r4
new file mode 100644
index 000000000000..bcde47e68cda
--- /dev/null
+++ b/app-crypt/pinentry/files/digest-pinentry-0.7.2-r4
@@ -0,0 +1,3 @@
+MD5 55626ce13ed76d82ec5330d19bdf3ab4 pinentry-0.7.2.tar.gz 398775
+RMD160 db667256801545ef065d9d47cafe5e67137fa6ce pinentry-0.7.2.tar.gz 398775
+SHA256 fbdb15ef6b05c5435745d1dde90cf4c82dd512c983d7a178cd25bdbe882dd668 pinentry-0.7.2.tar.gz 398775
diff --git a/app-crypt/pinentry/files/pinentry-0.7.2-grab.patch b/app-crypt/pinentry/files/pinentry-0.7.2-grab.patch
new file mode 100644
index 000000000000..c88aa62f3115
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-0.7.2-grab.patch
@@ -0,0 +1,15 @@
+--- pinentry-0.7.2/gtk+-2/pinentry-gtk-2.c	2007-06-15 15:53:28.000000000 +0200
++++ pinentry-0.7.2/gtk+-2/pinentry-gtk-2.c	2007-06-15 16:01:57.000000000 +0200
+@@ -207,10 +207,10 @@
+   if (!confirm_mode)
+     {
+       g_signal_connect (G_OBJECT (win),
+-			pinentry->grab ? "map-event" : "focus-in-event",
++			pinentry->grab ? "expose-event" : "focus-in-event",
+ 			G_CALLBACK (grab_keyboard), NULL);
+       g_signal_connect (G_OBJECT (win),
+-			pinentry->grab ? "unmap-event" : "focus-out-event",
++			pinentry->grab ? "no-expose-event" : "focus-out-event",
+ 			G_CALLBACK (ungrab_keyboard), NULL);
+     }
+   gtk_window_add_accel_group (GTK_WINDOW (win), acc);
diff --git a/app-crypt/pinentry/pinentry-0.7.2-r4.ebuild b/app-crypt/pinentry/pinentry-0.7.2-r4.ebuild
new file mode 100644
index 000000000000..7d9f36606c95
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-0.7.2-r4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.2-r4.ebuild,v 1.1 2007/06/15 16:25:32 alonbl Exp $
+
+WANT_AUTOCONF="2.5"
+WANT_AUTOMAKE="1.9"
+
+inherit flag-o-matic qt3 multilib eutils autotools
+
+DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="http://www.gnupg.org/aegypten/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="gtk ncurses qt3 caps"
+
+DEPEND="gtk? ( =x11-libs/gtk+-2* )
+	ncurses? ( sys-libs/ncurses )
+	qt3? ( $(qt_min_version 3.3) )
+	!gtk? ( !qt3? ( !ncurses? ( sys-libs/ncurses ) ) )
+	caps? ( sys-libs/libcap )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PV}-libcap.patch
+	epatch "${FILESDIR}"/${PV}-info.patch
+	epatch "${FILESDIR}"/${P}-grab.patch
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	local myconf=""
+
+	if ! ( use qt3 || use gtk || use ncurses )
+	then
+		myconf="--enable-pinentry-curses --enable-fallback-curses"
+	fi
+
+	append-ldflags $(bindnow-flags)
+
+	# Issues finding qt on multilib systems
+	export QTLIB="${QTDIR}/$(get_libdir)"
+
+	econf \
+		--disable-dependency-tracking \
+		--enable-maintainer-mode \
+		--disable-pinentry-gtk \
+		$(use_enable gtk pinentry-gtk2) \
+		$(use_enable qt3 pinentry-qt) \
+		$(use_enable ncurses pinentry-curses) \
+		$(use_enable ncurses fallback-curses) \
+		$(use_with caps libcap) \
+		${myconf} \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "dodoc failed"
+}
+
+pkg_postinst() {
+	elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
+	elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
+	elog "The soft resource limit for memory locking specifies the limit an"
+	elog "unprivileged process may lock into memory. You can also use POSIX"
+	elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
+	elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
+	elog "your users."
+}