rpms/gnome-keyring/devel gnome-keyring-2.26.0-egg-endless-loop.patch, NONE, 1.1 gnome-keyring.spec, 1.118, 1.119

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13452

Modified Files:
	gnome-keyring.spec 
Added Files:
	gnome-keyring-2.26.0-egg-endless-loop.patch 
Log Message:
* Thu Apr 02 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.0-2
- Fix a nasty bug that's been fixed upstream where gnome-keyring-daemon
  would hang when re-allocating from a pool of secure memory.


gnome-keyring-2.26.0-egg-endless-loop.patch:

--- NEW FILE gnome-keyring-2.26.0-egg-endless-loop.patch ---
diff --git a/egg/egg-secure-memory.c b/egg/egg-secure-memory.c
index a215364..ba0cf5c 100644
--- a/egg/egg-secure-memory.c
+++ b/egg/egg-secure-memory.c
@@ -341,7 +341,7 @@ sec_insert_cell_ring (Cell **ring, Cell *cell)
 	/* Insert back into the mix of available memory */ 
 	if (*ring) { 
 		cell->next = (*ring)->next;
-		cell->prev = (*ring)->prev;
+		cell->prev = *ring;
 		cell->next->prev = cell;
 		cell->prev->next = cell;
 	} else {


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- gnome-keyring.spec	16 Mar 2009 12:52:16 -0000	1.118
+++ gnome-keyring.spec	2 Apr 2009 14:04:52 -0000	1.119
@@ -8,12 +8,16 @@
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.26/gnome-keyring-%{version}.tar.bz2
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+
+# already in gnome svn, fixes a nasty bug described in http://bugzilla.gnome.org/show_bug.cgi?id=575247
+Patch0:    gnome-keyring-2.26.0-egg-endless-loop.patch
+
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: GConf2-devel
@@ -65,6 +69,7 @@
 
 %prep
 %setup -q -n gnome-keyring-%{version}
+%patch0 -p1 -b .nasty-endless-loop
 
 %build
 %configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
@@ -141,6 +146,10 @@
 
 
 %changelog
+* Thu Apr 02 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.0-2
+- Fix a nasty bug that's been fixed upstream where gnome-keyring-daemon
+  would hang when re-allocating from a pool of secure memory.
+
 * Mon Mar 16 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.0-1
 - Update to 2.26.0