aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sunweaver-pr/xbitmaps-cleanup' into arctica-3.6.xMihai Moldovan2015-04-2374-2687/+2
|\ | | | | | | Attributes GH PR #16: https://github.com/ArcticaProject/nx-libs/pull/16
| * xbitmaps cleanup: The <X11/bitmaps/*> headers are not required at build time ↵Mike Gabriel2015-04-2374-2687/+2
|/ | | | for NX.
* Merge branch 'sunweaver-pr/libxdmcp-cleanup' into arctica-3.6.xMihai Moldovan2015-04-2257-3435/+28
|\ | | | | | | Attributes GH PR #15: https://github.com/ArcticaProject/nx-libs/pull/15
| * library clean-up: Don't build libNX_Xdmcp anymore. Use system's libXdmcp ↵Mike Gabriel2015-04-2257-3435/+28
|/ | | | shared library.
* nx-libs.spec: Drop packaging of libNX_Xpm*, in RPM packages there is no such ↵Mike Gabriel2015-04-221-29/+0
| | | | concept for transitional/dummy packages as know from Debian/Ubuntu.
* debian/control: Typo fix (Meas -> Mesa).Mike Gabriel2015-04-221-1/+1
|
* Merge branch 'sunweaver-pr/libxfont-cleanup' into arctica-3.6.xMihai Moldovan2015-04-22233-67022/+50
|\ | | | | | | Attributes GH PR #14: https://github.com/ArcticaProject/nx-libs/pull/14
| * library clean-up: Don't build and link libXfont.a anymore. Use system's ↵pr/libxfont-cleanupMike Gabriel2015-04-22233-67022/+50
|/ | | | libXfont shared library and link dynamically.
* fix for Xcursor clean-up (422fe90)Mike Gabriel2015-04-213-3/+3
|
* imake cleanup (nx-X11/programs/Xserver/Imakefile): Drop build rules for ↵Mike Gabriel2015-04-171-286/+2
| | | | XF86Server and XorgServer.
* Merge pull request #12 from sunweaver/pr/arch-cleanup.CRAYMike DePaulo2015-04-1653-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 Tomlinson2015-04-161-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 Gabriel2015-04-1653-1031/+26
| | | | | | | | WORD64, WORD64ALIGN, MUSTCOPY, UNSIGNEDBITFIELDS definitions).
* | Merge branch 'sunweaver-pr/xcursor-cleanup' into arctica-3.6.xMihai Moldovan2015-04-1623-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 Gabriel2015-04-1623-4847/+1
|/ /
* | Merge branch 'sunweaver-pr/nxupgradeagent-cleanup' into arctica-3.6.xMihai Moldovan2015-04-1652-38864/+6098
|\ \
| * | NXAGENT_UPGRADE code cleanup:Mike Gabriel2015-04-1652-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-testMike Gabriel2015-04-151-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 Gabriel2015-04-1449-6480/+1
|
* imake clean-up: nx-X11/config/Imakefile (drop BuildDPSLibrary related ↵Mike Gabriel2015-04-141-4/+1
| | | | build-logic).
* fix for libXpm4-cleanupMike Gabriel2015-04-111-1/+0
|
* fix for ebe00df38f264ef71dac3c73d416a74685c8cbd2 (removal of DmxLibrary)Mike Gabriel2015-04-081-4/+0
|
* Merge branch 'feature/other-Xserver-cleanup' into arctica-3.6.xMihai Moldovan2015-04-0529-7058/+23
|\ | | | | | | Attributes GH PR #8: https://github.com/ArcticaProject/nx-libs/pull/8
| * imake clean: Remove (probably incomplete) support for NXZaurusXServer, ↵Mike Gabriel2015-04-051-54/+0
| | | | | | | | NXiPAQXServer.
| * imake cleanup: nx-X11/programs/Xserver/Imakefile (drop non-provided Xserver ↵Mike Gabriel2015-04-051-286/+1
| | | | | | | | variants)
| * imake cleanup: nx-X11/programs/Imakefile (reduce to minimal).Mike Gabriel2015-04-041-136/+0
| |
| * imake cleanup: Drop all references to BuildFontServer.Mike Gabriel2015-04-048-44/+2
| |
| * imake cleanup: Drop all references to XprtServer and BuildXprint*.Mike Gabriel2015-04-0423-4368/+12
| |
| * imake cleanup: Drop all references to XdmxServer and BuildXdmx*.Mike Gabriel2015-04-0415-1934/+8
| |
| * imake cleanup: Drop all references to XVirtualFramebufferServer.Mike Gabriel2015-04-049-74/+3
| |
| * imake cleanup: Drop all references to XNestServer.Mike Gabriel2015-04-0410-76/+7
| |
| * imake cleanup: Drop all references to XWinServer.Mike Gabriel2015-04-043-99/+3
|/
* nx-X11: add more NULL guards to TEST and DEBUG sections of Render.c.Mihai Moldovan2015-03-292-65/+93
| | | | Cherry-picked from branch 3.5.0.x.
* debian/changelog: sync with 3.5.0.x branch.Mihai Moldovan2015-03-291-0/+7
|
* nx-X11: fix typo in previous commit.Mihai Moldovan2015-03-291-1/+1
| | | | Cherry-picked from branch 3.5.0.x.
* nx-X11: handle source pictures (those without a Drawable surface) gracefully.Mihai Moldovan2015-03-294-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 Moldovan2015-03-261-3/+47
|
* nxcomp{,ext,shad}: only use the first three numbers in the full version for ↵Mihai Moldovan2015-03-263-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 Moldovan2015-03-172-0/+2
| | | | Cherry-picked from branch 3.5.0.x.
* nx-libs.spec: Versioned libXcomp* should obsolete unversioned libXcomp*, not ↵Mihai Moldovan2015-03-172-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 Moldovan2015-03-168-8/+48
| | | | if it is not available.
* nxcomp{,ext,shad}: use the correct library naming scheme on OS X. It differs ↵Clemens Lang2015-03-154-19/+45
| | | | from other UNIX-based systems.
* nxcomp{,shad}: fix dynamic library linking on OS X. Use -dynamiclib instead ↵Clemens Lang2015-03-153-4/+5
| | | | of -bundle.
* nx{comp{,ext,shad},proxy}: use path discovery for finding makedepend. Remove ↵Clemens Lang2015-03-155-58/+6
| | | | old cruft.
* debian/changelog: fix wrong signature.Mihai Moldovan2015-03-151-1/+1
|
* debian/changelog: merge with 3.5.0.x release branch.Mihai Moldovan2015-03-151-4/+43
|
* README.md: Fix typo, update date.Mike Gabriel2015-03-131-2/+2
|
* README.md markdown fixupMike Gabriel2015-03-131-15/+16
|
* README.md: Add 3.6.x release goals.Mike Gabriel2015-03-131-0/+12
|
* Makefile: clean-up auto-generated nxversion.def in clean rule (not in build ↵Mike Gabriel2015-03-051-3/+5
| | | | rule).