rpms/nautilus/F-8 nautilus-2.20.0-92_from_svn_no_buggy_signal_handler.patch, NONE, 1.1 nautilus.spec, 1.174, 1.175

[Tomas Bzatek (tbzatek)]

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26925

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-2.20.0-92_from_svn_no_buggy_signal_handler.patch 
Log Message:
* Thu Feb 21 2008 - Tomas Bzatek <tbzatek at redhat.com> - 2.20.0-8
- Fix "(USER): debug log dumped due to signal 11" loop (#430333)


nautilus-2.20.0-92_from_svn_no_buggy_signal_handler.patch:

--- NEW FILE nautilus-2.20.0-92_from_svn_no_buggy_signal_handler.patch ---
--- trunk/src/nautilus-main.c	2007/12/17 09:55:38	13532
+++ trunk/src/nautilus-main.c	2007/12/17 11:11:48	13533
@@ -230,13 +230,6 @@
 	return FALSE;
 }
 
-/* sigaction structures for the old handlers of these signals */
-static struct sigaction old_segv_sa;
-static struct sigaction old_abrt_sa;
-static struct sigaction old_trap_sa;
-static struct sigaction old_fpe_sa;
-static struct sigaction old_bus_sa;
-
 static void
 sigusr1_handler (int sig)
 {
@@ -244,6 +237,17 @@
 		;
 }
 
+/* This is totally broken as we're using non-signal safe
+ * calls in sigfatal_handler. Disable by default. */
+#ifdef USE_SEGV_HANDLER
+
+/* sigaction structures for the old handlers of these signals */
+static struct sigaction old_segv_sa;
+static struct sigaction old_abrt_sa;
+static struct sigaction old_trap_sa;
+static struct sigaction old_fpe_sa;
+static struct sigaction old_bus_sa;
+
 static void
 sigfatal_handler (int sig)
 {
@@ -286,6 +290,7 @@
 	if (func != NULL && func != SIG_IGN && func != SIG_DFL)
 		(* func) (sig);
 }
+#endif
 
 static void
 setup_debug_log_signals (void)
@@ -304,6 +309,9 @@
 	sa.sa_flags = 0;
 	sigaction (SIGUSR1, &sa, NULL);
 
+	/* This is totally broken as we're using non-signal safe
+	 * calls in sigfatal_handler. Disable by default. */
+#ifdef USE_SEGV_HANDLER
 	sa.sa_handler = sigfatal_handler;
 	sigemptyset (&sa.sa_mask);
 	sa.sa_flags = 0;
@@ -313,6 +321,7 @@
 	sigaction(SIGTRAP, &sa, &old_trap_sa);
 	sigaction(SIGFPE,  &sa, &old_fpe_sa);
 	sigaction(SIGBUS,  &sa, &old_bus_sa);
+#endif
 }
 
 static GLogFunc default_log_handler;


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-8/nautilus.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- nautilus.spec	19 Dec 2007 16:36:13 -0000	1.174
+++ nautilus.spec	21 Feb 2008 14:45:30 -0000	1.175
@@ -18,7 +18,7 @@
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
 Version: 	2.20.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.20/%{name}-%{version}.tar.bz2
@@ -87,6 +87,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=486827
 Patch9:		nautilus-2.20-make-audio-preview-work.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=430333
+Patch10:	nautilus-2.20.0-92_from_svn_no_buggy_signal_handler.patch
+
 %description
 Nautilus integrates access to files, applications, media,
 Internet-based resources and the Web. Nautilus delivers a dynamic and
@@ -124,6 +127,7 @@
 %patch7 -p0 -b .async_thumbnail_fixes
 %patch8 -p1 -b .small-font-fix
 %patch9 -p0 -b .audio-preview
+%patch10 -p1 -b .stuck-segfault
 
 %build
 
@@ -232,6 +236,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Feb 21 2008 - Tomas Bzatek <tbzatek at redhat.com> - 2.20.0-8
+- Fix "(USER): debug log dumped due to signal 11" loop (#430333)
+
 * Wed Dec 19 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.0-7
 - Update audio preview patch to check for aliases (#381401)