From 966295234012f23a5c28bad86635cd9a4de046c4 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 2 Apr 2009 14:04:52 +0000 Subject: [PATCH] - 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 | 13 +++++++++++++ gnome-keyring.spec | 11 ++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gnome-keyring-2.26.0-egg-endless-loop.patch diff --git a/gnome-keyring-2.26.0-egg-endless-loop.patch b/gnome-keyring-2.26.0-egg-endless-loop.patch new file mode 100644 index 0000000..c5bebad --- /dev/null +++ b/gnome-keyring-2.26.0-egg-endless-loop.patch @@ -0,0 +1,13 @@ +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 { diff --git a/gnome-keyring.spec b/gnome-keyring.spec index 96f2686..e7a88ee 100644 --- a/gnome-keyring.spec +++ b/gnome-keyring.spec @@ -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 @@ automatically unlock the "login" keyring when the user logs in. %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 @@ fi %changelog +* Thu Apr 02 2009 Richard Hughes - 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 - 2.26.0-1 - Update to 2.26.0