Add app-crypt/pinentry-1.0.0-r2

4 files changed, 202 insertions, 0 deletions

diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index a6f5faf6..ee8ec335 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -17,7 +17,9 @@ AUX pinentry-0.9.5-build.patch 1632 SHA256 e78b4299eafd4cf90914f11882a19c2f26eac
 AUX pinentry-0.9.6-Disable-Qt5-support-to-force-Qt4.patch 926 SHA256 132e7d7daebbe3e59870f0ca703801ec3c5ce68836fc24617790d1def5dd1986 SHA512 cee841da71253289a460d9167af6a466c5ca8f582cf2d86059c642b38d5ed205281fab4f47d1c9159efb9562535c6003f8bdca06496b6f7a313fdab82799d58e WHIRLPOOL 0227a2d3aaa68bdca12ac26c121afd70221db6512b694f135a020025bf073d589a83e9004cae7f62bf6f62096aaeab19ce351fa537a22ffcbf917b700fd48b0c
 AUX pinentry-0.9.6-add-disable-pinentry-qt5-option.patch 1810 SHA256 f19a155be0632ce3dbfa5dd17c01b9d54aa8abd130d411a82152b48ca35daf7a SHA512 e336403faf12e6deadd33fd7c87fbd45ba8fe0173b328881bca43b021170f523c5459d3e62651ef1d47a0bb8d5dc194125b29cbd09934653f98fbd5ece21f1b5 WHIRLPOOL 6d577042df3b8ce5c4729b761940ed95785c788a1e754d20d3a465f531ab63fb2c4c457193c2ad70ac2a302f344b17e457718f4e3480474a1f0366501dbf4986
 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.0.tar.bz2 464272 SHA256 90045a07ab8e1a8e1ecf5d19b51691f195525e579fa5d71d7e92c120b05490ab SHA512 2cc53a5c3852edaf6e940228d9b43fe4709344eba5fe230b7afd22b2c0239d0b258917d75661d80590b2d61c6fe9dac8ad15a0b4a0a0e7fba90a9e1c07364edd WHIRLPOOL 3f77a8aa2d44c7206d877e31088ec927473441e61f06e788330545d75ac489e6e9d5bf0026b23d0824304dad54ce8e61c4571d186df7ad0edc2d644ca3af04ac
 DIST pinentry-0.9.1.tar.bz2 482295 SHA256 9cd08e856b395df3adc7124170b53f77c6d5c8bf88e899e818648ec70d3e9695 SHA512 2462d25a471a6053a0d1b67a05d1a828b9d14ca4aeced352376ff16b6aa4d03fd6d1013aee1b07b97f9ee73f218065c48fe2746bbf27f3cb2bd9aa0b9c9c1a50 WHIRLPOOL 2e74e31567b26d0ee1d0d962f9c4dee6bd9c5a8679751dc85a14d3f2d47bc83aa068ac9810261c1e47a08eacb25777926be3de0db9e3d20d3d8348033c6b13c5
 DIST pinentry-0.9.2.tar.bz2 495742 SHA256 fd8bc1592ceb22bb492b07cb29b1b140bb882c859e6503b974254c0a4b4134d1 SHA512 68ba5643b9dc4e71b28f964172c7f37a67d1b22914c649c612e001c7c5ca0c40a0a2ec0974f50dbdc8dd98cc6266688c71d67e922db4334536797d331b0203cf WHIRLPOOL 457c8408ed04b2b5f72761d0b24cf1f07b1b81bb431cc666ee88015fda5a868a4ad296ac82fc98c79d5af5c1fdfdc597cb38914088143fb08e7838c9b572a090
@@ -38,4 +40,5 @@ EBUILD pinentry-0.9.6-r5.ebuild 3436 SHA256 fcb831aac2f5796ae3fb599a1eef2c532d7f
 EBUILD pinentry-0.9.6-r6.ebuild 3426 SHA256 54fbffa65d71dae6913ef0b406570ff3a28243b1970376808f604640b9c0fde0 SHA512 6fa0972f6a8ce02605544970cb1bddee2a35f48790bfbda3338dbeb98823730d7c89ebd0216cde5f9996943a00d216b0d6882dbcc7ba45031a502e7382f38fc5 WHIRLPOOL d2df3020598020a45d70abc33507d804f79b7cc6999f3432c50ed166388c2d7684ef58f9e45f485cd22076abf654259f5366c6582abffdc4e3b0364db6b051fa
 EBUILD pinentry-0.9.7-r1.ebuild 3349 SHA256 ccbfa097801c8ef06a48601de1cf15d0ce1a5899c98e7d016dcc96ad78dcc5ca SHA512 5e112e45812adbc2ed6508d2f313687c6cec8eedae18aea0954f7653dc20926a6881d48defeb74b1e844046771c04be8b577b29c81be2571de63b1d29b845cbf WHIRLPOOL c0ae515d2273349cf508e1db128fa0978b0aea9c14473154bd9324bad7e261347719751aee5734f40f9c42726b07db3ae783a9f1632b5b629076fa33d1d2fca8
 EBUILD pinentry-1.0.0-r1.ebuild 2863 SHA256 fce4f273ffb65169a08f4eaf45b2b2a1dabcbbe838afff755f4971816a60a41c SHA512 cab956769ef37a2f36c787838014e361cd95e332f3006a02ee9bf4bd3616dded42c369d4f9f4ba6f0d9ebd1f213da6aa4e5126017a4c445f0c439265e0a7b6a4 WHIRLPOOL 6989f7b65b9da780cb81cf65bd14473de428eba790fdfb5994b835e9c7a86b98895a6d6809effd6fe092dccaf18c91cbbd5e68d41743e896a40ff193220769a5
+EBUILD pinentry-1.0.0-r2.ebuild 2987 SHA256 ab74b9acad8a7c273227744e372873db3fc4be7d24f2f3acda5b2cd86253fd80 SHA512 2e3ddc7969600a23aaa6d15759f3e6fd1def317e5d784b26a4a555a9090ebd662ca9c5b55e7e36152ee1e363437ddfc7581be570e0a147b123e1977c04cb2549 WHIRLPOOL a0770ecfd4f750637a3585bf6f453efed08377cc205853754ed460ee5c758bec43246456a87ce6e187fbefb5ec2be7d32d9bef5e1bdd72e93503ae815d1acc3a
 EBUILD pinentry-1.0.0.ebuild 3233 SHA256 a090442c29744204a4aa7a8021ccdd08538f8ab9436e52d7cb6aeabab3ae9dde SHA512 1d86709a37897bcf7c9b149fcdb3333b16b5a495647ac65727ac5abe83d7312eedcabf1e3c603f3b0747119c54d07f603e9785fd6adc64f483ba1a93e0a2eb84 WHIRLPOOL 85d1edb87c332314c3194bf3dcce5ab0e03ef9fc13422a634043a07ee73cef90c82b95faa09d02e7c8c35ce45d6075e17f5f0fcc6bee08570822fe0bb998fecd
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 00000000..7724d1be
--- /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 00000000..f7476de1
--- /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-r2.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
new file mode 100644
index 00000000..43d70b3d
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic qmake-utils toolchain-funcs
+
+DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="https://gnupg.org/aegypten2/index.html"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="caps emacs gnome-keyring gtk ncurses qt5 static"
+
+CDEPEND="
+	app-eselect/eselect-pinentry
+	>=dev-libs/libassuan-2.1
+	>=dev-libs/libgcrypt-1.6.3
+	>=dev-libs/libgpg-error-1.17
+	caps? ( sys-libs/libcap )
+	gnome-keyring? ( app-crypt/libsecret )
+	gtk? ( x11-libs/gtk+:2 )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
+"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	gnome-keyring? ( app-crypt/gcr )
+"
+
+REQUIRED_USE="
+	|| ( ncurses gtk qt5 )
+	gtk? ( !static )
+	qt5? ( !static )
+	static? ( ncurses )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.2-ncurses.patch"
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${PN}-0.9.4-configure.ac.patch"
+	"${FILESDIR}/${P}-Disable-tooltips-in-keyboard-grabbing-mode.patch"
+	"${FILESDIR}/${P}-gtk2-Fix-a-problem-with-fvwm.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
+
+	export QTLIB="$(qt5_get_libdir)"
+
+	econf \
+		--enable-pinentry-tty \
+		$(use_with caps libcap) \
+		$(use_enable emacs pinentry-emacs) \
+		$(use_enable gnome-keyring libsecret) \
+		$(use_enable gnome-keyring pinentry-gnome3) \
+		$(use_enable gtk pinentry-gtk2) \
+		$(use_enable ncurses pinentry-curses) \
+		$(use_enable ncurses fallback-curses) \
+		$(use_enable qt5 pinentry-qt) \
+		MOC="$(qt5_get_bindir)"/moc
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/bin/pinentry || die
+
+	use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4
+}
+
+pkg_postinst() {
+	if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
+		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."
+	fi
+
+	eselect pinentry update ifunset
+}
+
+pkg_postrm() {
+	eselect pinentry update ifunset
+}