[gnome-keyring] Fix ssh agent
Matthias Clasen
mclasen at fedoraproject.org
Wed Jan 18 16:11:29 UTC 2012
commit ccfc580f116e33974bada0e23cd3e9483e71603a
Author: Matthias Clasen <mclasen at redhat.com>
Date: Wed Jan 18 11:11:07 2012 -0500
Fix ssh agent
gnome-keyring-error.patch | 13 +++++++++++++
gnome-keyring.spec | 8 +++++++-
2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/gnome-keyring-error.patch b/gnome-keyring-error.patch
new file mode 100644
index 0000000..2494427
--- /dev/null
+++ b/gnome-keyring-error.patch
@@ -0,0 +1,13 @@
+--- gnome-keyring-3.3.4/daemon/dbus/gkd-secret-error.c 2011-12-19 02:51:11.000000000 -0500
++++ foo/daemon/dbus/gkd-secret-error.c 2012-01-18 09:12:28.976906276 -0500
+@@ -60,7 +60,9 @@
+
+ g_return_val_if_fail (error != NULL, NULL);
+
+- if (g_error_matches (error, GCK_ERROR, CKR_USER_NOT_LOGGED_IN)) {
++ if (g_error_matches (error, GCK_ERROR, CKR_USER_NOT_LOGGED_IN) ||
++ g_error_matches (error, GCK_ERROR, CKR_PIN_INCORRECT)) {
++
+ dbus_set_error (&derr, INTERNAL_ERROR_DENIED, "The password was invalid");
+
+ } else if (g_error_matches (error, GCK_ERROR, CKR_WRAPPED_KEY_INVALID) ||
diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index 1eb5c62..d28244e 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -9,12 +9,14 @@
Summary: Framework for managing passwords and other secrets
Name: gnome-keyring
Version: 3.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+ and LGPLv2+
Group: System Environment/Libraries
#VCS: git:git://git.gnome.org/gnome-keyring
Source: http://download.gnome.org/sources/gnome-keyring/3.3/gnome-keyring-%{version}.tar.xz
URL: http://www.gnome.org
+# upstream fix
+Patch0: gnome-keyring-error.patch
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk3-devel >= %{gtk3_version}
@@ -60,6 +62,7 @@ automatically unlock the "login" keyring when the user logs in.
%prep
%setup -q -n gnome-keyring-%{version}
+%patch0 -p1
%build
%configure --disable-update-mime \
@@ -122,6 +125,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%changelog
+* Wed Jan 18 2012 Matthias Clasen <mclasen at redhat.com> - 3.3.4-2
+- Fix a problem that prevents the ssh-agent from working
+
* Tue Jan 17 2012 Matthias Clasen <mclasen at redhat.com> - 3.3.4-1
- Update to 3.3.4
More information about the scm-commits
mailing list