gentoo resync : 17.10.2017

4 files changed, 99 insertions, 1 deletions

diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 604fd4c2aac4..0bd464d72512 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,10 +1,12 @@
 AUX pinentry-0.8.2-ncurses.patch 824 SHA256 7d5e485e2c6dcce80ab63055d24761f53ae28e19b5ab2dacc424ebc7677805e8 SHA512 415ad55fd7a4ab66e87e5db76b1314b00f5a86552804f1f431a533ba1e7ec3f2c7136096106688b572639ceb637fdf0c3e25d96aa2e07fd1f6f295d39e1d4901 WHIRLPOOL 5483ccb6041e769387685ce987a19a2aa50835781a391169abbe7a838325149b81ce186692dbdc588858f74ef912a80f1eca6efb0f3421ace57925ca9c6f9ca5
 AUX pinentry-0.9.7-require-CPP11-for-qt-5-7.patches 1415 SHA256 ee9fc1ccc6d8c96a7097d8cb93a2277b7809dff24314d616615ae3bbe369c5a1 SHA512 1191ec7aa71042e4c770ea2793aac73f5501e83f0f93e9ae5440cbf84e4796c258156af7da9d0aaa7603e690c6bfa97d921c7721b3519d7ba33bd0f0def0baf4 WHIRLPOOL bbd686b0bde31c1a07074720ae611454f8a2f383c4d950c29deac974ac91b44c64c06066a65467589451bf596badbcc56d63a6bbfcb2061329861983b9209915
+AUX pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch 1571 SHA256 db9b954939aa0077310c0b620cef3f32ea32f2ee19d0836349dc2ec05f66b856 SHA512 e5fce39467221865d5a40b54053745c4d7c63bfd07ae763f9e76779dd7e77252acf7627f5768e729e09c49762479692bc2f3e6474878765d80a1132193c87361 WHIRLPOOL 3323075d3a0a182d42d3157a893404fccf4a47a6da846856b42d4c64ddf578fba3fa8487788f9bc2563ae648e43e8b37eaf750d281f1897665c9e1dff30cf8cb
 AUX pinentry-1.0.0-build.patch 6634 SHA256 ddc05cb4e3760b3c2f92c0dd76f316aed455400f34dd4ff2939a5a59995c5c15 SHA512 cd71552db3c4ab3bd7dd34d5009ad332e5a430ae1e909085cac6a04e63801086cac18916af65a37c110c2b667054c356f38dcc8af43468a23b1b562bf6dbafec WHIRLPOOL d117a3e591b38ed5e5239b5e2fab01c3db0d90fc6b8f52204d9e4cb7a579e703de1615be0bc8d481bc23149731835d6f78b25ffc74a8b361a1400a9d80da0344
+AUX pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch 1900 SHA256 4121a847697fd6643507cfe9ec8053595d6a5676ccb6f9007c339fabba38d664 SHA512 0b35900e4641c72c6b28b19bd252ffcabe14669e037c710a1057157fac0b65c709711a5667b66fd07afb433fc1c67509ec84eaddb822213d3ddc4ff7b549967e WHIRLPOOL e837a59640dae8ddfb295effd3ec51990eb3543f60f6003f277ff6ca59165a7485ff2ec0afdc20edbf5504259214531b425f362d9f40e63ac10209389c95b807
 DIST pinentry-0.9.7.tar.bz2 432978 SHA256 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2 SHA512 9c5bc8f7246e8b0affd83fea6e64c47cecf6a12515a82dd2a6712b230306a9c3c97da4dbf6519ea98c85c88bf180a5a2b8c46cedcd594f224e5a08f2f0e35bf0 WHIRLPOOL eb3f72acf6990d61b4279de89a334e68c6052a3edef789aab2a421c2e489c1286b756bf3c9b8e6dd4cee3716e32b53d0e9d41db15a5069e010fe713dfba0596a
 DIST pinentry-1.0.0.tar.bz2 436930 SHA256 1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a SHA512 f109236707c51871b5020ef807a551366461fafcfbe09bf8cda19d4b163a42cf622562b905ceb41429f1d648b3f3d27807538709da6a135b67f9888709eccd62 WHIRLPOOL 182d75e37afc40c02705ed6611354eb3429924df9062e64d42e511a5bdac5f7094b351aae406ef243e4a9d6f7db0eb897820bd23ed925b8787941342bc67d187
 EBUILD pinentry-0.9.7-r1.ebuild 3246 SHA256 7f098011d46661c2b5fea2b03ec0402d232b7845564d57e1d56d954f70367325 SHA512 78e797ea8a8f806fbac7a161b82ada7941e80b69dc1a3051d20655abca27dcab40888d6a08d913203c8e2d14308d8e6164249f6ec915ed2c991a763d66d0e8af WHIRLPOOL ede02f69437072f1b2251613078a62f592f682793c8c4fa422be6982f071b563b0a85c4207996f8c5752fa0d176b194ef805d960536f9c3a1434023e9f4c3c3d
-EBUILD pinentry-1.0.0-r1.ebuild 2817 SHA256 3d106e89979ed830015951c5f58b5ad4a4ce14fc613d246fca19487920e578eb SHA512 74878447433a3d537c29376c05f47d578deb8bfecb073b84efa4ac390953e683422b9ad38555297b11cb2414eed7a6e10bcb27caa8b2f3675ad1e3da5d61449b WHIRLPOOL fb59532c611c1c30802220e1893daa7e2641af769cc8c762f840976afb17466f7ae6c3d6a5f7888b7a36fb937d6f5f05e255d8770375be8e88cf943819b3c19e
+EBUILD pinentry-1.0.0-r2.ebuild 2941 SHA256 599e2cb03cf5f33272582b2a3b4502f455dc4918fce776628296eb002c6a756a SHA512 48c195501912a0d2943b524ccd99a406701e1daa41249a275a60af81b2dea4ed81414532e11ca3d4930b39a3d6a32b06589b4132baed37711d0f33ac189cf66d WHIRLPOOL eeda7482410bd8ed855fe52f677ce41b6f4ff8191b93e144fe8db44269a634506f262fad0b5cecb31ad36f09591aeaa78a85f80d9304093925088b0197b70421
 MISC ChangeLog 9508 SHA256 c9cc05ed15e6ab1341299c3fb985fdd2d8a9539e62d73a16b4dd8f5815bbeefb SHA512 7ff10fc6c2e2621c475ebb0805b63092d8d9fd56b40d69fa4669a4456c5900644aa51b758b92086621035b83e4f728fcfc20d2d8a13e53194d7ef88b3aeb3fa4 WHIRLPOOL 4dac379391947f44aec42b9c3d71b01f46700ede56347dea6b73d9771c7e55cdcbdbdec20cf7781119e1aaf4d3dd822eb423a4810ff3657a8d76dd1768f2a6dc
 MISC ChangeLog-2015 25487 SHA256 599f868331443fbdf95c4b9ef073517aeb355df82a2878199d311310891ebaa1 SHA512 b6cbb7b6abb7ba7e70094d334d18da227aec8b0e7654af58736fd6a5626dd178c23ac7524abddaf2dbf67037f117e98d6bf4a3757f0c2bb9428e55f0154c8f96 WHIRLPOOL 7683a728f4a93c78d60061a1a85785a3a7271e5854a81e7485fae2760190d49edd1d43e68db525ffc785a1ae45cb52b7df7af9a47d77b84c8a5c397ee4a29d56
 MISC metadata.xml 352 SHA256 7fd48348fd50b298029c84f873443f5b826fb46f05437440cef6dc2e1ce3773e SHA512 3817eb6ad931ab0ee363ed7f8612b08a44c0d02e7abb9d0734452c289350c9909ca4208acad01c54a3f1b260417c400f4692e37b34113c6d618680d41796e2d0 WHIRLPOOL 46aba74d2e5243e320da11ac8193123ec2576b4fa7d6c904a494b8e234716afe4a90fe1c2c6ea211b40b53edef261eb1735200950563ecc1592d213c66d40ad8
diff --git a/app-crypt/pinentry/files/pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch b/app-crypt/pinentry/files/pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch
new file mode 100644
index 000000000000..7724d1beae8c
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch
@@ -0,0 +1,47 @@
+From 1590b664d88be8386a4664c2994b685187d1eb25 Mon Sep 17 00:00:00 2001
+From: Damien Goutte-Gattat <dgouttegattat@incenp.org>
+Date: Thu, 3 Aug 2017 22:56:49 +0200
+Subject: [PATCH 1/6] gtk: Disable tooltips in keyboard-grabbing mode.
+
+* gtk+-2:/pinentry-gtk-2.c (show_hide_button): Do not show the
+tooltip if we attempt to grab the keyboard.
+(create_window): Likewise.
+--
+
+For unclear reasons, those tooltips may interfere with grabbing
+under some tiling window managers.
+
+GnuPG-bug-id: 3297
+Signed-off-by: Damien Goutte-Gattat <dgouttegattat@incenp.org>
+---
+ gtk+-2/pinentry-gtk-2.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c
+index d467ec5..f17a702 100644
+--- a/gtk+-2/pinentry-gtk-2.c
++++ b/gtk+-2/pinentry-gtk-2.c
+@@ -516,7 +516,10 @@ show_hide_button_toggled (GtkWidget *widget, gpointer data)
+     }
+ 
+   gtk_label_set_markup (GTK_LABEL(label), text);
+-  gtk_widget_set_tooltip_text (GTK_WIDGET(button), tooltip);
++  if (!pinentry->grab)
++    {
++      gtk_widget_set_tooltip_text (GTK_WIDGET(button), tooltip);
++    }
+   g_free (tooltip);
+ }
+ 
+@@ -736,7 +739,7 @@ create_window (pinentry_t ctx)
+ 	  gtk_progress_bar_set_text (GTK_PROGRESS_BAR (qualitybar),
+ 				     QUALITYBAR_EMPTY_TEXT);
+ 	  gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (qualitybar), 0.0);
+-          if (pinentry->quality_bar_tt)
++          if (pinentry->quality_bar_tt && !pinentry->grab)
+ 	    {
+ #if !GTK_CHECK_VERSION (2, 12, 0)
+ 	      gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), qualitybar,
+-- 
+2.13.6
+
diff --git a/app-crypt/pinentry/files/pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch b/app-crypt/pinentry/files/pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch
new file mode 100644
index 000000000000..f7476de1ff67
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch
@@ -0,0 +1,47 @@
+From b0e0bdeac5d40ca645afc9017778b39a26303523 Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk@gnupg.org>
+Date: Wed, 11 Jan 2017 18:40:17 +0100
+Subject: [PATCH 01/25] gtk2: Fix a problem with fvwm
+
+* gtk+-2/pinentry-gtk-2.c (grab_pointer): Take care of
+GDK_GRAB_ALREADY_GRABBED.
+--
+
+Debian-bug-id: 850708
+Co-authored-by: Vincent Lefevre <vincent@vinc17.net>
+Signed-off-by: Werner Koch <wk@gnupg.org>
+---
+ gtk+-2/pinentry-gtk-2.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c
+index 473c4aa..e37601f 100644
+--- a/gtk+-2/pinentry-gtk-2.c
++++ b/gtk+-2/pinentry-gtk-2.c
+@@ -203,7 +203,12 @@ grab_pointer (GtkWidget *win, GdkEvent *event, gpointer data)
+   (void)data;
+ 
+   /* Change the cursor for the duration of the grab to indicate that
+-     something is going on.  */
++   * something is going on.  The fvwm window manager grabs the pointer
++   * for a short time and thus we may end up with the already grabbed
++   * error code.  Actually this error code should be used to detect a
++   * malicious grabbing application but with fvwm this renders
++   * Pinentry only unusable.  Thus we try again several times also for
++   * that error code.  See Debian bug 850708 for details.  */
+   /* XXX: It would be nice to have a key cursor, unfortunately there
+      is none readily available.  */
+   cursor = gdk_cursor_new_for_display (gtk_widget_get_display (win),
+@@ -215,7 +220,8 @@ grab_pointer (GtkWidget *win, GdkEvent *event, gpointer data)
+                             NULL /* confine to */,
+                             cursor,
+                             gdk_event_get_time (event));
+-  while (tries++ < max_tries && err == GDK_GRAB_NOT_VIEWABLE);
++  while (tries++ < max_tries && (err == GDK_GRAB_NOT_VIEWABLE
++                                 || err == GDK_GRAB_ALREADY_GRABBED));
+ 
+   if (err)
+     {
+-- 
+2.13.6
+
diff --git a/app-crypt/pinentry/pinentry-1.0.0-r1.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
index 23de2e2209d0..f26a7c9f5bc5 100644
--- a/app-crypt/pinentry/pinentry-1.0.0-r1.ebuild
+++ b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
@@ -50,6 +50,8 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 PATCHES=(
 	"${FILESDIR}/${PN}-0.8.2-ncurses.patch"
 	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-Disable-tooltips-in-keyboard-grabbing-mode.patch"
+	"${FILESDIR}/${P}-gtk2-Fix-a-problem-with-fvwm.patch"
 )
 
 src_prepare() {