xorg-server: Changes to 'ubuntu'
debian/changelog | 8 ++++++++
debian/patches/168_glibc_trace_to_stderr.patch | 18 ++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 27 insertions(+)
New commits:
commit ecd90205843e7d2d048d73b8fe700aeee61953c4
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Thu Mar 19 23:54:59 2009 -0700
Patch from kees to send glibc traces to stderr instead of vt7
diff --git a/debian/changelog b/debian/changelog
index 2829d7e..4b1dc0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.6.0-0ubuntu4) jaunty; urgency=low
+
+ * Add 168_glibc_trace_to_stderr.patch:
+ - Catch glibc internal abort traces on stderr instead of to the
+ controlling terminal (LP: #345748).
+
+ -- Kees Cook <kees@ubuntu.com> Thu, 19 Mar 2009 22:39:33 -0700
+
xorg-server (2:1.6.0-0ubuntu3) jaunty; urgency=low
* Add 165_man_xorg_conf_no_device_ident.patch:
diff --git a/debian/patches/168_glibc_trace_to_stderr.patch b/debian/patches/168_glibc_trace_to_stderr.patch
new file mode 100644
index 0000000..0132229
--- /dev/null
+++ b/debian/patches/168_glibc_trace_to_stderr.patch
@@ -0,0 +1,18 @@
+Index: xorg-server-1.6.0/hw/xfree86/common/xf86Init.c
+===================================================================
+--- xorg-server-1.6.0.orig/hw/xfree86/common/xf86Init.c 2009-03-19 23:19:45.000000000 -0700
++++ xorg-server-1.6.0/hw/xfree86/common/xf86Init.c 2009-03-19 23:23:22.000000000 -0700
+@@ -1345,8 +1345,12 @@
+ signal(SIGCHLD, SIG_DFL); /* Need to wait for child processes */
+ #endif
+
+- if (!beenHere)
++ if (!beenHere) {
++ /* have glibc report internal abort traces to stderr instead of
++ the controlling terminal */
++ setenv("LIBC_FATAL_STDERR_","1",0);
+ xf86LogInit();
++ }
+
+ /* Set stderr to non-blocking. */
+ #ifndef O_NONBLOCK
diff --git a/debian/patches/series b/debian/patches/series
index bb89078..d709691 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,4 @@
165_man_xorg_conf_no_device_ident.patch
166_nullptr_xinerama_keyrepeat.patch
167_nullptr_xisbread.patch
+168_glibc_trace_to_stderr.patch
Reply to: