Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | replace {x11,xim}trans.c links by libX11 1.3.4 solution | Ulrich Sibiller | 2016-10-10 | 3 | -10/+68 |
| | |||||
* | update xlibi18n files to libX11 1.3.4 | Ulrich Sibiller | 2016-10-10 | 38 | -475/+1224 |
| | |||||
* | update xcms files to libX11 1.3.4 | Ulrich Sibiller | 2016-10-10 | 64 | -710/+823 |
| | |||||
* | Update some missing files to libX11 1.3.4 | Ulrich Sibiller | 2016-10-10 | 6 | -27/+27 |
| | |||||
* | Add (Free|Get)EventData.c from libX11 1.3.4 | Ulrich Sibiller | 2016-10-10 | 3 | -0/+88 |
| | |||||
* | remove more NEED_REPLIES/EVENTS | Ulrich Sibiller | 2016-10-10 | 3 | -3/+0 |
| | |||||
* | Purge more remaining VCS refs | Ulrich Sibiller | 2016-10-10 | 33 | -34/+0 |
| | |||||
* | Lift XKB*.c to libX11 1.3.4 | Ulrich Sibiller | 2016-10-10 | 21 | -288/+326 |
| | |||||
* | XlibInt.c: shorten one ifdef | Ulrich Sibiller | 2016-10-10 | 1 | -1/+1 |
| | |||||
* | update X.h and Xproto.h because of GenericEvent | Ulrich Sibiller | 2016-10-10 | 2 | -15/+53 |
| | |||||
* | set USE_XCB define to 0 to prevent compiler complaints | Ulrich Sibiller | 2016-10-10 | 1 | -1/+2 |
| | |||||
* | Remove CRAY support | Ulrich Sibiller | 2016-10-10 | 5 | -323/+1 |
| | | | | | This basically repeats commit bad67799229b94ea2ba0174319949766ad1c2fc6 after the upgrade to libX11 1.3.4. | ||||
* | adapt include files to libX11 1.3.4 | Ulrich Sibiller | 2016-10-10 | 5 | -47/+48 |
| | |||||
* | update makekeys.c to libX11 1.3.4 (+ fix) | Ulrich Sibiller | 2016-10-10 | 1 | -11/+7 |
| | |||||
* | update lcUniConv subdir to libX11 1.3.4 | Ulrich Sibiller | 2016-10-10 | 32 | -34/+12506 |
| | |||||
* | update src files *[ch] to libX11 1.3.4 | Ulrich Sibiller | 2016-10-10 | 238 | -2503/+2532 |
| | |||||
* | add XLOCALELIBDIR | Ulrich Sibiller | 2016-10-10 | 2 | -1/+3 |
| | |||||
* | improve header guards | Ulrich Sibiller | 2016-10-10 | 10 | -20/+34 |
| | | | | Upstream has changed the header guards. We adapt them to prevent double inclusion. | ||||
* | update all files with NX relevant changes to libX11 1.3.4 | Ulrich Sibiller | 2016-10-10 | 17 | -620/+1760 |
| | |||||
* | fix wrong include in XlibInt.c | Ulrich Sibiller | 2016-10-09 | 1 | -1/+1 |
| | |||||
* | Merge branch 'uli42-pr/decouple-xserver' into 3.6.x | Mike Gabriel | 2016-10-08 | 1 | -0/+484 |
|\ | | | | | | | | | | | | | Attributes GH PR #220: https://github.com/ArcticaProject/nx-libs/issues/220 Fixes ArcticaProject/nx-libs#219. into a topic branch. | ||||
| * | xserver: add missing xkbfile.h | Ulrich Sibiller | 2016-10-08 | 1 | -0/+484 |
| | | | | | | | | | | This should have been part of commit 2c31ce2 which also happens to have a wrong description... Sigh. | ||||
* | | Fix nxproxy hostname parsing. | Vadim Troshchinskiyddd | 2016-10-07 | 1 | -3/+3 |
| | | | | | | | | | | Fixes ArcticaProject/nx-libs#207 Closes ArcticaProject/nx-libs#216 | ||||
* | | Check if unixPath is NULL before accessing it; this fixes crashing of ↵ | Vadim Troshchinskiy | 2016-10-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | nxagent when TEST is enabled. Fixes ArcticaProject/nx-libs#217. Closes ArcticaProject/nx-libs#218. | ||||
* | | Merge branch 'uli42-pr/decouple-xserver' into 3.6.x | Mike Gabriel | 2016-10-07 | 53 | -419/+6211 |
|\| | | | | | | | Attributes GH PR #208: https://github.com/ArcticaProject/nx-libs/pull/208 | ||||
| * | xserver: adapt xkbsrc includes syntax to match upstream | Ulrich Sibiller | 2016-10-06 | 5 | -5/+5 |
| | | |||||
| * | os/access: fix regression in server interpreted auth | Dave Airlie | 2016-10-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was reported on irc on Fedora when rawhide went to 1.17.1. regression occured in: 2566835b4374edb3e5a8353d4f7c9e7ec4851c57 os: Eliminate uninitialized value warnings from access.c siAddrMatch doesn't need addr to be a useful value, it checks some things like localuser without having an address at all. Signed-off-by: Dave Airlie <airlied@redhat.com> Tested-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> v2: backport to nx-libs 3.6.x (Ulrich Sibiller) | ||||
| * | os: Eliminate uninitialized value warnings from access.c | Keith Packard | 2016-10-06 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | The ConvertAddr function doesn't reliably set the 'addr' return value, and so callers are getting flagged for using potentially uninitialized values. Initialize the value in the callers to NULL and then go ahead and check for NULL values before using them. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> v2: backport to nx-libs 3.6.x (Ulrich Sibiller) | ||||
| * | dix: GetHosts bounds check using wrong pointer value [CVE-2014-8092 pt. 6] | Keith Packard | 2016-10-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetHosts saves the pointer to allocated memory in *data, and then wants to bounds-check writes to that region, but was mistakenly using a bare 'data' instead of '*data'. Also, data is declared as void **, so we need a cast to turn it into a byte pointer so we can actually do pointer comparisons. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> v1: Keith Packard v2: backport to nx-libs 3.6.x (Ulrich Sibiller) | ||||
| * | Fix multiple warnings in os/xdmauth.c. | Eamon Walsh | 2016-10-06 | 1 | -10/+12 |
| | | | | | | | | | | v1: Eamon Walsh v2: backport to nx-libs 3.6.x (Ulrich Sibiller) | ||||
| * | replace transport.c link by xstrans.c | Ulrich Sibiller | 2016-10-06 | 8 | -14/+39 |
| | | | | | | | | Just like upstream does | ||||
| * | xserver: drop XKBSRV_NEED_FILE_FUNCS | Ulrich Sibiller | 2016-10-06 | 17 | -20/+5 |
| | | | | | | | | just as upstream did | ||||
| * | xserver: remove define XKB_IN_SERVER | Ulrich Sibiller | 2016-10-06 | 15 | -370/+1 |
| | | | | | | | | it is no longer needed because the code here is only used in the server. | ||||
| * | xserver: use own copy of XKBgeom.h header | Ulrich Sibiller | 2016-10-06 | 11 | -16/+671 |
| | | | | | | | | just like upstream does | ||||
| * | xserver: use own copy of XKBrules.h header | Ulrich Sibiller | 2016-10-06 | 4 | -5/+3 |
| | | | | | | | | just like upstream does | ||||
| * | xserver: use own copy of XKBrules.h header | Ulrich Sibiller | 2016-10-06 | 2 | -1/+200 |
| | | | | | | | | just like upstream does | ||||
| * | xserver: use own copy of XKBstr.h header | Ulrich Sibiller | 2016-10-06 | 9 | -8/+615 |
| | | | | | | | | just like upstream does | ||||
| * | xserver: use own copy of XKBsrv.h header | Ulrich Sibiller | 2016-10-06 | 40 | -38/+1228 |
| | | | | | | | | just like upstream does | ||||
| * | copy files from libX11 to xserver dir | Ulrich Sibiller | 2016-10-06 | 5 | -6/+3506 |
|/ | | | | | | | | Before those files where symlinked in the makefile. While trying to upgrade libX11 to 1.3.4 it turned out that the symlinked did not work in the xserver anymore. Upstream has copies of those files, too. | ||||
* | run-nxproxy2nxagent-over-network: Improve comment that describes script ↵ | Mike Gabriel | 2016-10-06 | 1 | -5/+6 |
| | | | | usage. Fix commented-out NX_HOST assignment. | ||||
* | testscripts: Rename run-nxagent and run-nxagent-over-sockets. | Mike Gabriel | 2016-10-06 | 2 | -0/+0 |
| | |||||
* | run-nxproxy2nxagent-over-network: New test script that tests nxproxy/nxagent ↵ | Mike Gabriel | 2016-10-06 | 1 | -0/+149 |
| | | | | connectivity between networked hosts. | ||||
* | Merge branch 'sunweaver-pr/update-X11s-XKeysymDB' into 3.6.x | Mike Gabriel | 2016-10-01 | 1 | -2/+30 |
|\ | | | | | | | Attributes GH PR #196: https://github.com/ArcticaProject/nx-libs/pull/196 | ||||
| * | Add XF86TouchpadOn and XF86TouchpadOff to keysymdb | Peter Hutterer | 2016-10-01 | 1 | -0/+2 |
| | | | | | | | | | | | | | | This patch isn't necessary in Xlib 1.4 and later since the keysymdb has been made redunant. While we're on 1.3.x, we need it. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> | ||||
| * | lib/X11/XKeysymDB: Update to last version found in X.org (between 1.3.5 and ↵ | Mike Gabriel | 2016-10-01 | 1 | -2/+28 |
|/ | | | | 1.3.6). | ||||
* | Merge branch 'sunweaver-pr/use-gccmakedep' into 3.6.x | Mike Gabriel | 2016-10-01 | 1 | -1/+1 |
|\ | | | | | | | Attributes GH PR #211: https://github.com/ArcticaProject/nx-libs/pull/211 | ||||
| * | Imake.tmpl: Use gccmakedep instead of makedepend. | Mike Gabriel | 2016-10-01 | 1 | -1/+1 |
|/ | | | | This fixes ArcticaProject/nx-libs#206. | ||||
* | Merge branch 'sunweaver-pr/fix-protoheader-mess' into 3.6.x | Mike Gabriel | 2016-10-01 | 7 | -1493/+1210 |
|\ | | | | | | | | | Attributes GH PR #210: https://github.com/ArcticaProject/nx-libs/pull/210 Fixes ArcticaProject/nx-libs#205. | ||||
| * | include/extensions/damageproto.h: Use nx-X11's xfixesproto.h and ↵ | Mike Gabriel | 2016-10-01 | 1 | -2/+2 |
| | | | | | | | | damagewire.h instead of X.org's. | ||||
| * | randrproto: It was discovered that nx-libs shipped two different version of ↵ | Mike Gabriel | 2016-10-01 | 6 | -1491/+1208 |
|/ | | | | randr.h and randrproto.h. This commit leaves the newer file versions in the package and let's the build process use those everywhere. |