nx-libs, branch 3.5.99.15

release 3.5.99.15

2018-03-07T22:46:48+00:00

Merge branch 'sunweaver-pr/saver-unvalidated-lengths-ProcScreenSaverUnsetAttributes' into 3.6.x

2018-03-07T20:55:36+00:00

Attributes GH PR #672: https://github.com/ArcticaProject/nx-libs/pull/672

Xserver/Xext/saver.c Unvalidated lengths (X.org CVE-2017-12185).

2018-03-07T20:53:40+00:00

commit cad5a1050b7184d828aef9c1dd151c3ab649d37e Author: Nathan Kidd Date: Fri Jan 9 09:57:23 2015 -0500 Unvalidated lengths v2: Add overflow check and remove unnecessary check (Julien Cristau) This addresses: CVE-2017-12184 in XINERAMA CVE-2017-12185 in MIT-SCREEN-SAVER CVE-2017-12186 in X-Resource CVE-2017-12187 in RENDER Reviewed-by: Jeremy Huddleston Sequoia Reviewed-by: Julien Cristau Signed-off-by: Nathan Kidd Signed-off-by: Julien Cristau Backported-to-NX-by: Mike Gabriel

nxcompshad/configure.ac: blindly copy-pasting might not be the smartest idea; it's COMPSHAD here.

2018-03-07T20:35:51+00:00

Merge branch 'sunweaver-pr/xinerama-bbox-corner-cases' into 3.6.x

2018-03-07T20:15:18+00:00

Attributes GH PR #670: https://github.com/ArcticaProject/nx-libs/pull/670

Xserver/hw/nxagent/Screen.c: Drop commented out code. Functionality now implemented in intersect_bb() function.

2018-03-07T19:45:16+00:00

hw/nxagent/Screen.c: Cover Xinerama bounding box corner cases.

2018-03-07T19:45:16+00:00

If the agent window is moved around on screen, it can happen that it is moved into an invisible area of the real Xserver, we calls this "beyond the bounding box". . If the agent window is partially beyond the bounding box, we don't want Xinerama to re-adjust the RandR parameters inside the agent. Near the bounding box, the session shall stay intact. . This means, desktop env wise, the desktop session control elements can be moved (with the agent window) into the invisible areas of the real Xserver and moved out again without RandR events arriving inside the agent session. Fixes ArcticaProject/nx-libs#662.

nxcomp{,shad}/configure.ac: replace versionating non-portable sed construct with hopefully more portable awk construct.

2018-03-07T18:00:39+00:00

nx-X11/programs/Xserver/hw/nxagent/Init.c: disable DPMS support within nxagent.

2018-03-07T10:57:35+00:00

Keeping it enabled leads to nxagent consuming 100% of CPU resources after some time. Older code used three different timers for each DPMS mode (standby, suspend, off), with each timer checking that the elapsed idle time is strictly less than the DPMS mode timeout value. Newer code started merging DPMS and ScreenSaver timers into a single one, with checking DPMS modes and timeouts in a fall-through fashion. The code expects that, if a timeout is reached, the mode is set accordingly, so that the old timeout is disregarded next time. Since we stub out DPMSSetMode() in nxagent, this doesn't happen. In this case, the old DPMS timeout will be checked the next time around and we will be calculating DPMS_MODE_TIMEOUT - IDLE_TIME. If IDLE_TIME is bigger than DPMS_MODE_TIMEOUT, we run into problems with unsigned integers. What happens next will be *another* overflow once DoTimers() is executed and from that function SetTimers(), which will add the current timestamp to the timeout value. Later functions subtract the current timestamp again (which will be even higher since some time elapsed) and underflow the value again. It looks like this leads to consistent firing of the timer - something we do not want to have. For new, disable DPMS support in nxagent. We do not execute it on actual hardware that could change DPMS modes. At a later time, implementing a DPMS timeout/mode passthrough to the connected X server/display might be beneficial. Fixes: ArcticaProject/nx-libs#671

Makefile: we don't need $(BINDIR)/bin.

2018-03-06T11:55:22+00:00