debian/changelog | 17 +++++++++++
debian/patches/100_rethrow_signals.patch | 4 --
debian/patches/160_log_timestamping.patch | 44 ------------------------------
debian/patches/series | 1
4 files changed, 18 insertions(+), 48 deletions(-)
New commits:
commit 060d4ddfec992ee86c1839ceaf7ad173e88b11fd
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Sat Jan 16 03:10:32 2010 -0800
Timestamping is no longer needed
diff --git a/debian/changelog b/debian/changelog
index 0dc1a33..1124677 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,19 @@
+xorg-server (2:1.7.3.902-1ubuntu8) lucid; urgency=low
+
+ * Drop 160_log_timestamping.patch. The bootup time objectives have been
+ met so this patch is no longer required.
+
+ -- Bryce Harrington <br...@ubuntu.com> Sat, 16 Jan 2010 02:28:30 -0800
+
xorg-server (2:1.7.3.902-1ubuntu7) lucid; urgency=low
* Update 100_rethrow_signals.patch: Don't log more error messages after
the log has been closed, else it causes a SIGSEGV (signal 11) crash
under several different conditions, including on even ordinary error
exits.
- (LP: #506510, #507345, #506977, #504497)
+ (LP: #506510, #507345, #506977, #504497, #507083)
- -- Bryce Harrington <br...@ubuntu.com> Fri, 15 Jan 2010 13:48:12 -0800
+ -- Bryce Harrington <br...@ubuntu.com> Fri, 15 Jan 2010 15:22:34 -0800
xorg-server (2:1.7.3.902-1ubuntu6) lucid; urgency=low
diff --git a/debian/patches/160_log_timestamping.patch
b/debian/patches/160_log_timestamping.patch
deleted file mode 100644
index a40052b..0000000
--- a/debian/patches/160_log_timestamping.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Binary files xorg-server-ubuntu-git-patched/.git/index and
xorg-server-ubuntu-git-working/.git/index differ
-diff -Nurp xorg-server-ubuntu-git-patched/os/log.c
xorg-server-ubuntu-git-working/os/log.c
---- xorg-server-ubuntu-git-patched/os/log.c 2009-12-01 18:49:34.000000000
-0800
-+++ xorg-server-ubuntu-git-working/os/log.c 2009-12-01 20:29:19.000000000
-0800
-@@ -314,6 +314,29 @@ LogVMessageVerb(MessageType type, int ve
- const char *s = X_UNKNOWN_STRING;
- char tmpBuf[1024];
-
-+ struct timeval time;
-+ time_t tv_sec;
-+ suseconds_t tv_usec;
-+ static Bool first = TRUE;
-+ static time_t start_tv_sec;
-+ static suseconds_t start_usec;
-+ int diff_sec, diff_usec;
-+
-+ gettimeofday(&time, NULL);
-+ tv_sec = time.tv_sec;
-+ tv_usec = time.tv_usec;
-+ if (first == TRUE) {
-+ start_tv_sec = tv_sec;
-+ start_usec = tv_usec;
-+ first = FALSE;
-+ }
-+ diff_sec = (int)difftime(tv_sec, start_tv_sec);
-+ diff_usec = (tv_usec - start_usec);
-+ if (diff_usec < 0) {
-+ diff_sec--;
-+ diff_usec += 1000000;
-+ }
-+
- /* Ignore verbosity for X_ERROR */
- if (logVerbosity >= verb || logFileVerbosity >= verb || type == X_ERROR) {
- switch (type) {
-@@ -355,7 +378,8 @@ LogVMessageVerb(MessageType type, int ve
- }
-
- /* if s is not NULL we need a space before format */
-- snprintf(tmpBuf, sizeof(tmpBuf), "%s%s%s", s ? s : "",
-+ snprintf(tmpBuf, sizeof(tmpBuf), "[%5d.%06d] %s%s%s", diff_sec,
diff_usec,
-+ s ? s : "",
- s ? " " : "",
- format);
- LogVWrite(verb, tmpBuf, args);
diff --git a/debian/patches/series b/debian/patches/series
index 641e603..625d6ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,7 +18,6 @@
121_only_switch_vt_when_active.diff
#143_default_to_vesa.patch
157_check_null_modes.patch
-160_log_timestamping.patch
162_null_crtc_in_rotation.patch
164_trap-aspect-ratios.patch
165_man_xorg_conf_no_device_ident.patch
commit 47ca1e88f92d931ad8841a9cd5808658ac744aa7
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Fri Jan 15 15:07:12 2010 -0800
Don't write to log file after it's been closed. Duh.
diff --git a/debian/changelog b/debian/changelog
index 438699e..0dc1a33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xorg-server (2:1.7.3.902-1ubuntu7) lucid; urgency=low
+
+ * Update 100_rethrow_signals.patch: Don't log more error messages after
+ the log has been closed, else it causes a SIGSEGV (signal 11) crash
+ under several different conditions, including on even ordinary error
+ exits.
+ (LP: #506510, #507345, #506977, #504497)
+
+ -- Bryce Harrington <br...@ubuntu.com> Fri, 15 Jan 2010 13:48:12 -0800
+
xorg-server (2:1.7.3.902-1ubuntu6) lucid; urgency=low
* debian/xserver-xorg-core.preinst.in:
diff --git a/debian/patches/100_rethrow_signals.patch
b/debian/patches/100_rethrow_signals.patch
index 2da1df4..97545e5 100644
--- a/debian/patches/100_rethrow_signals.patch
+++ b/debian/patches/100_rethrow_signals.patch
@@ -104,7 +104,7 @@ diff -Nurp
xorg-server-ubuntu-git-patched/hw/xfree86/common/xf86Init.c xorg-serv
{
int i;
-@@ -1221,24 +1224,47 @@ ddxGiveUp(void)
+@@ -1221,24 +1224,45 @@ ddxGiveUp(void)
xf86CloseConsole();
@@ -116,10 +116,8 @@ diff -Nurp
xorg-server-ubuntu-git-patched/hw/xfree86/common/xf86Init.c xorg-serv
- abort();
+ if (xf86Info.caughtSignal) {
+ if (signo != 0) {
-+ ErrorF (" ddxSigGiveUp: re-raising %d\n", signo);
+ raise(signo);
+ } else {
-+ ErrorF (" ddxSigGiveUp: aborting\n");
+ abort();
+ }
+ }
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
