Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #36 from ArcticaProject/pr/render-cve-fixes | Mike Gabriel | 2015-05-26 | 1 | -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-fixes | Alan Coopersmith | 2015-05-24 | 1 | -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 Cristau | 2015-05-24 | 1 | -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.x | Mihai Moldovan | 2015-05-25 | 29 | -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 Gabriel | 2015-05-20 | 4 | -1033/+3 |
| | | | | | | | | | | | | hardware driver. | ||||
| * | | library clean-up: Don't build libNX_Xrandr anymore. Use system's libXrandr ↵ | Mike Gabriel | 2015-05-20 | 25 | -1860/+29 |
| | | | | | | | | | | | | shared library. | ||||
* | | | README.md: replace simple link with a text link, capitalization. | Mihai Moldovan | 2015-05-22 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'nitomartinez-qindel-readme' into arctica-3.6.x | Mihai Moldovan | 2015-05-22 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | | | | Attributes GH PR #34: https://github.com/ArcticaProject/nx-libs/pull/34 | ||||
| * | | Update the Qindel Company name (Qindel is without u ;-)) | Nito Martinez | 2015-05-21 | 1 | -1/+1 |
| | | | |||||
* | | | README.md: mark the iOS support for nxproxy/nxcomp as completed. | Mike Gabriel | 2015-05-16 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #26 from nitomartinez/fix_developer_debugging | Mike Gabriel | 2015-05-16 | 3 | -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 Martinez | 2015-05-15 | 3 | -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_reconnect | Mike Gabriel | 2015-05-16 | 3 | -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 Martinez | 2015-05-15 | 3 | -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 Moldovan | 2015-05-15 | 1 | -8/+7 |
| | | | |||||
* | | | README.md: grammar fix | Mike Gabriel | 2015-05-15 | 1 | -1/+1 |
| | | | |||||
* | | | README.md: phase 2 release series will be 3.7.0.x | Mike Gabriel | 2015-05-15 | 1 | -2/+2 |
| | | | |||||
* | | | update README.md with newest plans for nx-libs 3.6.x | Mike Gabriel | 2015-05-15 | 1 | -11/+30 |
| |/ |/| | |||||
* | | Merge branch 'sunweaver-pr/libxdamage-cleanup' into arctica-3.6.x | Mihai Moldovan | 2015-05-12 | 28 | -1061/+28 |
|\ \ | | | | | | | | | | Attributes GH PR #18: https://github.com/ArcticaProject/nx-libs/pull/18 | ||||
| * | | debian/changelog: merge with master branch. | Mihai Moldovan | 2015-05-12 | 1 | -0/+2 |
| | | | |||||
| * | | debian/changelog: add entry for last change. | Mihai Moldovan | 2015-05-12 | 1 | -0/+1 |
| | | | |||||
| * | | debian/libnx-xinerama1.*: fix faulty logic when creating symlinks. | Mihai Moldovan | 2015-05-12 | 1 | -3/+3 |
| | | | |||||
| * | | library clean-up: Don't build libNX_Xdamage anymore. Use system's libXdamage ↵ | Mike Gabriel | 2015-05-01 | 28 | -1061/+28 |
| | | | | | | | | | | | | shared library. (Fixes ArcticaProject/nx-libs#6, X2GoBTS#826). | ||||
* | | | debian/changelog: merge with master branch. | Mihai Moldovan | 2015-05-05 | 1 | -0/+2 |
| | | | |||||
* | | | debian/changelog: add entry for last change. | Mihai Moldovan | 2015-05-05 | 1 | -0/+1 |
| | | | |||||
* | | | debian/libnx-xinerama1.*: fix faulty logic when creating symlinks. | Mihai Moldovan | 2015-05-05 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #20 from sunweaver/pr/fix-CVE-2015-3418 | Mike DePaulo | 2015-05-01 | 1 | -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 Packard | 2015-05-01 | 1 | -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> | ||||
* | | debian/changelog: sync with 3.5.0.x branch. | Mihai Moldovan | 2015-04-30 | 1 | -0/+2 |
| | | |||||
* | | nx-libs.spec: actually create libXinerama.so.1 symlink during build phase. | Mihai Moldovan | 2015-04-30 | 1 | -0/+1 |
| | | |||||
* | | debian/changelog: correctly sync with 3.5.0.x branch. Add latest entries. | Mihai Moldovan | 2015-04-30 | 1 | -50/+57 |
| | | |||||
* | | debian/libnx-xinerama1.*: move Xinerama dir back to nx-x11-common. Only ↵ | Mihai Moldovan | 2015-04-30 | 3 | -8/+14 |
| | | | | | | | | delete known files. Fixes RPM build failures. | ||||
* | | Merge pull request #19 from ↵ | Mike Gabriel | 2015-04-29 | 3 | -29/+36 |
|\ \ | | | | | | | | | | | | | ArcticaProject/PR-ionic/libXinerama_symlink_to_libnx-xinerama1 debian/libnx-xinerama1.*: also create libXinerama symlink in libnx-xinerama1.postinst (and remove in libxinerama1.prerm). | ||||
| * | | libnx-xinerama1: also create libXinerama symlink in postinst (and remove in ↵ | Mihai Moldovan | 2015-04-29 | 3 | -29/+36 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prerm.) Due to the nx-x11-common package being a noarch/allarch package, creating the symlink in nx-libs' Makefile will lead to the symlink referencing the "default" architecture dpkg uses for building noarch/allarch packages. Incidentally, this worked fine for Debian, as amd64 seems to be the default architecture. On Ubuntu, however, the default architecture up to Vivid (15.04) was i386. For those builds, the symlink pointed to the 32 bit library of libNX_Xinerama.so.1 -- essentially breaking this feature. Move the symlink creation to the arch-sensitive libnx-xinerama1 package. The postinst and prerm scriptlets will work fine, unless someone installs the i386 package version *after* the amd64 version. Given that we already create symlinks to libNX_X11 and friends using that method, no new regression is introduced. Strictly speaking that's a bug, but we'll hopefully clean that up later... | ||||
* | | Merge branch 'sunweaver-pr/imake-cleanup-nonpresent-buildlogic' into ↵ | Mihai Moldovan | 2015-04-28 | 24 | -2685/+122 |
|\ \ | | | | | | | | | | | | | | | | arctica-3.6.x Attributes GH PR #17: https://github.com/ArcticaProject/nx-libs/pull/17 | ||||
| * | | imake cleanup: Drop references to X11 build-logic that is not present in nx-X11. | Mike Gabriel | 2015-04-28 | 20 | -2679/+24 |
| | | | |||||
| * | | imake cleanup: Break up multiple vars into invidual lines to ease further ↵ | Mike Gabriel | 2015-04-28 | 7 | -36/+128 |
|/ / | | | | | | | work on patches / pull requests. | ||||
* | | COPYING: Add Arctica Project to copyright holders. | Mike Gabriel | 2015-04-27 | 1 | -0/+1 |
| | | |||||
* | | debian/changelog: merge with 3.5.0.x branch. | Mihai Moldovan | 2015-04-27 | 1 | -0/+134 |
| | | |||||
* | | README.keystrokes: remove accidentally copied Dokuwiki syntax. | Mihai Moldovan | 2015-04-27 | 1 | -1/+1 |
| | | |||||
* | | etc/keystrokes.cfg: fix whitespace errors. | Mihai Moldovan | 2015-04-27 | 1 | -16/+16 |
| | | |||||
* | | README.keystrokes: add documentation for branding behavior. | Mihai Moldovan | 2015-04-27 | 1 | -2/+10 |
| | | |||||
* | | README.keystrokes: copy actions documentation from the wiki. | Mihai Moldovan | 2015-04-27 | 1 | -0/+11 |
| | | |||||
* | | debian/roll-tarballs.sh: don't escape last newline of a multiline command. | Mihai Moldovan | 2015-04-26 | 1 | -1/+1 |
| | | | | | | | | | | Worked out fine so far, because the next line was empty, but this can easily change... | ||||
* | | debian/roll-tarballs.sh: use more curly braces. | Mihai Moldovan | 2015-04-26 | 1 | -3/+3 |
| | | | | | | | | Prevents random characters as being treated as part of a variable name. | ||||
* | | debian/roll-tarballs.sh: convert tabs to spaces. | Mihai Moldovan | 2015-04-26 | 1 | -9/+9 |
| | | |||||
* | | debian/roll-tarballs.sh: use more quotes. | Mihai Moldovan | 2015-04-26 | 1 | -15/+15 |
| | | | | | | | | | | | | Fixes potential bugs, including one triggered by an unquoted hash within the command line. BASH accepts this. Other shells do not (i.e., treat everything following the hash character as a comment.) | ||||
* | | libXcompshad underlinking problem: Fix undefined reference to ↵ | Mike Gabriel | 2015-04-26 | 1 | -1/+1 |
| | | | | | | | | 'XShmQueryVersion', 'XShmDetach', 'XShmCreateImage', 'XShmAttach', and 'XShmGetImage'. | ||||
* | | Fix underlinking issues for libNX_X{composite,damage,fixes}. | Mike Gabriel | 2015-04-26 | 1 | -0/+3 |
| | | |||||
* | | libX11 underlinking problem: Fix undefined reference to 'XdmcpWrap' (by ↵ | Mike Gabriel | 2015-04-26 | 1 | -1/+1 |
| | | | | | | | | linking against X.Org'x libXdmcp). |