aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* debian/control: Add Breaks:/Replaces: for qvd-libxcomp3 and qvd-nxproxy.Mike Gabriel2015-06-191-2/+6
|
* Merge branch 'sunweaver-pr/libglx-cleanup' into arctica-3.6.xMihai Moldovan2015-06-1673-4168/+59
|\ | | | | | | Attributes GH PR #40: https://github.com/ArcticaProject/nx-libs/pull/40
| * imake clean-up: Enforce build of Mesa GLX extension. Drop all other GLX ↵Mike Gabriel2015-06-1619-589/+29
| | | | | | | | build methods (built-in DRI drivers, etc.).
| * Drop unused / untested Xserver GLX extension support / build logic.Mike Gabriel2015-06-1613-208/+5
| | | | | | | | | | | | | | * MS Windows (non-tested) * Mac OS X (not provided) * SGISI / opengl (not provided) * DRI support (nxagent uses Mesa software emulation only)
| * Drop nx-X11/lib/GL and move Imakefile.inc include files into Xserver code tree.Mike Gabriel2015-06-1666-3371/+25
|/ | | | | | | | | | | | The client-side library libNX_GL.{a,so} is not built when building nx-libs. However, nx-X11/lib/GL/** ships several imake include files (Imakefile.inc) that are also used in nx-X11/programs/Xserver/GL/**. These files have been moved from the nx-X11/lib/GL/ code subtree to the nx-X11/programs/Xserver/GL/. Furthermore, we don't provide module builds of the GL extension anymore, as that feature is neither used in nx-libs.
* nxcomp/Loop.cpp: tiny whitespace fix. No functional change.Mihai Moldovan2015-06-161-1/+1
|
* Merge pull request #28 from theqvd/3.6.xMike Gabriel2015-06-161-1/+37
|\ | | | | Fix negotiation in stage 10 error.
| * Fix negotiation in stage 10 errorVadim Troshchinskiy2015-05-201-1/+37
| | | | | | | | | | Problem fixed by adding a select() call to implement a timeout, and retrying writes if needed.
* | Merge branch 'sunweaver-pr/libxres-cleanup' into arctica-3.6.xMihai Moldovan2015-06-0212-526/+2
|\ \ | | | | | | | | | Attributes GH PR #39: https://github.com/ArcticaProject/nx-libs/pull/39
| * | library clean-up: Don't compile (i.e., remove) libNX_Xres.a anymore. It is ↵Mike Gabriel2015-06-0212-526/+2
| | | | | | | | | | | | not used anywhere.
* | | debian/changelog: sync with master/3.5.0.x branch.Mihai Moldovan2015-06-021-0/+67
| | |
* | | Update README.md: Move more release goals to 3.6.x.Mike Gabriel2015-05-311-5/+6
| | | | | | | | | | | | * Unix file socket support -> 3.6.x * Embedding / re-parenting -> 3.6.x
* | | Merge pull request #46 from ArcticaProject/pr/Xext-cve-fixesMike Gabriel2015-05-311-0/+20
|\ \ \ | | | | | | | | Xext CVE fixes in XVideo extension.
| * | | Xv: unvalidated lengths in XVideo extension swapped procs [CVE-2014-8099]pr/Xext-cve-fixesAlan Coopersmith2015-05-301-0/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v2: backport to nx-libs 3.6.x (Mike DePaulo) v3: port to NXxvdisp.c rather than xvdisp.c (Mike DePaulo) Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Conflicts: Xext/xvdisp.c
* | | Merge pull request #45 from ArcticaProject/pr/dix-cve-fixesMike Gabriel2015-05-312-1/+8
|\ \ \ | |/ / |/| | DIX CVE fixes in nx-X11/programs/Xserver/hw/nxagent/ rather than nx-X11/programs/Xserver/dix/.
| * | dix: Allow zero-height PutImage requests (fix for X.Org's CVE-2015-3418).pr/dix-cve-fixesKeith Packard2015-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The length checking code validates PutImage height and byte width by making sure that byte-width >= INT32_MAX / height. If height is zero, this generates a divide by zero exception. Allow zero height requests explicitly, bypassing the INT32_MAX check. Fix for regression introduced by fix for CVE-2014-8092. v2: backports to nx-libs 3.6.x (Mike Gabriel) v3: port to NXdispatch.c rather than dispatch.c (Mike DePaulo) Signed-off-by: Keith Packard <keithp@keithp.com>
| * | dix: integer overflow in ProcPutImage() [CVE-2014-8092 1/4]Alan Coopersmith2015-05-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ProcPutImage() calculates a length field from a width, left pad and depth specified by the client (if the specified format is XYPixmap). The calculations for the total amount of memory the server needs for the pixmap can overflow a 32-bit number, causing out-of-bounds memory writes on 32-bit systems (since the length is stored in a long int variable). v2: backport to nx-libs 3.6.x (Mike DePaulo) v3: port to NXdispatch.c rather than dispatch.c (Mike DePaulo) Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Conflicts: dix/dispatch.c
| * | Avoid use-after-free in dix/dixfonts.c: doImageText() [CVE-2013-4396] from ↵Mike DePaulo2015-05-301-0/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xorg/Xserver http://lists.x.org/archives/xorg-announce/2013-October/002332.html Save a pointer to the passed in closure structure before copying it and overwriting the *c pointer to point to our copy instead of the original. If we hit an error, once we free(c), reset c to point to the original structure before jumping to the cleanup code that references *c. Since one of the errors being checked for is whether the server was able to malloc(c->nChars * itemSize), the client can potentially pass a number of characters chosen to cause the malloc to fail and the error path to be taken, resulting in the read from freed memory. Since the memory is accessed almost immediately afterwards, and the X server is mostly single threaded, the odds of the free memory having invalid contents are low with most malloc implementations when not using memory debugging features, but some allocators will definitely overwrite the memory there, leading to a likely crash. v2: Apply to NXdixfonts.c rather than dixfonts.c (Mike DePaulo)
* | nxcomp/README.on-retroactive-DXPC-license: Some layout and interpunctuation ↵Mike Gabriel2015-05-291-1/+1
| | | | | | | | fixes.
* | nxcomp/Misc.cpp: fix build failure introduced in ↵Mihai Moldovan2015-05-281-3/+3
| | | | | | | | 1f44331574bdbe4069d13e4c26df18094b49e658.
* | Merge branch 'sunweaver-pr/DXPC-re-license-retroactively' into arctica-3.6.xMihai Moldovan2015-05-264-6/+4097
|\ \ | | | | | | | | | Attributes GH PR #31: https://github.com/ArcticaProject/nx-libs/pull/31
| * | Document retroactive re-licensing of the original DXPC code (closes #30).Mike Gabriel2015-05-264-6/+4097
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update nxcomp/LICENSE. * Add nxcomp/README.on-retroactive-DXPC-license, giving a short overview of the flow of discussions * Add "modified or unmodified" to the license information printed out to stdout in nxcomp/Misc.cpp * Fix copyright year (2006->2003) for Gian Filippo Pinzari (and move him to the GPL-2 section). * Add the complete .mbox file of Debian bug #748565.
* | | Merge pull request #36 from ArcticaProject/pr/render-cve-fixesMike Gabriel2015-05-261-2/+18
|\ \ \ | |/ / |/| | XRender CVE fixes for nxagent (X.Org CVE-2014-8100)
| * | render: unvalidated lengths in Render extn. swapped procs [CVE-2014-8100 2/2]pr/render-cve-fixesAlan Coopersmith2015-05-241-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v2: backport to nx-libs 3.6.x (Mike DePaulo) v3: port to NXrender.c rather than render.c (Mike DePaulo) Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Conflicts: render/render.c
| * | render: check request size before reading it [CVE-2014-8100 1/2]Julien Cristau2015-05-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we may be reading outside of the client request. v2: backport to nx-libs 3.6.x (Mike DePaulo) v3: port to NXrender.c rather than render.c (Mike DePaulo) Signed-off-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Conflicts: render/render.c
* | | Merge branch 'sunweaver-pr/libxrandr-cleanup' into arctica-3.6.xMihai Moldovan2015-05-2529-2893/+32
|\ \ \ | | | | | | | | | | | | Attributes GH PR #21: https://github.com/ArcticaProject/nx-libs/pull/21
| * | | hw/nxagent clean-up: Drop NXrandr.{c|h} client lib copy-of-code from nxagent ↵Mike Gabriel2015-05-204-1033/+3
| | | | | | | | | | | | | | | | hardware driver.
| * | | library clean-up: Don't build libNX_Xrandr anymore. Use system's libXrandr ↵Mike Gabriel2015-05-2025-1860/+29
| | |/ | |/| | | | | | | shared library.
* | | README.md: replace simple link with a text link, capitalization.Mihai Moldovan2015-05-221-1/+1
| | |
* | | Merge branch 'nitomartinez-qindel-readme' into arctica-3.6.xMihai Moldovan2015-05-221-1/+1
|\ \ \ | |/ / |/| | | | | Attributes GH PR #34: https://github.com/ArcticaProject/nx-libs/pull/34
| * | Update the Qindel Company name (Qindel is without u ;-))Nito Martinez2015-05-211-1/+1
| | |
* | | README.md: mark the iOS support for nxproxy/nxcomp as completed.Mike Gabriel2015-05-161-1/+1
| | |
* | | Merge pull request #26 from nitomartinez/fix_developer_debuggingMike Gabriel2015-05-163-3/+3
|\ \ \ | | | | | | | | This patch is some code fixes to allow developer debuging by using TEST macros in the NX code
| * | | This patch is some code fixes to debug some debuging macro usage in the NX code.Nito Martinez2015-05-153-3/+3
| |/ / | | | | | | | | | Particularly the following macros have been tested -DTEST -DDEBUG -DDUMP -DFLUSH -DTOKEN -DSPLIT -DPING -DMIXED -DMATCH -DTIME
* | | Merge pull request #25 from nitomartinez/nxtranscleanup_for_reconnectMike Gabriel2015-05-163-0/+36
|\ \ \ | | | | | | | | This patch allows to cleanup the nxcomp resources to allow for a seco…
| * | | This patch allows to cleanup the nxcomp resources to allow for a second ↵Nito Martinez2015-05-153-0/+36
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connection inside the same process, instead of a new process as is the nxproxy case. This involves creating a new API call void NXTransCleanupForReconnect(void); which basically cleans up the global state for the connection but does not exit the process. Background ========== This is needed for the IOS platform, where the nxproxy model of forking does not work. Also NX handles most of the errors with an "exit" call which in IOS cannot be easily handled.
* | | README.md: reword a few sections, whitespace fixes.Mihai Moldovan2015-05-151-8/+7
| | |
* | | README.md: grammar fixMike Gabriel2015-05-151-1/+1
| | |
* | | README.md: phase 2 release series will be 3.7.0.xMike Gabriel2015-05-151-2/+2
| | |
* | | update README.md with newest plans for nx-libs 3.6.xMike Gabriel2015-05-151-11/+30
| |/ |/|
* | Merge branch 'sunweaver-pr/libxdamage-cleanup' into arctica-3.6.xMihai Moldovan2015-05-1228-1061/+28
|\ \ | | | | | | | | | Attributes GH PR #18: https://github.com/ArcticaProject/nx-libs/pull/18
| * | debian/changelog: merge with master branch.Mihai Moldovan2015-05-121-0/+2
| | |
| * | debian/changelog: add entry for last change.Mihai Moldovan2015-05-121-0/+1
| | |
| * | debian/libnx-xinerama1.*: fix faulty logic when creating symlinks.Mihai Moldovan2015-05-121-3/+3
| | |
| * | library clean-up: Don't build libNX_Xdamage anymore. Use system's libXdamage ↵Mike Gabriel2015-05-0128-1061/+28
| | | | | | | | | | | | shared library. (Fixes ArcticaProject/nx-libs#6, X2GoBTS#826).
* | | debian/changelog: merge with master branch.Mihai Moldovan2015-05-051-0/+2
| | |
* | | debian/changelog: add entry for last change.Mihai Moldovan2015-05-051-0/+1
| | |
* | | debian/libnx-xinerama1.*: fix faulty logic when creating symlinks.Mihai Moldovan2015-05-051-3/+3
| | |
* | | Merge pull request #20 from sunweaver/pr/fix-CVE-2015-3418Mike DePaulo2015-05-011-1/+1
|\| | | | | | | | dix: Allow zero-height PutImage requests (fix for X.Org's CVE-2015-3418).
| * | dix: Allow zero-height PutImage requests (fix for X.Org's CVE-2015-3418).Keith Packard2015-05-011-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | The length checking code validates PutImage height and byte width by making sure that byte-width >= INT32_MAX / height. If height is zero, this generates a divide by zero exception. Allow zero height requests explicitly, bypassing the INT32_MAX check. Fix for regression introduced by fix for CVE-2014-8092. v2: backports to nx-libs 3.6.x (Mike Gabriel) Signed-off-by: Keith Packard <keithp@keithp.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 11:26:56 +0000