Hello community,
here is the log from the commit of package gnome-keyring for openSUSE:Factory
checked in at Tue Dec 8 10:36:23 CET 2009.
--------
--- GNOME/gnome-keyring/gnome-keyring.changes 2009-10-08 16:28:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-keyring/gnome-keyring.changes 2009-12-04 21:23:02.000000000 +0100
@@ -1,0 +2,27 @@
+Fri Dec 4 21:19:27 CET 2009 - vuntz@opensuse.org
+
+- Split the libraries in their own packages, to avoid useless
+ dependencies for packages depending on libgnome-keyring0 but that
+ don't want the whole gnome-keyring (which pulls gtk2). This means
+ we now have libgnome-keyring0, libgcr0, libgp11-0 and
+ libgp11-modules subpackages. (Thanks to Debian: summaries and
+ descriptions are inspired by the Debian ones.)
+- Remove .la files.
+- Do not self-obsolete for gnome-keyring-doc and pam_keyring.
+- Move the pam-confire PreReq to the pam subpackage.
+
+-------------------------------------------------------------------
+Fri Nov 13 17:46:05 CET 2009 - vuntz@opensuse.org
+
+- Update to version 2.28.1:
+ + Fix support for SSH RSA1 keys.
+ + Fix a delay when the daemon quits.
+ + Use default D-Bus timeout when finding daemon.
+ + Make custom pkcs11 constants unsigned longs.
+ + Use unsigned long for module handle counter.
+ + Fix assertion when releasing secure memory block.
+- Drop gnome-keyring-no-logout-delay.patch: fixed upstream.
+- Drop gnome-keyring-fix-ssh1-agent.patch: fixed upstream.
+- Update gnome-keyring-check-session.patch to apply without fuzz.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gnome-keyring-2.28.0.tar.bz2
gnome-keyring-fix-ssh1-agent.patch
gnome-keyring-no-logout-delay.patch
New:
----
gnome-keyring-2.28.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-keyring.spec ++++++
--- /var/tmp/diff_new_pack.G4dnk9/_old 2009-12-08 10:35:54.000000000 +0100
+++ /var/tmp/diff_new_pack.G4dnk9/_new 2009-12-08 10:35:54.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package gnome-keyring (Version 2.28.0)
+# spec file for package gnome-keyring (Version 2.28.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -29,23 +29,20 @@
BuildRequires: pam-devel
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
-PreReq: pam-config >= 0.72
-Version: 2.28.0
-Release: 2
+Version: 2.28.1
+Release: 1
Url: http://www.gnome.org/
Group: System/GUI/GNOME
-License: GPL v2 or later ; LGPL v2.1 or later
+License: GPLv2+ ; LGPLv2.1+
Summary: GNOME Keyring Password Manager
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.6/%{name}-%{version}.tar.bz2
# PATCH-FIX-OPENSUSE gnome-keyring-check-session.patch vuntz@novell.com -- Only start gnome-keyring in the pam module if GNOME is started
Patch4: gnome-keyring-check-session.patch
# PATCH-FIX-OPENSUSE gnome-keyring-pam-auth-prompt-password.patch bnc466732 bgo560488 vuntz@novell.com -- Make the pam module prompt the password in auth, so we can use pam-config. This is a workaround until bnc#477488 is implemented.
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}
+Requires: libgp11-modules = %{version}
+Recommends: %{name}-pam
# bug437293
%ifarch ppc64
Obsoletes: gnome-keyring-64bit
@@ -55,36 +52,95 @@
%gconf_schemas_prereq
%description
-GNOME Keyring Manager is a program that keeps passwords and other
-secrets for users. It is run as a daemon in the session, similar to
-ssh-agent, and other applications can locate it by an environment
-variable.
+The GNOME Keyring is a daemon in the session, similar to ssh-agent,
+and other applications can use it to store passwords and other
+sensitive information.
+
+The program can manage several keyrings, each with its own master
+password, and there is also a session keyring which is never stored to
+disk, but forgotten when the session ends.
+
+%package -n libgnome-keyring0
+License: GPLv2+ ; LGPLv2.1+
+Group: System/GUI/GNOME
+Summary: GNOME Keyring Password Manager - PAM module
+Recommends: %{name} = %{version}
+
+%description -n libgnome-keyring0
+The GNOME Keyring is a daemon in the session, similar to ssh-agent,
+and other applications can use it to store passwords and other
+sensitive information.
+
+The program can manage several keyrings, each with its own master
+password, and there is also a session keyring which is never stored to
+disk, but forgotten when the session ends.
+
+%package -n libgcr0
+License: GPLv2+ ; LGPLv2.1+
+Group: System/GUI/GNOME
+Summary: Library for Crypto UI related task
+Recommends: %{name} = %{version}
+
+%description -n libgcr0
+GCR is a library for crypto UI and related tasks.
+
+%package -n libgp11-0
+License: GPLv2+ ; LGPLv2.1+
+Group: System/GUI/GNOME
+Summary: Glib wrapper library for PKCS#11
+Recommends: libgp11-modules = %{version}
+
+%description -n libgp11-0
+GP11 is a wrapper based on GLib implementing the PKCS#11 (Cryptoki)
+interface.
+
+%package -n libgp11-modules
+License: GPLv2+ ; LGPLv2.1+
+Group: System/GUI/GNOME
+Summary: Glib wrapper library for PKCS#11 - Modules
+Requires: libgp11-0 = %{version}
+
+%description -n libgp11-modules
+GP11 is a wrapper based on GLib implementing the PKCS#11 (Cryptoki)
+interface.
+
+This package contains various PKCS#11 modules, to expose keys and
+certificates from different sources.
%package pam
-License: GPL v2 or later ; LGPL v2.1 or later
+License: GPLv2+ ; LGPLv2.1+
Group: System/GUI/GNOME
-Summary: GNOME Keyring Password Manager
+Summary: GNOME Keyring Password Manager - PAM module
Requires: %{name} = %{version}
+PreReq: pam-config >= 0.72
PreReq: sed
# Package was present in OpenSUSE 10.2 and 10.3:
-Obsoletes: pam_keyring <= 0.0.8
-Provides: pam_keyring <= 0.0.8
+Provides: pam_keyring = 0.0.8
+Obsoletes: pam_keyring < 0.0.8
%description pam
-GNOME Keyring Manager is a program that keeps passwords and other
-secrets for users. It is run as a daemon in the session, similar to
-ssh-agent, and other applications can locate it by an environment
-variable.
+The GNOME Keyring is a daemon in the session, similar to ssh-agent,
+and other applications can use it to store passwords and other
+sensitive information.
+
+The program can manage several keyrings, each with its own master
+password, and there is also a session keyring which is never stored to
+disk, but forgotten when the session ends.
+
+The PAM module can be used to unlock the keyring on login.
%package devel
-License: GPL v2 or later ; LGPL v2.1 or later
+License: GPLv2+ ; LGPLv2.1+
Group: Development/Libraries/GNOME
Summary: GNOME Keyring Password Manager
Requires: %{name} = %{version}
+Requires: libgnome-keyring0 = %{version}
+Requires: libgcr0 = %{version}
+Requires: libgp11-0 = %{version}
Requires: glib2-devel
Requires: gtk2-devel
Requires: libtasn1-devel
-Provides: gnome-keyring-doc <= %{version}
+Provides: gnome-keyring-doc < %{version}
Obsoletes: gnome-keyring-doc = %{version}
%description devel
@@ -99,18 +155,17 @@
translation-update-upstream
%patch4
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
%build
%configure\
- --libexecdir=%{_prefix}/lib/gnome-keyring-1\
+ --libexecdir=%{_libexecdir}/gnome-keyring-1\
--with-pam-dir=/%{_lib}/security \
--disable-acl-prompts
make %{?jobs:-j%jobs}
%install
%makeinstall
+find %{buildroot} -type f -name "*.la" -delete -print
%find_lang %{name}
%find_gconf_schemas
%{__rm} -f %{buildroot}%{_libdir}/*.la
@@ -122,16 +177,24 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
%pre -f %{name}.schemas_pre
%preun -f %{name}.schemas_preun
%posttrans -f %{name}.schemas_posttrans
+%post -n libgnome-keyring0 -p /sbin/ldconfig
+
+%postun -n libgnome-keyring0 -p /sbin/ldconfig
+
+%post -n libgcr0 -p /sbin/ldconfig
+
+%postun -n libgcr0 -p /sbin/ldconfig
+
+%post -n libgp11-0 -p /sbin/ldconfig
+
+%postun -n libgp11-0 -p /sbin/ldconfig
+
%post pam
%{_sbindir}/pam-config -a --gnome_keyring --gnome_keyring-auto_start --gnome_keyring-only_if=gdm || true
# Remove leftover from the old way, before we used pam-config. We start
@@ -153,16 +216,37 @@
%defattr (-, root, root)
%doc AUTHORS ChangeLog NEWS README TODO
%{_bindir}/*
-%{_libdir}/*.so.*
-%{_prefix}/lib/gnome-keyring-1
-%{_libdir}/gnome-keyring
+%{_libexecdir}/gnome-keyring-1/
+%{_libdir}/gnome-keyring/gnome-keyring-pkcs11.so
%{_datadir}/dbus-1/services/org.gnome.keyring.service
%{_sysconfdir}/xdg/autostart/*.desktop
-%{_datadir}/gcr
-%{_datadir}/gcr/ui
%files lang -f %{name}.lang
+%files -n libgnome-keyring0
+%defattr (-, root, root)
+%{_libdir}/libgnome-keyring.so.*
+
+%files -n libgcr0
+%defattr (-, root, root)
+%{_libdir}/libgcr.so.*
+%{_datadir}/gcr/
+
+%files -n libgp11-0
+%defattr (-, root, root)
+%{_libdir}/libgp11.so.*
+%dir %{_libdir}/gnome-keyring
+%dir %{_libdir}/gnome-keyring/devel
+%dir %{_libdir}/gnome-keyring/standalone
+
+%files -n libgp11-modules
+%defattr (-, root, root)
+%{_libdir}/gnome-keyring/devel/gck-ssh-store-standalone.so
+%{_libdir}/gnome-keyring/devel/gck-user-store-standalone.so
+%{_libdir}/gnome-keyring/standalone/gck-roots-store-standalone.so
+
+%files pam
+
%files pam
%defattr (-, root, root)
%attr(555,root,root) /%{_lib}/security/*.so
++++++ gnome-keyring-2.28.0.tar.bz2 -> gnome-keyring-2.28.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-2.28.0/ChangeLog new/gnome-keyring-2.28.1/ChangeLog
--- old/gnome-keyring-2.28.0/ChangeLog 2009-09-21 18:10:19.000000000 +0200
+++ new/gnome-keyring-2.28.1/ChangeLog 2009-10-18 01:35:44.000000000 +0200
@@ -1,5 +1,120 @@
# Generate automatically. Do not edit.
+commit 1c6fc47e9abaaa25fa2bf2e081f3da81f08d31d4
+Author: Stef Walter
+Date: 2009-10-10
+
+ [pkcs11] Make custom pkcs11 constants unsigned longs.
+
+ Make our custom PKCS#11 unsigned longs, which could otherwise
+ be problematic on 64-bit platforms. See bug #595543
+
+ pkcs11/pkcs11g.h | 6 +++---
+ pkcs11/pkcs11i.h | 8 ++++----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+commit 7ddaf5e8d62d3c0955915b3202ae1462aae2e932
+Author: Stef Walter
+Date: 2009-10-10
+
+ [gck] Use unsigned long for module handle counter.
+
+ Fix compiler warning by using unsigned long for module handle
+ counter. See bug #595543
+
+ pkcs11/gck/gck-module.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit e27b1c9b274fb58dc9724f0d176211312a035053
+Author: Vincent Untz
+Date: 2009-10-08
+
+ 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
+
+ Signed-off-by: Stef Walter
+
+ pkcs11/ssh-agent/gck-ssh-agent-ops.c | 10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+commit aabb6f6c77796e7d1f8ba961c109fa093291326c
+Author: Vincent Untz
+Date: 2009-10-02
+
+ [daemon] Fix a delay when the daemon quits
+
+ g-k-d is a multi-threaded program, using a signal thread to stop the
+ main loop. The main thread was using raise() to send SIGTERM to the
+ signal thread, but it actually sends the signal to itself;
+ pthread_kill() has to be used.
+
+ This also implies a switch to pthread_create() instead of
+ g_thread_create() since the GThread API doesn't cover pthread_kill().
+
+ daemon/gkr-daemon.c | 19 +++++++++++++------
+ 1 files changed, 13 insertions(+), 6 deletions(-)
+
+commit 0eb9a70dfad3ef49cd1688582c9545082181e830
+Author: Jonny Lamb
+Date: 2009-10-01
+
+ Use default D-Bus timeout when finding daemon.
+
+ When we're trying to find the keyring daemon over D-Bus it's likely
+ that we're service activating it. If we've got a timeout of one
+ second and the system is under heavy load (booting, for example), then
+ it will not start in time, and gnome_keyring_is_available() will
+ return FALSE.
+
+ The default timeout in dbus-daemon is 25 seconds at the time of
+ writing. Although this sounds a lot for a blocking call in
+ _is_available, the only situation where it could take this amount of
+ time is if the keyring daemon is on the bus but is not responding
+ (it's wedged itself somehow). In all other circumstances, a response
+ should come immediately.
+
+ Signed-off-by: Jonny Lamb
+ Signed-off-by: Stef Walter
+
+ library/gnome-keyring-socket.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 3341fb92230ec4da70290727629c34be2ec5ec61
+Author: Stef Walter
+Date: 2009-09-30
+
+ [egg] Fix assertion when releasing secure memory block.
+
+ If a secure memory block was allocated that was not multiple of
+ page size, then on releasing that block, an assertion was
+ raised. The source of the problem was a lack of tracking the
+ actually allocated block size.
+
+ egg/egg-secure-memory.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit b7bb8bcfaa02784abc34aa9abde1cebf2219134b
+Author: Stef Walter
+Date: 2009-09-21
+
+ Bump version number
+
+ configure.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit a10c2d4e7fc50ce299fb13854341e0105f14c614
+Author: Stef Walter
+Date: 2009-09-21
+
+ Release version 2.28.0
+
+ NEWS | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
commit eaf00c124242f2872d1fff7368b253114ac17a9f
Author: Nirbheek Chauhan
Date: 2009-09-21
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-2.28.0/NEWS new/gnome-keyring-2.28.1/NEWS
--- old/gnome-keyring-2.28.0/NEWS 2009-09-21 17:45:21.000000000 +0200
+++ new/gnome-keyring-2.28.1/NEWS 2009-10-18 01:31:09.000000000 +0200
@@ -1,5 +1,13 @@
-Changes in version 2.80.0 are:
- * Fix build problems.
+Changes in version 2.28.1 are:
+ * Fix support for SSH RSA1 keys.
+ * Fix a delay when the daemon quits.
+ * Use default D-Bus timeout when finding daemon.
+ * Make custom pkcs11 constants unsigned longs.
+ * Use unsigned long for module handle counter.
+ * Fix assertion when releasing secure memory block.
+
+Changes in version 2.28.0 are:
+ * Fix build problems.
Changes in version 2.27.92 are:
* Some uses of glib memory routines to explicitly allocate memory.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-2.28.0/configure new/gnome-keyring-2.28.1/configure
--- old/gnome-keyring-2.28.0/configure 2009-09-21 17:38:20.000000000 +0200
+++ new/gnome-keyring-2.28.1/configure 2009-10-18 01:31:51.000000000 +0200
@@ -2995,7 +2995,7 @@
# Define the identity of the package.
PACKAGE=gnome-keyring
- VERSION=2.28.0
+ VERSION=2.28.1
cat >>confdefs.h <<_ACEOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-2.28.0/configure.in new/gnome-keyring-2.28.1/configure.in
--- old/gnome-keyring-2.28.0/configure.in 2009-09-21 17:36:44.000000000 +0200
+++ new/gnome-keyring-2.28.1/configure.in 2009-10-18 01:27:22.000000000 +0200
@@ -1,6 +1,6 @@
AC_INIT(library/gnome-keyring.h)
-AM_INIT_AUTOMAKE(gnome-keyring, 2.28.0)
+AM_INIT_AUTOMAKE(gnome-keyring, 2.28.1)
AM_CONFIG_HEADER(config.h)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-2.28.0/daemon/gkr-daemon.c new/gnome-keyring-2.28.1/daemon/gkr-daemon.c
--- old/gnome-keyring-2.28.0/daemon/gkr-daemon.c 2009-09-21 17:36:44.000000000 +0200
+++ new/gnome-keyring-2.28.1/daemon/gkr-daemon.c 2009-10-18 01:27:22.000000000 +0200
@@ -43,6 +43,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -90,6 +91,8 @@
static gchar* run_components = NULL;
static gchar* login_password = NULL;
static gboolean initialization_completed = FALSE;
+static gboolean sig_thread_valid = FALSE;
+static pthread_t sig_thread;
static GOptionEntry option_entries[] = {
{ "foreground", 'f', 0, G_OPTION_ARG_NONE, &run_foreground,
@@ -370,7 +373,7 @@
static void
setup_signal_handling (GMainLoop *loop)
{
- GError *error = NULL;
+ int res;
/*
* Block these signals for this thread, and any threads
@@ -387,11 +390,12 @@
sigaddset (&signal_set, SIGTERM);
pthread_sigmask (SIG_BLOCK, &signal_set, NULL);
- g_thread_create (signal_thread, loop, FALSE, &error);
- if (error != NULL) {
+ res = pthread_create (&sig_thread, NULL, signal_thread, loop);
+ if (res == 0) {
+ sig_thread_valid = TRUE;
+ } else {
g_warning ("couldn't startup thread for signal handling: %s",
- error && error->message ? error->message : "");
- g_clear_error (&error);
+ g_strerror (res));
}
}
@@ -404,7 +408,10 @@
* starts the shutdown process.
*/
- raise (SIGTERM);
+ if (sig_thread_valid)
+ pthread_kill (sig_thread, SIGTERM);
+ else
+ raise (SIGTERM);
}
static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-2.28.0/daemon/gnome-keyring-daemon.desktop.in new/gnome-keyring-2.28.1/daemon/gnome-keyring-daemon.desktop.in
--- old/gnome-keyring-2.28.0/daemon/gnome-keyring-daemon.desktop.in 2009-09-21 17:46:03.000000000 +0200
+++ new/gnome-keyring-2.28.1/daemon/gnome-keyring-daemon.desktop.in 2009-10-18 01:32:04.000000000 +0200
@@ -9,4 +9,4 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-keyring
X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=2.28.0
+X-GNOME-Bugzilla-Version=2.28.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-2.28.0/docs/reference/gcr/html/ch01.html new/gnome-keyring-2.28.1/docs/reference/gcr/html/ch01.html
--- old/gnome-keyring-2.28.0/docs/reference/gcr/html/ch01.html 2009-09-21 18:10:13.000000000 +0200
+++ new/gnome-keyring-2.28.1/docs/reference/gcr/html/ch01.html 2009-10-18 01:35:43.000000000 +0200
@@ -22,7 +22,7 @@
</tr></table>
<div class="chapter" title="[Insert title here]">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id472985"></a>[Insert title here]</h2></div></div></div>
+<a name="id507128"></a>[Insert title here]</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="gcr-GcrImportDialog.html">GcrImportDialog</a></span><span class="refpurpose"></span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-2.28.0/docs/reference/gnome-keyring/html/ch01.html new/gnome-keyring-2.28.1/docs/reference/gnome-keyring/html/ch01.html
--- old/gnome-keyring-2.28.0/docs/reference/gnome-keyring/html/ch01.html 2009-09-21 18:10:13.000000000 +0200
+++ new/gnome-keyring-2.28.1/docs/reference/gnome-keyring/html/ch01.html 2009-10-18 01:35:43.000000000 +0200
@@ -22,7 +22,7 @@
</tr></table>
<div class="chapter" title="gnome-keyring API Reference">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id558063"></a>gnome-keyring API Reference</h2></div></div></div>
+<a name="id450690"></a>gnome-keyring API Reference</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="gnome-keyring-gnome-keyring-password.html">Simple Password Storage</a></span><span class="refpurpose"> — Store and lookup passwords with a set of attributes.</span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-2.28.0/docs/reference/gnome-keyring/html/gnome-keyring-gnome-keyring-password.html new/gnome-keyring-2.28.1/docs/reference/gnome-keyring/html/gnome-keyring-gnome-keyring-password.html
--- old/gnome-keyring-2.28.0/docs/reference/gnome-keyring/html/gnome-keyring-gnome-keyring-password.html 2009-09-21 18:10:13.000000000 +0200
+++ new/gnome-keyring-2.28.1/docs/reference/gnome-keyring/html/gnome-keyring-gnome-keyring-password.html 2009-10-18 01:35:43.000000000 +0200
@@ -130,7 +130,7 @@
<p>
</p>
<div class="example">
-<a name="id527481"></a><p class="title"><b>Example 1. Passing attributes to the functions</b></p>
+<a name="id420102"></a><p class="title"><b>Example 1. Passing attributes to the functions</b></p>
<div class="example-contents"><pre class="programlisting">
res = gnome_keyring_delete_password_sync (GNOME_KEYRING_NETWORK_PASSWORD,
"user", "me", // A string attribute
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-2.28.0/docs/reference/gp11/html/ch01.html new/gnome-keyring-2.28.1/docs/reference/gp11/html/ch01.html
--- old/gnome-keyring-2.28.0/docs/reference/gp11/html/ch01.html 2009-09-21 18:10:14.000000000 +0200
+++ new/gnome-keyring-2.28.1/docs/reference/gp11/html/ch01.html 2009-10-18 01:35:43.000000000 +0200
@@ -22,7 +22,7 @@
</tr></table>
<div class="chapter" title="PKCS#11 GObject Bindings">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id366966"></a>PKCS#11 GObject Bindings</h2></div></div></div>
+<a name="id536209"></a>PKCS#11 GObject Bindings</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="gp11-gp11-module.html">GP11Module</a></span><span class="refpurpose"> — A loaded and initialized PKCS<span class="type">11</span> module.</span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-2.28.0/egg/egg-secure-memory.c new/gnome-keyring-2.28.1/egg/egg-secure-memory.c
--- old/gnome-keyring-2.28.0/egg/egg-secure-memory.c 2009-09-21 17:36:44.000000000 +0200
+++ new/gnome-keyring-2.28.1/egg/egg-secure-memory.c 2009-10-18 01:27:22.000000000 +0200
@@ -873,8 +873,8 @@
if (size < DEFAULT_BLOCK_SIZE)
size = DEFAULT_BLOCK_SIZE;
- block->n_words = size / sizeof (word_t);
block->words = sec_acquire_pages (&size);
+ block->n_words = size / sizeof (word_t);
if (!block->words) {
pool_free (block);
pool_free (cell);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-2.28.0/library/gnome-keyring-socket.c new/gnome-keyring-2.28.1/library/gnome-keyring-socket.c
--- old/gnome-keyring-2.28.0/library/gnome-keyring-socket.c 2009-06-26 19:41:31.000000000 +0200
+++ new/gnome-keyring-2.28.1/library/gnome-keyring-socket.c 2009-10-04 18:18:23.000000000 +0200
@@ -72,7 +72,7 @@
}
/* Send message and get a handle for a reply */
- reply = dbus_connection_send_with_reply_and_block (dconn, msg, 1000, &derr);
+ reply = dbus_connection_send_with_reply_and_block (dconn, msg, -1, &derr);
dbus_message_unref (msg);
if (!reply) {
g_warning ("couldn't communicate with gnome keyring daemon via dbus: %s", derr.message);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-2.28.0/pkcs11/gck/gck-module.c new/gnome-keyring-2.28.1/pkcs11/gck/gck-module.c
--- old/gnome-keyring-2.28.0/pkcs11/gck/gck-module.c 2009-09-21 17:36:45.000000000 +0200
+++ new/gnome-keyring-2.28.1/pkcs11/gck/gck-module.c 2009-10-18 01:27:22.000000000 +0200
@@ -61,7 +61,7 @@
GckManager *token_manager;
GHashTable *apartments_by_id; /* Apartment (slot + application) by their id */
GHashTable *sessions_by_handle; /* Mapping of handle to all open sessions */
- gint handle_counter; /* Constantly incrementing counter for handles and the like */
+ gulong handle_counter; /* Constantly incrementing counter for handles and the like */
GArray *factories; /* Various registered object factories */
gboolean factories_sorted; /* Whether we need to sort the object factories */
@@ -552,7 +552,7 @@
gck_util_ulong_free, apartment_free);
self->pv->factories = g_array_new (FALSE, TRUE, sizeof (GckFactoryInfo));
- g_atomic_int_set (&(self->pv->handle_counter), 1);
+ self->pv->handle_counter = 1;
/* Create the store for transient objects */
self->pv->transient_store = GCK_STORE (gck_memory_store_new ());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-2.28.0/pkcs11/pkcs11g.h new/gnome-keyring-2.28.1/pkcs11/pkcs11g.h
--- old/gnome-keyring-2.28.0/pkcs11/pkcs11g.h 2009-08-19 06:44:47.000000000 +0200
+++ new/gnome-keyring-2.28.1/pkcs11/pkcs11g.h 2009-10-10 17:06:42.000000000 +0200
@@ -26,9 +26,9 @@
#include "pkcs11.h"
-#define CKA_GNOME (CKA_VENDOR_DEFINED | 0x474E4D45 /* GNME */ )
-#define CKO_GNOME (CKO_VENDOR_DEFINED | 0x474E4D45 /* GNME */ )
-#define CKR_GNOME (CKR_VENDOR_DEFINED | 0x474E4D45 /* GNME */ )
+#define CKA_GNOME (CKA_VENDOR_DEFINED | 0x474E4D45UL /* GNME */ )
+#define CKO_GNOME (CKO_VENDOR_DEFINED | 0x474E4D45UL /* GNME */ )
+#define CKR_GNOME (CKR_VENDOR_DEFINED | 0x474E4D45UL /* GNME */ )
/* -------------------------------------------------------------------
* OBJECT UNIQUE IDENTIFIER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-2.28.0/pkcs11/pkcs11i.h new/gnome-keyring-2.28.1/pkcs11/pkcs11i.h
--- old/gnome-keyring-2.28.0/pkcs11/pkcs11i.h 2009-09-21 17:36:45.000000000 +0200
+++ new/gnome-keyring-2.28.1/pkcs11/pkcs11i.h 2009-10-18 01:27:22.000000000 +0200
@@ -30,8 +30,8 @@
/* Signifies that nobody is logged in */
#define CKU_NONE G_MAXULONG
-#define CK_GNOME_MAX_SLOT (0x000000FF)
-#define CK_GNOME_MAX_HANDLE (((CK_ULONG)-1) >> 10)
+#define CK_GNOME_MAX_SLOT (0x000000FFUL)
+#define CK_GNOME_MAX_HANDLE (((CK_ULONG)-1UL) >> 10)
/* -------------------------------------------------------------------
* OBJECT HASH
@@ -45,10 +45,10 @@
*/
/* Flag for CK_INFO when applications are supported */
-#define CKF_G_APPLICATIONS 0x40000000
+#define CKF_G_APPLICATIONS 0x40000000UL
/* Call C_OpenSession with this when passing CK_G_APPLICATION */
-#define CKF_G_APPLICATION_SESSION 0x40000000
+#define CKF_G_APPLICATION_SESSION 0x40000000UL
typedef CK_ULONG CK_G_APPLICATION_ID;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-2.28.0/pkcs11/ssh-agent/gck-ssh-agent-ops.c new/gnome-keyring-2.28.1/pkcs11/ssh-agent/gck-ssh-agent-ops.c
--- old/gnome-keyring-2.28.0/pkcs11/ssh-agent/gck-ssh-agent-ops.c 2009-07-21 15:59:12.000000000 +0200
+++ new/gnome-keyring-2.28.1/pkcs11/ssh-agent/gck-ssh-agent-ops.c 2009-10-10 17:06:42.000000000 +0200
@@ -685,6 +685,7 @@
{
GP11Attributes *pub, *priv;
GP11Session *session;
+ gchar *comment = NULL;
gboolean ret;
gsize offset = 5;
guint32 unused;
@@ -702,6 +703,15 @@
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;
+ }
+
+ g_free (comment);
+
gp11_attributes_add_string (priv, CKA_LABEL, V1_LABEL);
gp11_attributes_add_string (pub, CKA_LABEL, V1_LABEL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-2.28.0/po/Makefile.in.in new/gnome-keyring-2.28.1/po/Makefile.in.in
--- old/gnome-keyring-2.28.0/po/Makefile.in.in 2009-09-21 17:45:46.000000000 +0200
+++ new/gnome-keyring-2.28.1/po/Makefile.in.in 2009-10-18 01:31:47.000000000 +0200
@@ -129,7 +129,7 @@
done
# Empty stubs to satisfy archaic automake needs
-dvi info tags TAGS ID:
+dvi info ctags tags CTAGS TAGS ID:
# Define this as empty until I found a useful application.
install-exec installcheck:
++++++ gnome-keyring-check-session.patch ++++++
--- /var/tmp/diff_new_pack.G4dnk9/_old 2009-12-08 10:35:56.000000000 +0100
+++ /var/tmp/diff_new_pack.G4dnk9/_new 2009-12-08 10:35:56.000000000 +0100
@@ -2,8 +2,8 @@
===================================================================
--- pam/gkr-pam-module.c.orig
+++ pam/gkr-pam-module.c
-@@ -77,9 +77,30 @@ enum {
- #define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR
+@@ -94,9 +94,30 @@ enum {
+ #endif
#endif
+static const char* get_any_env (pam_handle_t *ph, const char *name);
@@ -33,7 +33,7 @@
static void
close_safe (int fd)
-@@ -834,7 +855,7 @@ pam_sm_authenticate (pam_handle_t *ph, i
+@@ -879,7 +900,7 @@ pam_sm_authenticate (pam_handle_t *ph, i
started_daemon = 0;
/* Should we start the daemon? */
@@ -42,7 +42,7 @@
ret = start_daemon_if_necessary (ph, pwd, password, &started_daemon);
if (ret != PAM_SUCCESS)
return ret;
-@@ -901,7 +922,7 @@ pam_sm_open_session (pam_handle_t *ph, i
+@@ -951,7 +972,7 @@ pam_sm_open_session (pam_handle_t *ph, i
started_daemon = 0;
/* Should we start the daemon? */
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org