xorg-server: Changes to 'ubuntu'
debian/changelog | 10 ++++++++++
debian/patches/135_rethrow_signals.patch | 19 +++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 30 insertions(+)
New commits:
commit 1f230c7ce2ecd93d27a1401cb03ec9e709d68977
Author: Bryce Harrington <bryce@ubuntu.com>
Date: Wed Aug 6 13:26:16 2008 +0300
Add 135_rethrow_signals.patch
Currently Xorg "eats" its crash signals, issuing an error message
that it caught the signal and then aborts. This patch raises the
signal it caught, so that subsequent crash handlers (i.e. apport)
can also catch and act on it.
diff --git a/debian/changelog b/debian/changelog
index 72b616a..8a7f15b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xorg-server (2:1.4.99.906-1ubuntu2) intrepid; urgency=low
+
+ * Add 135_rethrow_signals.patch
+ - Currently Xorg "eats" its crash signals, issuing an error message
+ that it caught the signal and then aborts. This patch raises the
+ signal it caught, so that subsequent crash handlers (i.e. apport)
+ can also catch and act on it.
+
+ -- Bryce Harrington <bryce@ubuntu.com> Tue, 05 Aug 2008 16:20:46 -0700
+
xorg-server (2:1.4.99.906-1ubuntu1) intrepid; urgency=low
* Merge with debian experimental, 1.5RC6 (LP: #247120, #253021)
diff --git a/debian/patches/135_rethrow_signals.patch b/debian/patches/135_rethrow_signals.patch
new file mode 100644
index 0000000..6d3faf1
--- /dev/null
+++ b/debian/patches/135_rethrow_signals.patch
@@ -0,0 +1,19 @@
+diff -Nurp xorg-server-1.4.99.905/hw/xfree86/common/xf86Events.c xorg-server-1.4.99.905-working/hw/xfree86/common/xf86Events.c
+--- xorg-server-1.4.99.905/hw/xfree86/common/xf86Events.c 2008-06-30 13:11:03.000000000 -0700
++++ xorg-server-1.4.99.905-working/hw/xfree86/common/xf86Events.c 2008-07-14 08:23:51.000000000 -0700
+@@ -763,6 +763,15 @@ xf86SigHandler(int signo)
+
+ xorg_backtrace();
+
++ switch (signo) {
++ case SIGSEGV:
++ case SIGBUS:
++ case SIGILL:
++ case SIGFPE:
++ ErrorF ("Caught signal %d. Server aborting\n", signo);
++ raise (signo);
++ }
++
+ FatalError("Caught signal %d. Server aborting\n", signo);
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 41fac00..16fc637 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
132_add_parsing_for_xkb.options.patch
133_support_strlist_for_xkboptions.patch
134_protect_against_out_of_bounds.patch
+135_rethrow_signals.patch
Reply to: