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
-
78eca05f
by Timo Aaltonen at 2020-08-31T18:49:58+03:00
3 changed files:
- debian/changelog
- + debian/patches/revert-disabling-xss-for-rootless-xwayland.diff
- debian/patches/series
Changes:
| 1 |
-xorg-server (2:1.20.9-1) UNRELEASED; urgency=medium
|
|
| 1 |
+xorg-server (2:1.20.9-1) unstable; urgency=medium
|
|
| 2 | 2 |
|
| 3 | 3 |
* New upstream release.
|
| 4 | 4 |
- CVE-2020-14347 (Closes: #968986)
|
| ... | ... | @@ -6,8 +6,10 @@ xorg-server (2:1.20.9-1) UNRELEASED; urgency=medium |
| 6 | 6 |
probing the GPU.
|
| 7 | 7 |
* revert-hw-xfree86-avoid-cursor-use-after-free.diff: Revert a commit
|
| 8 | 8 |
which is causing server crashes.
|
| 9 |
+ * revert-disabling-xss-for-rootless-xwayland.diff: Fix a regression
|
|
| 10 |
+ where apps crash under Xwayland.
|
|
| 9 | 11 |
|
| 10 |
- -- Timo Aaltonen <tjaalton@debian.org> Mon, 31 Aug 2020 13:30:28 +0300
|
|
| 12 |
+ -- Timo Aaltonen <tjaalton@debian.org> Mon, 31 Aug 2020 18:49:48 +0300
|
|
| 11 | 13 |
|
| 12 | 14 |
xorg-server (2:1.20.8-2) unstable; urgency=medium
|
| 13 | 15 |
|
| 1 |
+commit 1a3092be2784822b99c1fe7fcba8665f6e40381c
|
|
| 2 |
+Author: Timo Aaltonen <tjaalton@debian.org>
|
|
| 3 |
+Date: Mon Aug 31 17:30:04 2020 +0300
|
|
| 4 |
+ |
|
| 5 |
+ Revert "xwayland: Disable the MIT-SCREEN-SAVER extension when rootless"
|
|
| 6 |
+
|
|
| 7 |
+ This reverts commit 3059a2e62ae7ef665a537ee0fc2ec24beccf17ae.
|
|
| 8 |
+ |
|
| 9 |
+diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
|
|
| 10 |
+index d02934cd5..317b81690 100644
|
|
| 11 |
+--- a/hw/xwayland/xwayland.c
|
|
| 12 |
++++ b/hw/xwayland/xwayland.c
|
|
| 13 |
+@@ -1132,19 +1132,6 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv)
|
|
| 14 |
+ for (i = 1; i < argc; i++) {
|
|
| 15 |
+ if (strcmp(argv[i], "-rootless") == 0) {
|
|
| 16 |
+ xwl_screen->rootless = 1;
|
|
| 17 |
+-
|
|
| 18 |
+- /* Disable the XSS extension on Xwayland rootless.
|
|
| 19 |
+- *
|
|
| 20 |
+- * Xwayland is just a Wayland client, no X11 screensaver
|
|
| 21 |
+- * should be expected to work reliably on Xwayland rootless.
|
|
| 22 |
+- */
|
|
| 23 |
+-#ifdef SCREENSAVER
|
|
| 24 |
+- noScreenSaverExtension = TRUE;
|
|
| 25 |
+-#endif
|
|
| 26 |
+- ScreenSaverTime = 0;
|
|
| 27 |
+- ScreenSaverInterval = 0;
|
|
| 28 |
+- defaultScreenSaverTime = 0;
|
|
| 29 |
+- defaultScreenSaverInterval = 0;
|
|
| 30 |
+ }
|
|
| 31 |
+ else if (strcmp(argv[i], "-wm") == 0) {
|
|
| 32 |
+ xwl_screen->wm_fd = atoi(argv[i + 1]);
|
| ... | ... | @@ -8,3 +8,4 @@ |
| 8 | 8 |
07_use-modesetting-driver-by-default-on-GeForce.diff
|
| 9 | 9 |
fix-pci-probing-segfault.diff
|
| 10 | 10 |
revert-hw-xfree86-avoid-cursor-use-after-free.diff
|
| 11 |
+revert-disabling-xss-for-rootless-xwayland.diff
|