Hello community,
here is the log from the commit of package gnome-keyring for openSUSE:Factory
checked in at Thu Oct 8 18:03:30 CEST 2009.
--------
--- GNOME/gnome-keyring/gnome-keyring.changes 2009-10-02 19:25:23.000000000 +0200
+++ gnome-keyring/gnome-keyring.changes 2009-10-08 16:28:47.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Oct 8 15:59:38 CEST 2009 - vuntz@opensuse.org
+
+- Add gnome-keyring-fix-ssh1-agent.patch to make the ssh agent
+ support rsa1 keys again. Fix bnc#540515.
+
+-------------------------------------------------------------------
+Tue Oct 6 11:16:11 CEST 2009 - vuntz@opensuse.org
+
+- Update gnome-keyring-pam-auth-prompt-password.patch to not prompt
+ for password if use_authtok option is used.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
gnome-keyring-fix-ssh1-agent.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-keyring.spec ++++++
--- /var/tmp/diff_new_pack.QfBXTu/_old 2009-10-08 18:02:34.000000000 +0200
+++ /var/tmp/diff_new_pack.QfBXTu/_new 2009-10-08 18:02:34.000000000 +0200
@@ -31,7 +31,7 @@
BuildRequires: update-desktop-files
PreReq: pam-config >= 0.72
Version: 2.28.0
-Release: 1
+Release: 2
Url: http://www.gnome.org/
Group: System/GUI/GNOME
License: GPL v2 or later ; LGPL v2.1 or later
@@ -43,6 +43,8 @@
Patch5: gnome-keyring-pam-auth-prompt-password.patch
# PATCH-FIX-UPSTREAM gnome-keyring-no-logout-delay.patch bgo595698 vuntz@opensuse.org -- Fix bug that caused a 10s delay during logout
Patch6: gnome-keyring-no-logout-delay.patch
+# PATCH-FIX-UPSTREAM gnome-keyring-fix-ssh1-agent.patch bgo597813 bnc540515 vuntz@opensuse.org -- Fix ssh agent to support rsa1 keys again
+Patch7: gnome-keyring-fix-ssh1-agent.patch
Requires: %{name}-lang = %{version}
# bug437293
%ifarch ppc64
@@ -98,6 +100,7 @@
%patch4
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%build
%configure\
++++++ gnome-keyring-fix-ssh1-agent.patch ++++++
commit 63c148b12c08ea0cfe72ac921abdcbebba84acc1
Author: Vincent Untz
Date: Thu Oct 8 16:25:11 2009 +0200
[ssh-agent] Fix support for rsa1 keys
Read the comment, instead of ignoring it and using the bytes as if they
were constraints.
https://bugzilla.gnome.org/show_bug.cgi?id=597813
diff --git a/pkcs11/ssh-agent/gck-ssh-agent-ops.c b/pkcs11/ssh-agent/gck-ssh-agent-ops.c
index d3507f4..c02c43e 100644
--- a/pkcs11/ssh-agent/gck-ssh-agent-ops.c
+++ b/pkcs11/ssh-agent/gck-ssh-agent-ops.c
@@ -685,6 +685,7 @@ op_v1_add_identity (GckSshAgentCall *call)
{
GP11Attributes *pub, *priv;
GP11Session *session;
+ gchar *comment = NULL;
gboolean ret;
gsize offset = 5;
guint32 unused;
@@ -702,6 +703,19 @@ op_v1_add_identity (GckSshAgentCall *call)
return FALSE;
}
+ /* Get the comment */
+ if (!egg_buffer_get_string (call->req, offset, &offset, &comment, (EggBufferAllocator)g_realloc)) {
+ gp11_attributes_unref (pub);
+ gp11_attributes_unref (priv);
+ return FALSE;
+ }
+
+ /*
+ gp11_attributes_add_string (pub, CKA_LABEL, comment);
+ gp11_attributes_add_string (priv, CKA_LABEL, comment);
+ */
+ g_free (comment);
+
gp11_attributes_add_string (priv, CKA_LABEL, V1_LABEL);
gp11_attributes_add_string (pub, CKA_LABEL, V1_LABEL);
++++++ gnome-keyring-pam-auth-prompt-password.patch ++++++
--- /var/tmp/diff_new_pack.QfBXTu/_old 2009-10-08 18:02:34.000000000 +0200
+++ /var/tmp/diff_new_pack.QfBXTu/_new 2009-10-08 18:02:34.000000000 +0200
@@ -1,8 +1,8 @@
-Index: gnome-keyring-2.27.4/pam/gkr-pam-module.c
+Index: gnome-keyring-2.28.0/pam/gkr-pam-module.c
===================================================================
---- gnome-keyring-2.27.4.orig/pam/gkr-pam-module.c
-+++ gnome-keyring-2.27.4/pam/gkr-pam-module.c
-@@ -889,12 +889,18 @@ pam_sm_authenticate (pam_handle_t *ph, i
+--- gnome-keyring-2.28.0.orig/pam/gkr-pam-module.c
++++ gnome-keyring-2.28.0/pam/gkr-pam-module.c
+@@ -889,12 +889,27 @@ pam_sm_authenticate (pam_handle_t *ph, i
/* Look up the password */
ret = pam_get_item (ph, PAM_AUTHTOK, (const void**)&password);
if (ret != PAM_SUCCESS || password == NULL) {
@@ -10,6 +10,15 @@
- syslog (GKR_LOG_WARN, "gkr-pam: no password is available for user");
- else
- syslog (GKR_LOG_WARN, "gkr-pam: no password is available for user: %s",
++ if (args & ARG_USE_AUTHTOK) {
++ if (ret == PAM_SUCCESS)
++ syslog (GKR_LOG_WARN, "gkr-pam: no password is available for user");
++ else
++ syslog (GKR_LOG_WARN, "gkr-pam: no password is available for user: %s",
++ pam_strerror (ph, ret));
++ return PAM_SUCCESS;
++ }
++
+ ret = prompt_password (ph);
+ if (ret != PAM_SUCCESS) {
+ syslog (GKR_LOG_ERR, "gkr-pam: couldn't get the password from user: %s",
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org