r16840 - in /desktop/unstable/nautilus/debian: changelog patches/25_disable_sighandler.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Aug 30 00:25:45 2008
New Revision: 16840

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16840
Log:
25_disable_sighandler.patch: patch from upstram SVN. Disable the 
horrible signal handler that makes nautilus go wild while filling 
its debug log. Closes: #454764.

Added:
    desktop/unstable/nautilus/debian/patches/25_disable_sighandler.patch
Modified:
    desktop/unstable/nautilus/debian/changelog
    desktop/unstable/nautilus/debian/patches/series

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=16840&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog (original)
+++ desktop/unstable/nautilus/debian/changelog Sat Aug 30 00:25:45 2008
@@ -1,3 +1,11 @@
+nautilus (2.20.0-7) UNRELEASED; urgency=low
+
+  * 25_disable_sighandler.patch: patch from upstram SVN. Disable the 
+    horrible signal handler that makes nautilus go wild while filling 
+    its debug log. Closes: #454764.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 30 Aug 2008 02:25:59 +0200
+
 nautilus (2.20.0-6) unstable; urgency=low
 
   * 24_smb_crash.patch: patch from upstream to handle NULL MIME types 

Added: desktop/unstable/nautilus/debian/patches/25_disable_sighandler.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/25_disable_sighandler.patch?rev=16840&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/25_disable_sighandler.patch (added)
+++ desktop/unstable/nautilus/debian/patches/25_disable_sighandler.patch Sat Aug 30 00:25:45 2008
@@ -1,0 +1,64 @@
+Debian #454764
+LP #150471
+Upstream commit r13533
+
+--- trunk/src/nautilus-main.c	2007/12/10 15:30:49	13515
++++ 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;

Modified: desktop/unstable/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/series?rev=16840&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/series (original)
+++ desktop/unstable/nautilus/debian/patches/series Sat Aug 30 00:25:45 2008
@@ -16,4 +16,5 @@
 21_nautilus_xmp.patch
 23_thumbnails_add-border.patch
 24_smb_crash.patch
+25_disable_sighandler.patch
 99_ltmain_as-needed.patch