[libgnome-keyring/f15/master] Update to 2.91.92

[Tomas Bzatek]

commit cbc8da185804e43c92d7621b4c99b22a9cc44e61
Author: Tomas Bzatek <tbzatek at redhat.com>
Date:   Fri Mar 11 14:48:57 2011 +0100

    Update to 2.91.92

 .gitignore                                      |    1 +
 libgnome-keyring-2.91.93-operation-assert.patch |   26 +++++++++++++++++++++++
 libgnome-keyring.spec                           |   14 ++++++++++-
 sources                                         |    2 +-
 4 files changed, 40 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 23414d9..d788ab3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 libgnome-keyring-2.30.0.tar.bz2
 /libgnome-keyring-2.31.91.tar.bz2
 /libgnome-keyring-2.32.0.tar.bz2
+/libgnome-keyring-2.91.92.tar.bz2
diff --git a/libgnome-keyring-2.91.93-operation-assert.patch b/libgnome-keyring-2.91.93-operation-assert.patch
new file mode 100644
index 0000000..37d1049
--- /dev/null
+++ b/libgnome-keyring-2.91.93-operation-assert.patch
@@ -0,0 +1,26 @@
+From 84103a1d29e66ede966874e4af4b17706605cd48 Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw at collabora.co.uk>
+Date: Thu, 10 Mar 2011 16:12:23 +0000
+Subject: This assertion is vulnerable to corner conditions.
+
+In particular if the operation completes one pending call, unrefs it
+and creates another pending call, and the memory allocator decides
+to allocate that same memory for the next pending call, then this
+will assert in a bogus way.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=660407
+---
+diff --git a/library/gkr-operation.c b/library/gkr-operation.c
+index 7600cd7..0fbba4d 100644
+--- a/library/gkr-operation.c
++++ b/library/gkr-operation.c
+@@ -404,7 +404,6 @@ gkr_operation_block_and_unref (GkrOperation *op)
+ 			if (op->pending == pending) {
+ 				g_return_val_if_fail (dbus_pending_call_get_completed (pending), BROKEN);
+ 				on_pending_call_notify (pending, op);
+-				g_assert (op->pending != pending);
+ 			}
+ 		} else if (op->prompting) {
+ 			dbus_connection_flush (op->conn);
+--
+cgit v0.8.3.4
diff --git a/libgnome-keyring.spec b/libgnome-keyring.spec
index 6d38285..9aa87ac 100644
--- a/libgnome-keyring.spec
+++ b/libgnome-keyring.spec
@@ -4,14 +4,20 @@
 
 Summary: Framework for managing passwords and other secrets
 Name: libgnome-keyring
-Version: 2.32.0
-Release: 2%{?dist}
+Version: 2.91.92
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 #VCS: git:git://git.gnome.org/libgnome-keyring
 Source: http://download.gnome.org/sources/libgnome-keyring/2.32/libgnome-keyring-%{version}.tar.bz2
 URL: http://live.gnome.org/GnomeKeyring
 
+
+# gkr_operation_block_and_unref(): assertion failed: (op->pending != pending)
+# https://bugzilla.gnome.org/show_bug.cgi?id=644407
+Patch0: libgnome-keyring-2.91.93-operation-assert.patch
+
+
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: libgcrypt-devel >= %{gcrypt_version}
@@ -39,6 +45,7 @@ header files needed to develop applications that use libgnome-keyring.
 
 %prep
 %setup -q -n libgnome-keyring-%{version}
+%patch0 -p1 -b .op-assert
 
 
 %build
@@ -77,6 +84,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %changelog
+* Fri Mar 11 2011 Tomas Bzatek <tbzatek at redhat.com> - 2.91.92-1
+- Update to 2.91.92
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.32.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index a91fbb8..9028ebc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c42b2ca66204835d901d3dbfc1fa5ae6  libgnome-keyring-2.32.0.tar.bz2
+3b84c940bea3388a7ed4aa385cf14fc5  libgnome-keyring-2.91.92.tar.bz2