Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12 from sunweaver/pr/arch-cleanup.CRAY | Mike DePaulo | 2015-04-16 | 53 | -1033/+43 |
|\ | | | | | arch cleanup (CRAY/WORD64) + X.Org CVE-2013-7439 | ||||
| * | MakeBigReq: don't move the last word, already handled by Data32 (X.Org ↵ | Karl Tomlinson | 2015-04-16 | 1 | -2/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CVE-2013-7439). MakeBigReq inserts a length field after the first 4 bytes of the request (after req->length), pushing everything else back by 4 bytes. The current memmove moves everything but the first 4 bytes back. If a request aligns to the end of the buffer pointer when MakeBigReq is invoked for that request, this runs over the buffer. Instead, we need to memmove minus the first 4 bytes (which aren't moved), minus the last 4 bytes (so we still align to the previous tail). The 4 bytes that fell out are already handled with Data32, which will handle the buffermax correctly. The case where req->length = 1 was already not functional. Reported by Abhishek Arya <inferno@chromium.org> (against X.Org BTS). https://bugzilla.mozilla.org/show_bug.cgi?id=803762 Reviewed-by: Jeff Muizelaar <jmuizelaar@mozilla.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Rebased-for-NX: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | ||||
| * | old-arch cleanup: Drop CRAY support (i.e., drop code related to CRAY, _CRAY, ↵ | Mike Gabriel | 2015-04-16 | 53 | -1031/+26 |
| | | | | | | | | WORD64, WORD64ALIGN, MUSTCOPY, UNSIGNEDBITFIELDS definitions). | ||||
* | | Merge branch 'sunweaver-pr/xcursor-cleanup' into arctica-3.6.x | Mihai Moldovan | 2015-04-16 | 23 | -4847/+1 |
|\ \ | | | | | | | | | | Attributes GH PR #13: https://github.com/ArcticaProject/nx-libs/pull/13 | ||||
| * | | library clean-up: Drop nx-X11/lib/Xcursor. Not used at build time. | Mike Gabriel | 2015-04-16 | 23 | -4847/+1 |
|/ / | |||||
* | | Merge branch 'sunweaver-pr/nxupgradeagent-cleanup' into arctica-3.6.x | Mihai Moldovan | 2015-04-16 | 52 | -38864/+6098 |
|\ \ | |||||
| * | | NXAGENT_UPGRADE code cleanup: | Mike Gabriel | 2015-04-16 | 52 | -38864/+6098 |
|/ / | | | | | | | | | | | | | | | | | | | | | NX agent contains/ed two build trees. An old one (probably pre-3.x.y) and a "newer" one. The "newer" code tree used to become enabled by setting NXUpgradeAgentServer in nx-X11/config/cf/host.def to YES. As building the NXUpgradeAgentServer has been the default for years now, we drop all code that does not get used at build time for NXUpgradeAgentServer == YES (i.e., the code that belongs to the pre-3.x.y phase of NX agent). | ||||
* / | test script: doc/examples/run-nxproxy2nxproxy-test | Mike Gabriel | 2015-04-15 | 1 | -0/+140 |
|/ | | | | | | | | | | | | | | | | | | | | Launch this script (after nxproxy has been installed into $PATH) and you will be able to evoke any local command through a nxproxy -C <-> nxproxy -S connection on DISPLAY=:8. This eases testing NX compression without using NX agent on the server side. How to use: # install nxproxy into $PATH, then... $ cd doc/examples/ $ ./run-nxproxy2nxproxy-test $ export DISPLAY=:8 $ xterm | ||||
* | drop: nx-X11/config/util/ (not needed at build time). | Mike Gabriel | 2015-04-14 | 49 | -6480/+1 |
| | |||||
* | imake clean-up: nx-X11/config/Imakefile (drop BuildDPSLibrary related ↵ | Mike Gabriel | 2015-04-14 | 1 | -4/+1 |
| | | | | build-logic). | ||||
* | fix for libXpm4-cleanup | Mike Gabriel | 2015-04-11 | 1 | -1/+0 |
| | |||||
* | fix for ebe00df38f264ef71dac3c73d416a74685c8cbd2 (removal of DmxLibrary) | Mike Gabriel | 2015-04-08 | 1 | -4/+0 |
| | |||||
* | Merge branch 'feature/other-Xserver-cleanup' into arctica-3.6.x | Mihai Moldovan | 2015-04-05 | 29 | -7058/+23 |
|\ | | | | | | | Attributes GH PR #8: https://github.com/ArcticaProject/nx-libs/pull/8 | ||||
| * | imake clean: Remove (probably incomplete) support for NXZaurusXServer, ↵ | Mike Gabriel | 2015-04-05 | 1 | -54/+0 |
| | | | | | | | | NXiPAQXServer. | ||||
| * | imake cleanup: nx-X11/programs/Xserver/Imakefile (drop non-provided Xserver ↵ | Mike Gabriel | 2015-04-05 | 1 | -286/+1 |
| | | | | | | | | variants) | ||||
| * | imake cleanup: nx-X11/programs/Imakefile (reduce to minimal). | Mike Gabriel | 2015-04-04 | 1 | -136/+0 |
| | | |||||
| * | imake cleanup: Drop all references to BuildFontServer. | Mike Gabriel | 2015-04-04 | 8 | -44/+2 |
| | | |||||
| * | imake cleanup: Drop all references to XprtServer and BuildXprint*. | Mike Gabriel | 2015-04-04 | 23 | -4368/+12 |
| | | |||||
| * | imake cleanup: Drop all references to XdmxServer and BuildXdmx*. | Mike Gabriel | 2015-04-04 | 15 | -1934/+8 |
| | | |||||
| * | imake cleanup: Drop all references to XVirtualFramebufferServer. | Mike Gabriel | 2015-04-04 | 9 | -74/+3 |
| | | |||||
| * | imake cleanup: Drop all references to XNestServer. | Mike Gabriel | 2015-04-04 | 10 | -76/+7 |
| | | |||||
| * | imake cleanup: Drop all references to XWinServer. | Mike Gabriel | 2015-04-04 | 3 | -99/+3 |
|/ | |||||
* | nx-X11: add more NULL guards to TEST and DEBUG sections of Render.c. | Mihai Moldovan | 2015-03-29 | 2 | -65/+93 |
| | | | | Cherry-picked from branch 3.5.0.x. | ||||
* | debian/changelog: sync with 3.5.0.x branch. | Mihai Moldovan | 2015-03-29 | 1 | -0/+7 |
| | |||||
* | nx-X11: fix typo in previous commit. | Mihai Moldovan | 2015-03-29 | 1 | -1/+1 |
| | | | | Cherry-picked from branch 3.5.0.x. | ||||
* | nx-X11: handle source pictures (those without a Drawable surface) gracefully. | Mihai Moldovan | 2015-03-29 | 4 | -20/+89 |
| | | | | | | | | | | | | | | | | | | | Cherry-picked from branch 3.5.0.x. This is basically a merge of the most current xorg-server (1.17.1) code into nx-X11. It makes sure that for source pictures, which do not have a drawable surface, a filter is selected that is supported on the "main" and all other screens. Alternatively, if the requested filter is not available on all screens and the picture is a source picture, this function fails gracefully. Additionally, the ChangePictureFilter hook is now called for non-source pictures. This also needs an implementation in mipict.{c,h}. The default hook does nothing and returns a success value. | ||||
* | debian/changelog: sync with 3.5.0.x branch. | Mihai Moldovan | 2015-03-26 | 1 | -3/+47 |
| | |||||
* | nxcomp{,ext,shad}: only use the first three numbers in the full version for ↵ | Mihai Moldovan | 2015-03-26 | 3 | -3/+6 |
| | | | | current_version on OS X. ld(1) on 10.6 fails otherwise. | ||||
* | nx-libs.spec: add overlooked Obsolete: statement to libNX_Xfixes3. | Mihai Moldovan | 2015-03-17 | 2 | -0/+2 |
| | | | | Cherry-picked from branch 3.5.0.x. | ||||
* | nx-libs.spec: Versioned libXcomp* should obsolete unversioned libXcomp*, not ↵ | Mihai Moldovan | 2015-03-17 | 2 | -3/+10 |
| | | | | | | | | | libNX_Xcomp*. Cherry-picked from branch 3.5.0.x. Conflicts: debian/changelog | ||||
* | nx{comp{,ext,shad},proxy}: try really hard to find makedepend. Do not fail ↵ | Mihai Moldovan | 2015-03-16 | 8 | -8/+48 |
| | | | | if it is not available. | ||||
* | nxcomp{,ext,shad}: use the correct library naming scheme on OS X. It differs ↵ | Clemens Lang | 2015-03-15 | 4 | -19/+45 |
| | | | | from other UNIX-based systems. | ||||
* | nxcomp{,shad}: fix dynamic library linking on OS X. Use -dynamiclib instead ↵ | Clemens Lang | 2015-03-15 | 3 | -4/+5 |
| | | | | of -bundle. | ||||
* | nx{comp{,ext,shad},proxy}: use path discovery for finding makedepend. Remove ↵ | Clemens Lang | 2015-03-15 | 5 | -58/+6 |
| | | | | old cruft. | ||||
* | debian/changelog: fix wrong signature. | Mihai Moldovan | 2015-03-15 | 1 | -1/+1 |
| | |||||
* | debian/changelog: merge with 3.5.0.x release branch. | Mihai Moldovan | 2015-03-15 | 1 | -4/+43 |
| | |||||
* | README.md: Fix typo, update date. | Mike Gabriel | 2015-03-13 | 1 | -2/+2 |
| | |||||
* | README.md markdown fixup | Mike Gabriel | 2015-03-13 | 1 | -15/+16 |
| | |||||
* | README.md: Add 3.6.x release goals. | Mike Gabriel | 2015-03-13 | 1 | -0/+12 |
| | |||||
* | Makefile: clean-up auto-generated nxversion.def in clean rule (not in build ↵ | Mike Gabriel | 2015-03-05 | 1 | -3/+5 |
| | | | | rule). | ||||
* | nx-X11/**: Drop non-imake Makefile* files. | Mike Gabriel | 2015-03-04 | 7 | -951/+0 |
| | |||||
* | nx-X11/config/cf/X11.tmpl: Fix imake warning ("UseInstalledOnCrossCompile" ↵ | Mike Gabriel | 2015-03-04 | 1 | -0/+2 |
| | | | | is not defined). | ||||
* | Merge pull request #4 from sunweaver/feature/libxpm-cleanup | Mike Gabriel | 2015-03-04 | 41 | -9722/+26 |
|\ | | | | | | | | | | | | | | | | | | | | | | | library clean-up: Don't build libNX_Xpm anymore. Use system's libXpm shared library. One release goal for version 3.6.x of nx-libs is dropping as many bundled libraries as possible that haven't been adapted to nx-libs. Starting with libNX_Xpm here. The libNX_Xpm library is only referenced once (nx-X11/programs/Xserver/hw/nxagent/Holder.c). When grepping through Xserver/hw/nxagent the suspicion comes up, that the libXpm linkage is not needed at all, because none of the provided functions are used inside the nxagent Xserver. | ||||
| * | library clean-up: Don't build libNX_Xpm anymore. Use system's libXpm shared ↵ | Mike Gabriel | 2015-03-03 | 41 | -9722/+26 |
|/ | | | | library. | ||||
* | Drop unused .cvsignore files | Mike DePaulo | 2015-02-18 | 3 | -73/+0 |
| | |||||
* | Update changelog for the CVE-2015-0255 commit and its 3 prereq commits | Mike DePaulo | 2015-02-18 | 1 | -0/+8 |
| | |||||
* | Fix symlink to renamed README.md. | Mike Gabriel | 2015-02-18 | 1 | -1/+1 |
| | |||||
* | README.md: Mention the TheQVD project as collaborator on NX. | Mike Gabriel | 2015-02-18 | 1 | -2/+6 |
| | |||||
* | rename README.txt to README.md | Mike Gabriel | 2015-02-18 | 1 | -0/+0 |
| | |||||
* | switch symlink and real file | Mike Gabriel | 2015-02-18 | 2 | -33/+33 |
| |