debian/changelog | 9
+
debian/patches/linux-Do-not-call-FatalError-from-xf86CloseConsole.patch | 80
++++++++++
debian/patches/series | 1
debian/patches/xmir.patch | 2
4 files changed, 91 insertions(+), 1 deletion(-)
New commits:
commit c60a9b670326660ce120d43e703da56dc50450d9
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Tue Oct 27 07:02:29 2015 +0200
import changes from 2:1.17.2-1ubuntu10
* debian/patches:
- linux-Do-not-call-FatalError-from-xf86CloseConsole.patch: Fix crashers
often occuring on shutdown (LP: #1237904)
- xmir.patch: Fix typo causing FTBFS
diff --git a/debian/changelog b/debian/changelog
index 9f04da8..f753c0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.17.2-1ubuntu10) xenial; urgency=medium
+
+ * debian/patches:
+ - linux-Do-not-call-FatalError-from-xf86CloseConsole.patch: Fix crashers
+ often occuring on shutdown (LP: #1237904)
+ - xmir.patch: Fix typo causing FTBFS
+
+ -- Tim Lunn <t...@feathertop.org> Mon, 26 Oct 2015 12:24:30 +1100
+
xorg-server (2:1.17.2-1ubuntu9) wily; urgency=medium
* debian/patches/xmir.patch:
diff --git
a/debian/patches/linux-Do-not-call-FatalError-from-xf86CloseConsole.patch
b/debian/patches/linux-Do-not-call-FatalError-from-xf86CloseConsole.patch
new file mode 100644
index 0000000..9419f9d
--- /dev/null
+++ b/debian/patches/linux-Do-not-call-FatalError-from-xf86CloseConsole.patch
@@ -0,0 +1,80 @@
+From 2092f12a243b9f7682f542b593b77c96d455ec89 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdego...@redhat.com>
+Date: Wed, 21 Oct 2015 11:36:06 +0200
+Subject: linux: Do not call FatalError from xf86CloseConsole
+
+FatalError ends up calling xf86CloseConsole itself, so calling FatalError
+from within xf86CloseConsole is not a good idea.
+
+Make switch_to log errors using xf86Msg(X_WARNING, ...) and return success
+(or failure).
+
+This makes switch_to match the other error checking done in xf86CloseConsole
+which all logs warnings and continues.
+
+Add checking of the return value in xf86OpenConsole and call
+FatalError there when switch_to fails, to preserve the error-handling
+behavior of xf86OpenConsole.
+
+BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1269210
+Reviewed-by: Adam Jackson <a...@redhat.com>
+Signed-off-by: Hans de Goede <hdego...@redhat.com>
+
+diff --git a/hw/xfree86/os-support/linux/lnx_init.c
b/hw/xfree86/os-support/linux/lnx_init.c
+index ec06a05..1ed213c 100644
+--- a/hw/xfree86/os-support/linux/lnx_init.c
++++ b/hw/xfree86/os-support/linux/lnx_init.c
+@@ -63,18 +63,24 @@ drain_console(int fd, void *closure)
+ }
+ }
+
+-static void
++static int
+ switch_to(int vt, const char *from)
+ {
+ int ret;
+
+ SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt));
+- if (ret < 0)
+- FatalError("%s: VT_ACTIVATE failed: %s\n", from, strerror(errno));
++ if (ret < 0) {
++ xf86Msg(X_WARNING, "%s: VT_ACTIVATE failed: %s\n", from,
strerror(errno));
++ return 0;
++ }
+
+ SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt));
+- if (ret < 0)
+- FatalError("%s: VT_WAITACTIVE failed: %s\n", from, strerror(errno));
++ if (ret < 0) {
++ xf86Msg(X_WARNING, "%s: VT_WAITACTIVE failed: %s\n", from,
strerror(errno));
++ return 0;
++ }
++
++ return 1;
+ }
+
+ #pragma GCC diagnostic push
+@@ -233,7 +239,8 @@ xf86OpenConsole(void)
+ /*
+ * now get the VT. This _must_ succeed, or else fail completely.
+ */
+- switch_to(xf86Info.vtno, "xf86OpenConsole");
++ if (!switch_to(xf86Info.vtno, "xf86OpenConsole"))
++ FatalError("xf86OpenConsole: Switching VT failed\n");
+
+ SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETMODE, &VT));
+ if (ret < 0)
+@@ -294,7 +301,8 @@ xf86OpenConsole(void)
+ else { /* serverGeneration != 1 */
+ if (!xf86Info.ShareVTs && xf86Info.autoVTSwitch) {
+ /* now get the VT */
+- switch_to(xf86Info.vtno, "xf86OpenConsole");
++ if (!switch_to(xf86Info.vtno, "xf86OpenConsole"))
++ FatalError("xf86OpenConsole: Switching VT failed\n");
+ }
+ }
+ }
+--
+cgit v0.10.2
+
+
diff --git a/debian/patches/series b/debian/patches/series
index 9327629..1532d9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -53,3 +53,4 @@ drm_device_keep_trying.patch
xi2-resize-touch.patch
os-make-sure-the-clientswritable-fd-set-is-initialized.diff
glamor-make-current-in-prepare-paths.diff
+linux-Do-not-call-FatalError-from-xf86CloseConsole.patch
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index fd421ae..a14956b 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -71,7 +71,7 @@ Index: xorg-server-1.17.2/configure.ac
+dnl Xmir DDX
+
-+PKG_CHECK_MODULES(XMIRMODULES, [mirclient >= 0.13.1
mir-client-platform-mesa-dev libdrm epoxy], [have_xmir=yes], [have_xmir=no])
++PKG_CHECK_MODULES(XMIRMODULES, [mirclient >= 0.13.1 mir-client-platform-mesa
libdrm epoxy], [have_xmir=yes], [have_xmir=no])
+AC_MSG_CHECKING([whether to build Xmir DDX])
+if test "x$XMIR" = xauto; then
+ XMIR="$have_xmir"
