summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Fiskerstrand <k_f@gentoo.org>2015-08-16 22:58:31 +0200
committerKristian Fiskerstrand <k_f@gentoo.org>2015-08-16 22:59:27 +0200
commit8d7d872ca8f29c7d5034940ae54dac915fa06357 (patch)
tree9e0924a467a74bc130b0891fb286a2f04fbdbcdd /app-crypt/pinentry/files
parentsci-geosciences/osgearth: version bump to 2.7 (diff)
downloadgentoo-8d7d872ca8f29c7d5034940ae54dac915fa06357.tar.gz
gentoo-8d7d872ca8f29c7d5034940ae54dac915fa06357.tar.bz2
gentoo-8d7d872ca8f29c7d5034940ae54dac915fa06357.zip
app-crypt/pinentry: Remove unused patch file
pinentry-0.9.4-actually_respect_users_pm.patch is no longer used since the bump to 0.9.5. Cleaning up. Package-Manager: portage-2.2.20.1
Diffstat (limited to 'app-crypt/pinentry/files')
-rw-r--r--app-crypt/pinentry/files/pinentry-0.9.4-actually_respect_users_pm.patch49
1 files changed, 0 insertions, 49 deletions
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
deleted file mode 100644
index cfc96a3be814..000000000000
--- a/app-crypt/pinentry/files/pinentry-0.9.4-actually_respect_users_pm.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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
-