aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * move xkblib to xserverUlrich Sibiller2016-09-2129-3547/+3
|/ | | | | Upstream does not use xkbfile but has own copies of the required files. It was not used elsewhere.
* release 3.5.99.13.5.99.1Mike Gabriel2016-09-134-57/+169
|
* nxcomp/Loop.cpp: We have PrintVersionInfo(), why not use it? Use endl ↵Mike Gabriel2016-08-261-6/+9
| | | | instead of \n for EOLs when streaming application's preamble to stderr.
* nxcomp/Loop.cpp: Mention DXPC copyright holders on application (i.e. ↵Mike Gabriel2016-08-261-0/+3
| | | | nxproxy) start-up.
* nxcomp/Loop.cpp: We have GetCopyrightInfo() in Misc.cpp, so why not use it? ↵Mike Gabriel2016-08-241-2/+2
| | | | Also: point to ArcticaProject/nx-libs namespace on Github for further information.
* hw/nxagent/Init.c: Fix copy+paste flaw when re-arranging copyright ↵Mike Gabriel2016-08-241-2/+2
| | | | information as display by nxagent.
* nxcomp/Misc.cpp: Display new list of copyright holders when launching ↵Mike Gabriel2016-08-241-8/+16
| | | | nxproxy / nxagent.
* nxcomp/*.c: Update copyright headers, use new list of copyright holders like ↵Mike Gabriel2016-08-242-14/+30
| | | | for the .cpp files.
* nxcomp/Loop.cpp: Refer to Github namespace of Arctica Project as location to ↵Mike Gabriel2016-08-241-1/+1
| | | | | | search for software updates. Fixes ArcticaProject/190
* Merge branch 'uli42-fix_x2go_952' into 3.6.xMike Gabriel2016-08-241-0/+9
|\ | | | | | | | | | | Fixes X2GoBTS#952 Attributes GH PR #194: https://github.com/ArcticaProject/nx-libs/pull/194
| * Fix pasting the clipboard directly after session start.Ulrich Sibiller2016-08-241-0/+9
|/
* nxagent.1 man page: Some layout fixes for string options with well-defined ↵Mike Gabriel2016-07-281-0/+5
| | | | expected selections of values.
* hw/nxagent/Display.c: Fix comment where the meaning of the "bypass" ↵Mike Gabriel2016-07-281-3/+2
| | | | reconnectchecks parameter value is explained.
* nxagent.1 man page: Add explanation about the new reconnectchecks nx/nx option.Mike Gabriel2016-07-281-0/+26
|
* hw/nxagent/Args.c: Follow-up fix for PR #183: expect reconnectchecks=bypass ↵Mike Gabriel2016-07-281-1/+1
| | | | instead of =none.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 00:48:56 +0000