aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* update makekeys.c to libX11 1.3.4 (+ fix)Ulrich Sibiller2016-10-101-11/+7
|
* update lcUniConv subdir to libX11 1.3.4Ulrich Sibiller2016-10-1032-34/+12506
|
* update src files *[ch] to libX11 1.3.4Ulrich Sibiller2016-10-10238-2503/+2532
|
* add XLOCALELIBDIRUlrich Sibiller2016-10-102-1/+3
|
* improve header guardsUlrich Sibiller2016-10-1010-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.4Ulrich Sibiller2016-10-1017-620/+1760
|
* fix wrong include in XlibInt.cUlrich Sibiller2016-10-091-1/+1
|
* Merge branch 'uli42-pr/decouple-xserver' into 3.6.xMike Gabriel2016-10-081-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.hUlrich Sibiller2016-10-081-0/+484
| | | | | | | | | | This should have been part of commit 2c31ce2 which also happens to have a wrong description... Sigh.
* | Fix nxproxy hostname parsing.Vadim Troshchinskiyddd2016-10-071-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 Troshchinskiy2016-10-071-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.xMike Gabriel2016-10-0753-419/+6211
|\| | | | | | | Attributes GH PR #208: https://github.com/ArcticaProject/nx-libs/pull/208
| * xserver: adapt xkbsrc includes syntax to match upstreamUlrich Sibiller2016-10-065-5/+5
| |
| * os/access: fix regression in server interpreted authDave Airlie2016-10-061-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.cKeith Packard2016-10-061-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 Packard2016-10-061-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 Walsh2016-10-061-10/+12
| | | | | | | | | | v1: Eamon Walsh v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
| * replace transport.c link by xstrans.cUlrich Sibiller2016-10-068-14/+39
| | | | | | | | Just like upstream does
| * xserver: drop XKBSRV_NEED_FILE_FUNCSUlrich Sibiller2016-10-0617-20/+5
| | | | | | | | just as upstream did
| * xserver: remove define XKB_IN_SERVERUlrich Sibiller2016-10-0615-370/+1
| | | | | | | | it is no longer needed because the code here is only used in the server.
| * xserver: use own copy of XKBgeom.h headerUlrich Sibiller2016-10-0611-16/+671
| | | | | | | | just like upstream does
| * xserver: use own copy of XKBrules.h headerUlrich Sibiller2016-10-064-5/+3
| | | | | | | | just like upstream does
| * xserver: use own copy of XKBrules.h headerUlrich Sibiller2016-10-062-1/+200
| | | | | | | | just like upstream does
| * xserver: use own copy of XKBstr.h headerUlrich Sibiller2016-10-069-8/+615
| | | | | | | | just like upstream does
| * xserver: use own copy of XKBsrv.h headerUlrich Sibiller2016-10-0640-38/+1228
| | | | | | | | just like upstream does
| * copy files from libX11 to xserver dirUlrich Sibiller2016-10-065-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 Gabriel2016-10-061-5/+6
| | | | usage. Fix commented-out NX_HOST assignment.
* testscripts: Rename run-nxagent and run-nxagent-over-sockets.Mike Gabriel2016-10-062-0/+0
|
* run-nxproxy2nxagent-over-network: New test script that tests nxproxy/nxagent ↵Mike Gabriel2016-10-061-0/+149
| | | | connectivity between networked hosts.
* Merge branch 'sunweaver-pr/update-X11s-XKeysymDB' into 3.6.xMike Gabriel2016-10-011-2/+30
|\ | | | | | | Attributes GH PR #196: https://github.com/ArcticaProject/nx-libs/pull/196
| * Add XF86TouchpadOn and XF86TouchpadOff to keysymdbPeter Hutterer2016-10-011-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 Gabriel2016-10-011-2/+28
|/ | | | 1.3.6).
* Merge branch 'sunweaver-pr/use-gccmakedep' into 3.6.xMike Gabriel2016-10-011-1/+1
|\ | | | | | | Attributes GH PR #211: https://github.com/ArcticaProject/nx-libs/pull/211
| * Imake.tmpl: Use gccmakedep instead of makedepend.Mike Gabriel2016-10-011-1/+1
|/ | | | This fixes ArcticaProject/nx-libs#206.
* Merge branch 'sunweaver-pr/fix-protoheader-mess' into 3.6.xMike Gabriel2016-10-017-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 Gabriel2016-10-011-2/+2
| | | | | | | | damagewire.h instead of X.org's.
| * randrproto: It was discovered that nx-libs shipped two different version of ↵Mike Gabriel2016-10-016-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.
* nx-X11: Enable -Wpedantic as default CFLAG. This is to detect redefined ↵Mike Gabriel2016-10-013-4/+4
| | | | typedefs when building nxagent.
* hw/nxagent/X11/include/Xrandr_nxagent.h: Reduce injected libXrandr(_nxagent) ↵Mike Gabriel2016-10-011-22/+0
| | | | header file, so that it only contains the XRRScreenChangeNotifyEvent typedef.
* nx-libs.spec: Fix warning because of double reference to nxproxy.1.gz.Ulrich Sibiller2016-10-011-1/+0
|
* Fix FTBFS with gcc 4.4Ulrich Sibiller2016-10-011-2/+0
| | | | | | | This fixes ArcticaProject/nx-libs#204. However, this fix does not address the root of the problem, it simply avoids it. We could run into it again... See bugreport for an explanation.
* Makefile: Adapt install target to the new situation where we fake X11 ↵Mike Gabriel2016-10-011-1/+1
| | | | headers in .build-export. This fixes FTBFS during file installation into .deb and .rpm packages.
* Merge pull request #203 from mikedep333/issue-202Mike DePaulo2016-09-291-0/+1
|\ | | | | nx-libs.spec: Add BuildRequires: imake
| * nx-libs.spec: Add BuildRequires: imakeMike DePaulo2016-09-291-0/+1
|/ | | | Fixes ArcticaProject/nx-libs#202.
* Merge branch 'uli42-pr/improve_include_path_handling' into 3.6.xMike Gabriel2016-09-242-12/+5
|\ | | | | | | Attributes GH PR #201: https://github.com/ArcticaProject/nx-libs/pull/201
| * Revert "Fix wrong include"Ulrich Sibiller2016-09-241-7/+0
| | | | | | | | | | | | | | After commit cbf3ef0f219a7d5c94a7f5d5b46c9a0e26cc6588 this no longer necessary. This reverts commit 9a4bb50af54ced8d53112b8fa3b5b9dc3b481224.
| * whitespace cleanupUlrich Sibiller2016-09-241-7/+1
| |
| * ensure that <X11/..> headers references use nx-X11 files if existingUlrich Sibiller2016-09-241-0/+6
|/ | | | | | | | | | System headers including other headers via <X11/..> now use the nx-X11 variant (if existing). With this patch in place we should think about dropping the <nx-X11/..> namespace now for includes. Fixes ArcticaProject/nx-libs#200.
* Merge branch 'uli42-remove-misc' into 3.6.xMike Gabriel2016-09-2232-3552/+3
|\ | | | | | | Attributes GH PR #199: https://github.com/ArcticaProject/nx-libs/pull/199
| * remove misc dirUlrich Sibiller2016-09-213-5/+0
| | | | | | | | xserver upstream has included the required files. So do we.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 01:04:09 +0000