debian/changelog | 17 ++++++++++++
debian/patches/135_rethrow_signals.patch | 36 +++++++++++++++++++++----
debian/patches/140_quell_acpi_errmsgs.patch | 39 ++++++++++++++++++++++++++++
debian/patches/series | 1
4 files changed, 87 insertions(+), 6 deletions(-)
New commits:
commit d3eaf78acba80db1f76c6fa205a319e9df55427d
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Wed Sep 3 10:52:03 2008 +0300
Fix changelog, release.
diff --git a/debian/changelog b/debian/changelog
index f374e5e..fac5e4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,19 @@
-xorg-server (2:1.4.99.906-2ubuntu3) UNRELEASED; urgency=low
+xorg-server (2:1.4.99.906-2ubuntu4) intrepid; urgency=low
+
+ [ Bryce Harrington ]
+ * 140_quell_acpid_errmsgs.patch: Don't fill the server log with errors
+ from not being able to connect to acpid. (LP: #247195)
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]> Wed, 03 Sep 2008 10:48:24 +0300
+
+xorg-server (2:1.4.99.906-2ubuntu3) intrepid; urgency=low
[ Bryce Harrington ]
* 135_rethrow_signals.patch: Update to make it catch and throw a
wider variety of signals, and do a clean shutdown of the X server
(code borrowed from FatalError()).
- * 140_quell_acpid_errmsgs.patch: Don't fill the server log with errors
- from not being able to connect to acpid.
- -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 02 Sep 2008 09:44:22 +0300
+ -- Bryce Harrington <[EMAIL PROTECTED]> Mon, 01 Sep 2008 13:19:46 -0700
xorg-server (2:1.4.99.906-2ubuntu2) intrepid; urgency=low
commit 8704a7559daf5fd24e927d3c6e1fa960e8b4feff
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Wed Sep 3 10:44:17 2008 +0300
Fix typos in patch 140.
diff --git a/debian/patches/140_quell_acpi_errmsgs.patch
b/debian/patches/140_quell_acpi_errmsgs.patch
index 2769495..6c79ae6 100644
--- a/debian/patches/140_quell_acpi_errmsgs.patch
+++ b/debian/patches/140_quell_acpi_errmsgs.patch
@@ -23,7 +23,7 @@ diff -Nurp
xorg-server-1.4.99.906-patched2/hw/xfree86/os-support/linux/lnx_acpi.
+ /* Don't fill log with warning (LP: #247195) */
+ xf86MsgVerb(X_WARNING,3,"Open ACPI failed (%s) (%s)\n",
ACPI_SOCKET,
+ strerror(errno));
-+ acpi_warning_msg_time = acpi_warning_msg_interval;
++ acpi_warning_msg_timer = acpi_warning_msg_interval;
+ acpi_warning_count++;
+
+ if (acpi_warning_count == acpi_warning_max_count) {
@@ -31,7 +31,7 @@ diff -Nurp
xorg-server-1.4.99.906-patched2/hw/xfree86/os-support/linux/lnx_acpi.
+ }
+
+ } else {
-+ --acpi_warning_msg_time;
++ --acpi_warning_msg_timer;
+ }
+ }
shutdown(fd, 2);
commit 6eab575e2c6535bb22e1cdbf7d1aec524f8736fe
Author: Bryce Harrington <[EMAIL PROTECTED]>
Date: Tue Sep 2 10:09:15 2008 +0300
140_quell_acpid_errmsgs.patch
Don't fill the server log with errors from not being able to connect to
acpid.
diff --git a/debian/changelog b/debian/changelog
index cdf667f..f374e5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
-xorg-server (2:1.4.99.906-2ubuntu3) intrepid; urgency=low
+xorg-server (2:1.4.99.906-2ubuntu3) UNRELEASED; urgency=low
+ [ Bryce Harrington ]
* 135_rethrow_signals.patch: Update to make it catch and throw a
wider variety of signals, and do a clean shutdown of the X server
(code borrowed from FatalError()).
+ * 140_quell_acpid_errmsgs.patch: Don't fill the server log with errors
+ from not being able to connect to acpid.
- -- Bryce Harrington <[EMAIL PROTECTED]> Mon, 01 Sep 2008 13:19:46 -0700
+ -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 02 Sep 2008 09:44:22 +0300
xorg-server (2:1.4.99.906-2ubuntu2) intrepid; urgency=low
diff --git a/debian/patches/140_quell_acpi_errmsgs.patch
b/debian/patches/140_quell_acpi_errmsgs.patch
new file mode 100644
index 0000000..2769495
--- /dev/null
+++ b/debian/patches/140_quell_acpi_errmsgs.patch
@@ -0,0 +1,39 @@
+diff -Nurp
xorg-server-1.4.99.906-patched2/hw/xfree86/os-support/linux/lnx_acpi.c
xorg-server-1.4.99.906-working2/hw/xfree86/os-support/linux/lnx_acpi.c
+--- xorg-server-1.4.99.906-patched2/hw/xfree86/os-support/linux/lnx_acpi.c
2008-09-01 13:32:09.000000000 -0700
++++ xorg-server-1.4.99.906-working2/hw/xfree86/os-support/linux/lnx_acpi.c
2008-09-01 14:06:56.000000000 -0700
+@@ -133,6 +133,10 @@ lnxACPIOpen(void)
+ int fd;
+ struct sockaddr_un addr;
+ int r = -1;
++ unsigned int acpi_warning_msg_interval = 10; /* interval between error
prints */
++ static unsigned int acpi_warning_msg_timer = 0;
++ unsigned int acpi_warning_max_count = 20; /* Don't print error more than
this many times total */
++ static unsigned int acpi_warning_count = 0;
+
+ #ifdef DEBUG
+ ErrorF("ACPI: OSPMOpen called\n");
+@@ -148,8 +152,22 @@ lnxACPIOpen(void)
+ addr.sun_family = AF_UNIX;
+ strcpy(addr.sun_path, ACPI_SOCKET);
+ if ((r = connect(fd, (struct sockaddr*)&addr, sizeof(addr))) == -1) {
+- xf86MsgVerb(X_WARNING,3,"Open ACPI failed (%s) (%s)\n", ACPI_SOCKET,
+- strerror(errno));
++ if (acpi_warning_count < acpi_warning_max_count) {
++ if (acpi_warning_msg_timer == 0) {
++ /* Don't fill log with warning (LP: #247195) */
++ xf86MsgVerb(X_WARNING,3,"Open ACPI failed (%s) (%s)\n",
ACPI_SOCKET,
++ strerror(errno));
++ acpi_warning_msg_time = acpi_warning_msg_interval;
++ acpi_warning_count++;
++
++ if (acpi_warning_count == acpi_warning_max_count) {
++ xf86MsgVerb(X_WARNING,1,"Has the acpid daemon died?
Try restarting it. Suppressing further ACPI failure messages. (see LP:
#247195)\n");
++ }
++
++ } else {
++ --acpi_warning_msg_time;
++ }
++ }
+ shutdown(fd, 2);
+ close(fd);
+ return NULL;
diff --git a/debian/patches/series b/debian/patches/series
index 03dd975..e887059 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@
137_add_device_property_support.patch
138_xi_expose_enable_disabledevice.patch
139_xi_protect_against_null_handlers.patch
+140_quell_acpi_errmsgs.patch
commit a7861a63b79f12d2761ec0bb7d680c6faf99daa9
Author: Bryce Harrington <[EMAIL PROTECTED]>
Date: Tue Sep 2 09:17:20 2008 +0300
Update 135_rethrow_signals.patch to catch a wider variety of signals.
diff --git a/debian/changelog b/debian/changelog
index 62ad036..cdf667f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.4.99.906-2ubuntu3) intrepid; urgency=low
+
+ * 135_rethrow_signals.patch: Update to make it catch and throw a
+ wider variety of signals, and do a clean shutdown of the X server
+ (code borrowed from FatalError()).
+
+ -- Bryce Harrington <[EMAIL PROTECTED]> Mon, 01 Sep 2008 13:19:46 -0700
+
xorg-server (2:1.4.99.906-2ubuntu2) intrepid; urgency=low
* 103_inputproto_1.4.3_is_fine.patch:
diff --git a/debian/patches/135_rethrow_signals.patch
b/debian/patches/135_rethrow_signals.patch
index 6d3faf1..947e60c 100644
--- a/debian/patches/135_rethrow_signals.patch
+++ b/debian/patches/135_rethrow_signals.patch
@@ -1,7 +1,16 @@
-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)
+diff -Nurp xorg-server-1.4.99.906-patched/hw/xfree86/common/xf86Events.c
xorg-server-1.4.99.906-working/hw/xfree86/common/xf86Events.c
+--- xorg-server-1.4.99.906-patched/hw/xfree86/common/xf86Events.c
2008-09-01 13:17:47.000000000 -0700
++++ xorg-server-1.4.99.906-working/hw/xfree86/common/xf86Events.c
2008-09-01 13:19:35.000000000 -0700
+@@ -741,6 +741,8 @@ static __inline__ void xorg_backtrace(vo
+ void
+ xf86SigHandler(int signo)
+ {
++ static Bool beenhere = FALSE;
++
+ if ((signo == SIGILL) && xf86SigIllHandler) {
+ (*xf86SigIllHandler)();
+ /* Re-arm handler just in case we unexpectedly return here */
+@@ -763,6 +765,30 @@ xf86SigHandler(int signo)
xorg_backtrace();
@@ -10,8 +19,23 @@ diff -Nurp
xorg-server-1.4.99.905/hw/xfree86/common/xf86Events.c xorg-server-1.4
+ case SIGBUS:
+ case SIGILL:
+ case SIGFPE:
-+ ErrorF ("Caught signal %d. Server aborting\n", signo);
-+ raise (signo);
++ signal(signo,SIG_DFL);
++ ErrorF ("Saw signal %d. Server aborting.\n", signo);
++#ifdef DDXOSFATALERROR
++ if (!beenhere) {
++ OsVendorFatalError();
++ }
++#endif
++#ifdef ABORTONFATALERROR
++ abort();
++#endif
++ if (!beenhere) {
++ beenhere = TRUE;
++ AbortServer();
++ } else {
++ abort();
++ }
++ return;
+ }
+
FatalError("Caught signal %d. Server aborting\n", signo);
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
