Timo Aaltonen pushed to branch debian-unstable at X Strike Force / xserver /
xorg-server
Commits:
bf2f2be0 by Timo Aaltonen at 2020-08-31T18:36:13+03:00
revert-disabling-xss-for-rootless-xwayland.diff: Fix a regression where apps
crash under Xwayland.
- - - - -
78eca05f by Timo Aaltonen at 2020-08-31T18:49:58+03:00
release to sid
- - - - -
3 changed files:
- debian/changelog
- + debian/patches/revert-disabling-xss-for-rootless-xwayland.diff
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-xorg-server (2:1.20.9-1) UNRELEASED; urgency=medium
+xorg-server (2:1.20.9-1) unstable; urgency=medium
* New upstream release.
- CVE-2020-14347 (Closes: #968986)
@@ -6,8 +6,10 @@ xorg-server (2:1.20.9-1) UNRELEASED; urgency=medium
probing the GPU.
* revert-hw-xfree86-avoid-cursor-use-after-free.diff: Revert a commit
which is causing server crashes.
+ * revert-disabling-xss-for-rootless-xwayland.diff: Fix a regression
+ where apps crash under Xwayland.
- -- Timo Aaltonen <[email protected]> Mon, 31 Aug 2020 13:30:28 +0300
+ -- Timo Aaltonen <[email protected]> Mon, 31 Aug 2020 18:49:48 +0300
xorg-server (2:1.20.8-2) unstable; urgency=medium
=====================================
debian/patches/revert-disabling-xss-for-rootless-xwayland.diff
=====================================
@@ -0,0 +1,32 @@
+commit 1a3092be2784822b99c1fe7fcba8665f6e40381c
+Author: Timo Aaltonen <[email protected]>
+Date: Mon Aug 31 17:30:04 2020 +0300
+
+ Revert "xwayland: Disable the MIT-SCREEN-SAVER extension when rootless"
+
+ This reverts commit 3059a2e62ae7ef665a537ee0fc2ec24beccf17ae.
+
+diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
+index d02934cd5..317b81690 100644
+--- a/hw/xwayland/xwayland.c
++++ b/hw/xwayland/xwayland.c
+@@ -1132,19 +1132,6 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char
**argv)
+ for (i = 1; i < argc; i++) {
+ if (strcmp(argv[i], "-rootless") == 0) {
+ xwl_screen->rootless = 1;
+-
+- /* Disable the XSS extension on Xwayland rootless.
+- *
+- * Xwayland is just a Wayland client, no X11 screensaver
+- * should be expected to work reliably on Xwayland rootless.
+- */
+-#ifdef SCREENSAVER
+- noScreenSaverExtension = TRUE;
+-#endif
+- ScreenSaverTime = 0;
+- ScreenSaverInterval = 0;
+- defaultScreenSaverTime = 0;
+- defaultScreenSaverInterval = 0;
+ }
+ else if (strcmp(argv[i], "-wm") == 0) {
+ xwl_screen->wm_fd = atoi(argv[i + 1]);
=====================================
debian/patches/series
=====================================
@@ -8,3 +8,4 @@
07_use-modesetting-driver-by-default-on-GeForce.diff
fix-pci-probing-segfault.diff
revert-hw-xfree86-avoid-cursor-use-after-free.diff
+revert-disabling-xss-for-rootless-xwayland.diff
View it on GitLab:
https://salsa.debian.org/xorg-team/xserver/xorg-server/-/compare/561a6ff3c99c64d699edeaecfceeaa184fc1b05e...78eca05f0471c901b2986db4f2e949e6cfe52c4b
--
View it on GitLab:
https://salsa.debian.org/xorg-team/xserver/xorg-server/-/compare/561a6ff3c99c64d699edeaecfceeaa184fc1b05e...78eca05f0471c901b2986db4f2e949e6cfe52c4b
You're receiving this email because of your account on salsa.debian.org.
