aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* release 3.5.99.153.5.99.15Mike Gabriel2018-03-076-9/+95
|
* Merge branch ↵Mihai Moldovan2018-03-071-0/+2
|\ | | | | | | | | | | 'sunweaver-pr/saver-unvalidated-lengths-ProcScreenSaverUnsetAttributes' into 3.6.x Attributes GH PR #672: https://github.com/ArcticaProject/nx-libs/pull/672
| * Xserver/Xext/saver.c Unvalidated lengths (X.org CVE-2017-12185).Nathan Kidd2018-03-071-0/+2
|/ | | | | | | | | | | | | | | | | | | | | | | commit cad5a1050b7184d828aef9c1dd151c3ab649d37e Author: Nathan Kidd <nkidd@opentext.com> 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 <jeremyhu@apple.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Nathan Kidd <nkidd@opentext.com> Signed-off-by: Julien Cristau <jcristau@debian.org> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* nxcompshad/configure.ac: blindly copy-pasting might not be the smartest ↵Mihai Moldovan2018-03-071-1/+1
| | | | idea; it's *COMPSHAD* here.
* Merge branch 'sunweaver-pr/xinerama-bbox-corner-cases' into 3.6.xUlrich Sibiller2018-03-071-32/+81
|\ | | | | | | Attributes GH PR #670: https://github.com/ArcticaProject/nx-libs/pull/670
| * Xserver/hw/nxagent/Screen.c: Drop commented out code. Functionality now ↵Mike Gabriel2018-03-071-16/+0
| | | | | | | | implemented in intersect_bb() function.
| * hw/nxagent/Screen.c: Cover Xinerama bounding box corner cases.Mike Gabriel2018-03-071-16/+81
|/ | | | | | | | | | | | | | | | | 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 ↵Mihai Moldovan2018-03-072-2/+2
| | | | with hopefully more portable awk construct.
* nx-X11/programs/Xserver/hw/nxagent/Init.c: disable DPMS support within nxagent.Mihai Moldovan2018-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Mihai Moldovan2018-03-061-1/+1
|
* nxcomp{,shad}/configure.ac: pass more portable -E option to sed instead of -r.Mihai Moldovan2018-03-022-2/+2
|
* Merge branch 'mjtrangoni-WIP-travis' into 3.6.xMike Gabriel2018-03-014-3/+59
|\ | | | | | | Attributes GH PR #624: https://github.com/ArcticaProject/nx-libs/pull/624
| * README.md: Add travis badgeMario Trangoni2018-03-011-1/+1
| |
| * Fix clang error: ordered comparison between pointer and zero ("char *" and ↵Mario Trangoni2018-03-011-1/+1
| | | | | | | | "int")
| * Fix clang error: comparison of array authCookie not equal to a null pointer ↵Mario Trangoni2018-03-011-1/+1
| | | | | | | | is always true
| * Add travis yaml configuration fileMario Trangoni2018-03-011-0/+56
|/
* hw/nxagent/Screen.c: Settle down with 96 DPI as the default resolution, if ↵Simon Matter2018-03-011-1/+1
| | | | | | nothing better can be detected. Fixes ArcticaProject/nx-libs#668.
* release 3.5.99.143.5.99.14Mike Gabriel2018-02-286-12/+520
|
* Merge branch 'uli42-pr/fix_autodpi_in_usage' into 3.6.xMihai Moldovan2018-02-283-7/+10
|\ | | | | | | Attributes GH PR #667: https://github.com/ArcticaProject/nx-libs/pull/667
| * os: hide ttyxx optionUlrich Sibiller2018-02-282-3/+6
| | | | | | | | is used nowhere anyway
| * nxagent: rearrange nx options in usageUlrich Sibiller2018-02-281-4/+4
|/ | | | | make them appear in the nx section. Also separate the nx section from the other options by an extra emtpy line.
* Merge branch 'uli42-pr/update_xkb' into 3.6.xMihai Moldovan2018-02-2820-3214/+160
|\ | | | | | | Attributes GH PR #648: https://github.com/ArcticaProject/nx-libs/pull/648
| * Lift xkb to xorg-xserver-7.1/1.1.0 state - non-functional changes onlyUlrich Sibiller2018-02-289-15/+1
| |
| * Lift xkb to xorg-xserver-7.1/1.1.0 stateUlrich Sibiller2018-02-2819-3199/+159
|/ | | | | | | In XORG-7_1 xkbconfig.c had been dropped. We must keep this file because it is used by hw/nxagent/Keyboard.c to load the xkb configuration file. Maybe we should move the relevant code to there or drop xkb configuration file support from nxagent.
* Revert "nx-libs.spec: Starting with Fedora 28 / RHEL 8, SunRPC support is ↵Mike Gabriel2018-02-271-4/+0
| | | | | | being split out into a separate libraries (libtirpc)." This reverts commit 9f93e96ec81662e48f770bca7efc9e664576a7dc.
* nx-libs.spec: Starting with Fedora 28 / RHEL 8, SunRPC support is being ↵Mike Gabriel2018-02-271-0/+4
| | | | | | split out into a separate libraries (libtirpc). Fixes ArcticaProject/nx-libs#665.
* Merge branch 'sunweaver-pr/autodetect-dpi' into 3.6.xMihai Moldovan2018-02-277-7/+92
|\ | | | | | | Attributes GH PR #522: https://github.com/ArcticaProject/nx-libs/pull/522
| * nxagent: Also provide auto DPI feature via nx/nx option 'autodpi', taking ↵Mike Gabriel2018-02-275-1/+28
| | | | | | | | only effect on session startups.
| * nxagent: Auto-detect client-side DPI at session startup.Simon Matter2018-02-274-6/+64
|/
* nxcomp/src/Loop.cpp: Harmonize log output. Uniformly, embrace port values by ↵Mike Gabriel2018-02-271-6/+6
| | | | | | single quotes. Fixes ArcticaProject/nx-libs#617.
* {nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1,nxproxy/man/nxproxy.1}: ↵Mihai Moldovan2018-02-272-2/+2
| | | | magicpixel takes a boolean argument for now.
* nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1: remove empty line on top ↵Mihai Moldovan2018-02-271-1/+0
| | | | | | of file. Fixes: ArcticaProject/nx-libs#664
* nxcomp/src/Loop.cpp: Make know the agent option 'keyconv' to nxcomp and ↵Mike Gabriel2018-02-271-1/+2
| | | | | | tolerate it as a valid option. Fixes ArcticaProject/nx-libs#630.
* nx-X11/programs/Xserver/{include/globals.h,mi/miinitext.c}: remove DPSEXT ↵Mihai Moldovan2018-02-272-7/+0
| | | | left-overs.
* Merge branch 'uli42-pr/update_os' into 3.6.xMihai Moldovan2018-02-274-9/+7
|\ | | | | | | Attributes GH PR #651: https://github.com/ArcticaProject/nx-libs/pull/651
| * Lift os to XORG-7_1 state - non-functional changes onlyUlrich Sibiller2018-02-271-0/+1
| |
| * Lift os to XORG-7_1 stateUlrich Sibiller2018-02-273-9/+6
|/
* Remove unused X11R4 DDX compatibility function miClipNotify.Mihai Moldovan2018-02-272-84/+0
| | | | | | | | | | | | Backported from X.org: commit 39ce5f1544029412f4060f3e89ce1d87222ef42b Author: Adam Jackson <ajax@nwnk.net> Date: Fri Jan 6 17:05:26 2006 +0000 Remove unused X11R4 DDX compatibility function miClipNotify. Backported-to-NX-by: Mihai Moldovan <ionic@ionic.de>
* Merge branch 'uli42-pr/update_mi' into 3.6.xMihai Moldovan2018-02-2711-75/+45
|\ | | | | | | Attributes GH PR #650: https://github.com/ArcticaProject/nx-libs/pull/650
| * Lift mi to xorg-xserver-7.1/1.1.0 state - non-functional changes onlyUlrich Sibiller2018-02-272-2/+2
| |
| * Lift mi to xorg-xserver-7.1/1.1.0 stateUlrich Sibiller2018-02-278-72/+41
| | | | | | | | I left out glx changes to miinitext.c for now.
| * Lift miext to xorg-xserver-7.1/1.1.10 stateUlrich Sibiller2018-02-272-1/+2
|/
* Merge branch 'uli42-pr/update_record' into 3.6.xMihai Moldovan2018-02-272-403/+76
|\ | | | | | | Attributes GH PR #649: https://github.com/ArcticaProject/nx-libs/pull/649
| * Lift record to xorg-server-1.4.2 stateUlrich Sibiller2018-02-271-4/+4
| |
| * Lift record to xorg-server-1.2.0/xorg-server-1.3.0.0 state - non-functional ↵Ulrich Sibiller2018-02-271-53/+22
| | | | | | | | changes only
| * Lift record to xorg-server-1.2.0/xorg-server-1.3.0.0 stateUlrich Sibiller2018-02-271-222/+0
| |
| * Lift record to xorg-xserver-7.1/1.1.0 state - non-functional changes onlyUlrich Sibiller2018-02-271-115/+43
| |
| * Lift record to xorg-xserver-7.1/1.1.0 stateUlrich Sibiller2018-02-271-9/+7
|/
* Merge branch 'sunweaver-pr/version-cmdline-option' into 3.6.xMihai Moldovan2018-02-2731-103/+124
|\ | | | | | | | | | | | | Attributes GH PR #660: https://github.com/ArcticaProject/nx-libs/pull/660 Fixes: ArcticaProject/nx-libs#653 Fixes: ArcticaProject/nx-libs#639
| * hw/nxagent/: Stop using non-portable '__progname', set up our own ↵Mike Gabriel2018-02-263-7/+9
| | | | | | | | 'nxagentProgName' instead and pass it around where needed.
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 09:43:33 +0000