rpms/seahorse-plugins/devel seahorse-agent-uninit.patch, NONE, 1.1 seahorse-plugins.spec, 1.32, 1.33

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17198

Modified Files:
	seahorse-plugins.spec 
Added Files:
	seahorse-agent-uninit.patch 
Log Message:
Copy F12 changes


seahorse-agent-uninit.patch:
 seahorse-agent-main.c |    2 +-
 seahorse-agent.c      |    6 ------
 seahorse-agent.h      |    1 -
 3 files changed, 1 insertion(+), 8 deletions(-)

--- NEW FILE seahorse-agent-uninit.patch ---
diff -up seahorse-plugins-2.28.1/agent/seahorse-agent.c.uninit seahorse-plugins-2.28.1/agent/seahorse-agent.c
--- seahorse-plugins-2.28.1/agent/seahorse-agent.c.uninit	2009-11-09 19:48:13.260584104 -0500
+++ seahorse-plugins-2.28.1/agent/seahorse-agent.c	2009-11-09 19:48:26.065839414 -0500
@@ -160,9 +160,3 @@ seahorse_agent_uninit (gpointer *data)
     
     return FALSE;
 }
-
-void
-seahorse_agent_exit ()
-{
-    seahorse_agent_uninit (NULL);
-}
diff -up seahorse-plugins-2.28.1/agent/seahorse-agent.h.uninit seahorse-plugins-2.28.1/agent/seahorse-agent.h
--- seahorse-plugins-2.28.1/agent/seahorse-agent.h.uninit	2009-11-09 19:48:35.567605890 -0500
+++ seahorse-plugins-2.28.1/agent/seahorse-agent.h	2009-11-09 19:48:41.356583595 -0500
@@ -55,7 +55,6 @@ void seahorse_agent_childsetup ();
 /* Called in the new child process */
 gboolean seahorse_agent_init ();
 gboolean seahorse_agent_uninit (gpointer *data);
-void     seahorse_agent_exit ();
 
 /* Global options to set from the command line */
 extern gboolean seahorse_agent_cshell;
diff -up seahorse-plugins-2.28.1/agent/seahorse-agent-main.c.uninit seahorse-plugins-2.28.1/agent/seahorse-agent-main.c
--- seahorse-plugins-2.28.1/agent/seahorse-agent-main.c.uninit	2009-11-09 19:48:55.069584989 -0500
+++ seahorse-plugins-2.28.1/agent/seahorse-agent-main.c	2009-11-09 19:49:23.294833587 -0500
@@ -253,7 +253,7 @@ int main(int argc, char* argv[])
      */
     daemonize (seahorse_agent_execvars ? agent_exec_args : NULL);
 
-    atexit (seahorse_agent_exit);
+    atexit (seahorse_agent_io_uninit);
 
     g_strfreev (agent_exec_args);
     agent_exec_args = NULL;


Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse-plugins/devel/seahorse-plugins.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- seahorse-plugins.spec	2 Nov 2009 13:09:59 -0000	1.32
+++ seahorse-plugins.spec	10 Nov 2009 01:15:01 -0000	1.33
@@ -1,13 +1,16 @@
 Name:		seahorse-plugins
-Version:	2.29.1
-Release:	1%{?dist}
+Version:	2.28.1
+Release:	2%{?dist}
 Summary:	Plugins and utilities for encryption in GNOME
 Group:		User Interface/Desktops
 License:	GPLv2+ and GFDL
 URL:		http://projects.gnome.org/seahorse/
-Source:		http://download.gnome.org/sources/seahorse-plugins/2.29/%{name}-%{version}.tar.bz2
+Source:		http://download.gnome.org/sources/seahorse-plugins/2.28/%{name}-%{version}.tar.bz2
 Source1:	seahorse-agent.sh
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=579738
+Patch0:		seahorse-agent-uninit.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  intltool
@@ -59,6 +62,7 @@ from applications like nautilus or gedit
 
 %prep
 %setup -q
+%patch0 -p1 -b .uninit
 
 autoreconf -i -f
 
@@ -183,8 +187,9 @@ fi
 #%{_libdir}/epiphany/2.27/extensions/seahorse.ephy-extension
 
 %changelog
-* Mon Nov  2 2009 Tomas Bzatek <tbzatek at redhat.com> 2.29.1-1
-- Update to 2.29.1
+* Mon Nov  9 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-2
+- Don't call problematic functions in an atexit handler,
+  since this can lead to segfaults at session end (#524415)
 
 * Mon Oct 19 2009 Tomas Bzatek <tbzatek at redhat.com> 2.28.1-1
 - Update to 2.28.1