Add a patch from upstream master to actually respect the user's choice of using an external password manager for the gnome3 pinentry

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x250B7AFED6379D85!

4 files changed, 154 insertions, 9 deletions

diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog
index 642bd9523ca6..4dd2b0df0dca 100644
--- a/app-crypt/pinentry/ChangeLog
+++ b/app-crypt/pinentry/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-crypt/pinentry
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.174 2015/06/07 11:02:09 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.175 2015/06/07 14:39:23 k_f Exp $
+
+*pinentry-0.9.4-r1 (07 Jun 2015)
+
+  07 Jun 2015; Kristian Fiskerstrand <k_f@gentoo.org>
+  +files/pinentry-0.9.4-actually_respect_users_pm.patch,
+  +pinentry-0.9.4-r1.ebuild:
+  Add a patch from upstream master to actually respect the user's choice of
+  using an external password manager for the gnome3 pinentry
 
 *pinentry-0.9.4 (07 Jun 2015)
 
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index e37909d96cae..895231035fd3 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -12,6 +12,7 @@ AUX pinentry-0.9.2-linking-order.patch 3866 SHA256 6937de3e176de2fb3425ba449fb4c
 AUX pinentry-0.9.2-management.patch 3590 SHA256 7890e73e0e5545ce817f96f0ab89fbb6626cb7166f03a9338f80bd0f26bfc03f SHA512 fba43beaed1f5856cc7fe20cc985d782fef9b75eb9464c0b8f82b426af6922a9da298a9461a251aba26c5cf1410ffdd2f09657bd73dedbc7b338e8f673a50a04 WHIRLPOOL 47bf4c3b30a329cc79580626e89b0fbbc78d91e466f2b5c7ba79b1f96f5a24b016ef912833bbb43cabaa47084061cc554b4222a76d7d0bedf574f3ac247b803d
 AUX pinentry-0.9.2-memory.patch 919 SHA256 788f73e7817b27adb5a0d2befb95da3c653291c2151bcbe493b2ec65f72eabf0 SHA512 2aa4e68b6d2c1100652c9a007381b5c181f761cd6cc30e5769a8fe02aa05933294841131815ea5706e010ab1e083da28094a3b1d61ebd393c084eff040330fc6 WHIRLPOOL 87f0c639ed5a61404c34b80bbe0d30e52c27fd407dfe4f938720953c76dcc15c024688252da0d9107fab7daecb04b565df202a723436b0bafda02d48e3ef56cf
 AUX pinentry-0.9.2-simplify.patch 1431 SHA256 093d623379ff571b23ceddd71f62e4792f1a004517bd43212ab1534efff46382 SHA512 2a541abfa8529050d6bba6381e852e8c1d66ae9c7dc07f25b0e4b313cbc6ec4a87cc44f19cc400de23a094b994d17871a2a9471e18a3fcba187968334e5524c7 WHIRLPOOL 312fb2d8fadab742a6af449b59a2319e5e1b7bc27fdef131f2e77480c1b916d131bae5a28456c1f09ce7a531e2d8862d9424a9a87b3877d246aaac67bacaf18d
+AUX pinentry-0.9.4-actually_respect_users_pm.patch 1499 SHA256 9b9843f7e15d8bfc8f426e6a94342ef07ad6b47eb3b638fa7074c7f9fd250315 SHA512 d31e26cb4b518be597cd83bf4e771419009795315ad87fc2ac1b0d44264adaebdacdcfaa1d5a325c7f9d6bec692d7d6488b008473608cd7aa96685075c279a27 WHIRLPOOL 259d8cbcd3368e46564a78b9aaef91ab2ec5947a470c617099e2145d7757df664017704ef94654d18a63e74ebd726dddcc33be51d01d924395188329d36af400
 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
@@ -20,16 +21,17 @@ EBUILD pinentry-0.9.0-r3.ebuild 3136 SHA256 fbd8f91d0c28a92bc6923d19d0414f3c1b40
 EBUILD pinentry-0.9.0.ebuild 2901 SHA256 e890a9acc471f6252fe4658e7f5b54a99525c06d5cf96681c3d0483dd9735829 SHA512 cfcd1733d69eebcf8e1c01d275edf7e50be76ddfe1fb439ebde80d7ae3f188d1f4feafa4fe471beb59a6d82aab4edf681a122f4acf74083b0e7816605faf0c7a WHIRLPOOL 5502e3e32b46d1aec265eeac5467772c95d7d404b5afe3e1a4b56333e8d581b4e8270b5cad44c66db99949229cbf6d3a38c12c7ca43174a87da6f3bc090775ff
 EBUILD pinentry-0.9.1.ebuild 2721 SHA256 97ba93a30e757ab11988a9f1ed9ece1175d61d0c353063a4372105dc6a37037f SHA512 a123d2bfea94b23b70ecee4c7f52ba8fe0cc163850f8dcad8952e137067c0717a089ef880f16454e296e86af983cb132b618ad3e750590cc891f741351b1651b WHIRLPOOL dbc1dca7cc2a7a98b27481f0eca034dc1ac73e80b3d5c94be8176564aff4e921704059ca510f6fc3fbaf485e714511231bc035177e40903b35bf701273b3f4ab
 EBUILD pinentry-0.9.2-r1.ebuild 3131 SHA256 2d498e346d2d422bb9d455e057ec4862afa0081f62371245984627f969f358f2 SHA512 92a39f12d2ca574e8f5358a60f7b62b81d0ac2306faaa52bf1118dc16a2d1e9e1115af682d3aaa55f63af4d0f9d849102005b60853dc366480442730194a1ff6 WHIRLPOOL fcf2c42bb9a7cd7324ae635088e313b20b10e6689274b4c7ce35f22b9a571c7ea2056e55d2b29e1eaf6f9cc3e275743a4face1b918f031a569e9d4556226e8e8
+EBUILD pinentry-0.9.4-r1.ebuild 2870 SHA256 8b6d5a8a27e338c55ce2c1bb3cd9beecd90530899e390381a2fecf03b8bfe8e1 SHA512 154519c346be7ea30d1f846dc19c33ef7b0b1e2d563c932a85acf73863ffcc2d1d6f3132ad8407c2044d1081146da7b825e9b8fa414144d7e7f60c619a48bf4b WHIRLPOOL d3ef3d9d17ec5823a040c8c72e1b38db61d9fa58e39d9a304d8f32b5f6951cfe40f8e7bbd5e03ee19710322e7855d783092d580e926c62101bc6384a5a98be33
 EBUILD pinentry-0.9.4.ebuild 2808 SHA256 fd811e6d80b4ddc39f3ff3ff2194f9901b16e5cebb84cc7ec5ffba355fb4f985 SHA512 b4900260faf4e408ab4298e4c563f65473194a3a7fdfe5348c1848a1eb682a6c3f6cb7e52c580c273deb130ade71c443d71862cd519047b678a39b259b5cc20c WHIRLPOOL 6eaeca5f7db9d787c4cbe13f990ad57f9cfa0d6c7c32a67e48670f6e9d06d658bbb3fe22332e7507ac637b4c03fd3488b34fc4099c0e2c42ba588b36786298b1
-MISC ChangeLog 23793 SHA256 b88dcee70df2598e9eb7a2ff7e7cf7d7a8135661af2f9e98417ea8dfc491320e SHA512 dfe7e443543b87157d45724d9496ba58cdb45f52937010c3a5e823fad7fe04ac279fefe560ae143e00107c9029a087d89e9571634b3dc12a33aa2cab7ab1c834 WHIRLPOOL be72eb6d31b521430fddc0082aa04a9ec9ab28be7f11adbf6c92ea5b0fa30807c722865ad49089a0d77ff9a21cc2f25a7c36586ac837d11497ee7ca1af311048
+MISC ChangeLog 24105 SHA256 978c577f11dcff18ea95bd991dfe9115eec1a9a72af7a7149d910170a55bc47a SHA512 627a46ff247d79cdecef12dd7978459aa37bb8ca282fb5a9cf1b419f7c3f3c8b4ea618269c6411f09480eba977a29204a62807eb57edc83ecfbeb893d5540f6e WHIRLPOOL 2dfb3894a9981054ae754105b8202b2c2cda6911d33693c9044ebc495e7fbe08c010e220b5da9ae465a13fd5720e903489d86e7dca55a0bd6e53b697dac86760
 MISC metadata.xml 232 SHA256 0f9362f8e4539dec9b2feb1bd93d34e4dff44290f4dac44dd50f9d44de62360e SHA512 79b3d9679dd2d61479a24ef159f6a23758dad2b77679824bae7758c8f47375b4548e0adf135b3dae5c6d6eff23d134f9477a06fd29789d4fb98670431670bb01 WHIRLPOOL 2ac86da5a1d1512f358400d0616ca3baba6ad55d68ad68296975192cf4f60ed55a3faefe0c3290720d61f117e6c8b24b37cd017e8b8c21c77f977dda8d3212fa
 -----BEGIN PGP SIGNATURE-----
 
-iQEcBAEBCAAGBQJVdCSbAAoJECULev7WN52FDQwH/RWeDASG00TYKkhBIpluOePn
-aEkyeOvmcYdxUlwMIL71g1wFRNAZo1D2sHxmDh4pFgpKC5S2RXhbZ1T754MV9z/u
-tgJXJaIqR51Pb4cMtEuuJWEYZN7Uaode1zA1x93/ct34bC+PnG7EvhjcwgxASuX7
-5n2yZ+eoBnnTQi79ykDxfYZo0gQKWYDTGNWA735rG6Or1na0sYUNwBWUUNQB8EAX
-Ql0WkL91wk5CiNuWZyGVM7viIp+w6o5rxhN98NoycXSwaEyu9HEGyWZIBw6iDACL
-097G9pfeJQb7vnXI/7BRw6YJx+HRIAzn50qDZsrNR5n0SPMV90C2va24W0TGFeA=
-=jEV+
+iQEcBAEBCAAGBQJVdFeFAAoJECULev7WN52FxTEH/iZEuc/280kH1pUkIrV2ypvE
+SqfPcraHwoWgm3K+cew7a48JDx0ABhOGRI6YYSc4EpDc3tGs3SljdK0zegFrQl6e
+FcJCYyikm5MQ5+4dqzkMeo2Y50aeF2DsBCejXM2DWV/9jSJYny+cP/3bMCVwyb8v
+XXBPDejkKf9O6J8h6pvuHsyWgigPCjrHq1mEaP9s84/howPFI+5PAPQJI2I8T2sM
+XRrJ2X2pIZjVCt7C1/pxrEc3eNNE08vupeuXvcs7rEK7tq1y82bMLyH/KxFhS+db
+WWZk/Iw24FzpCWBYnMOMtcJzzOX5A3CLCdX51RsyCUsL7cPoKdTGAS6mr+hgxmM=
+=Dmqx
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/pinentry/files/pinentry-0.9.4-actually_respect_users_pm.patch b/app-crypt/pinentry/files/pinentry-0.9.4-actually_respect_users_pm.patch
new file mode 100644
index 000000000000..cfc96a3be814
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-0.9.4-actually_respect_users_pm.patch
@@ -0,0 +1,49 @@
+From 444598586d0abf70d5a27d2aafcd6c14989621db Mon Sep 17 00:00:00 2001
+From: "Neal H. Walfield" <neal@gnu.org>
+Date: Sun, 7 Jun 2015 14:36:39 +0200
+Subject: [PATCH] gnome3: Actually respect the user's choice of using a
+ password manager.
+
+* gnome3/pinentry-gnome3.c (create_prompt) [HAVE_LIBSECRET]: Only show
+the libsecret prompt in this case.
+(gnome3_cmd_handler) [HAVE_LIBSECRET]: Set PE->MAY_CACHE_PASSWORD
+according to the user's choice.
+---
+ gnome3/pinentry-gnome3.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/gnome3/pinentry-gnome3.c b/gnome3/pinentry-gnome3.c
+index 74ec89c..0fea8f0 100644
+--- a/gnome3/pinentry-gnome3.c
++++ b/gnome3/pinentry-gnome3.c
+@@ -145,6 +145,7 @@ create_prompt (pinentry_t pe, int confirm)
+   /* XXX: gcr expects a string; we have a int.  */
+   // gcr_prompt_set_caller_window (prompt, pe->parent_wid);
+ 
++#ifdef HAVE_LIBSECRET
+   if (! confirm && pe->allow_external_password_cache && pe->keyinfo)
+     {
+       if (pe->default_pwmngr)
+@@ -157,6 +158,7 @@ create_prompt (pinentry_t pe, int confirm)
+ 	gcr_prompt_set_choice_label
+ 	  (prompt, "Automatically unlock this key, whenever I'm logged in");
+     }
++#endif
+ 
+   return prompt;
+ }
+@@ -203,6 +205,11 @@ gnome3_cmd_handler (pinentry_t pe)
+ 	  if (pe->repeat_passphrase)
+ 	    pe->repeat_okay = 1;
+ 
++#ifdef HAVE_LIBSECRET
++	  if (pe->allow_external_password_cache && pe->keyinfo)
++	    pe->may_cache_password = gcr_prompt_get_choice_chosen (prompt);
++#endif
++
+ 	  ret = 1;
+ 	}
+     }
+-- 
+2.1.4
+
diff --git a/app-crypt/pinentry/pinentry-0.9.4-r1.ebuild b/app-crypt/pinentry/pinentry-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..0cca1c4a486c
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-0.9.4-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.9.4-r1.ebuild,v 1.1 2015/06/07 14:39:23 k_f Exp $
+
+EAPI=5
+
+inherit qmake-utils autotools multilib eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="http://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 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="clipboard gtk ncurses qt4 caps gnome-keyring static"
+
+RDEPEND="
+	app-eselect/eselect-pinentry
+	caps? ( sys-libs/libcap )
+	gtk? ( x11-libs/gtk+:2 )
+	ncurses? ( sys-libs/ncurses )
+	qt4? ( >=dev-qt/qtgui-4.4.1:4 )
+	static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	gtk? ( virtual/pkgconfig )
+	qt4? ( virtual/pkgconfig )
+	gnome-keyring? ( app-crypt/libsecret )
+"
+REQUIRED_USE="
+	|| ( ncurses gtk qt4 )
+	gtk? ( !static )
+	qt4? ( !static )
+	static? ( ncurses )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
+	epatch "${FILESDIR}/${P}-actually_respect_users_pm.patch"
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
+
+	# Issues finding qt on multilib systems
+	export QTLIB="${QTDIR}/$(get_libdir)"
+
+	econf \
+		--enable-pinentry-tty \
+		$(use_enable gtk pinentry-gtk2) \
+		$(use_enable ncurses pinentry-curses) \
+		$(use_enable ncurses fallback-curses) \
+		$(use_enable qt4 pinentry-qt4) \
+		$(use qt4 && use_enable clipboard pinentry-qt4-clipboard) \
+		$(use_with caps libcap) \
+		$(use_enable gnome-keyring libsecret) \
+		$(use_enable gnome-keyring pinentry-gnome3) \
+		MOC="$(qt4_get_bindir)"/moc
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/bin/pinentry || die
+}
+
+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
+}