aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* debian/changelog: sync with 3.5.0.x branch.Mihai Moldovan2015-04-301-0/+2
|
* nx-libs.spec: actually create libXinerama.so.1 symlink during build phase.Mihai Moldovan2015-04-301-0/+1
|
* debian/changelog: correctly sync with 3.5.0.x branch. Add latest entries.Mihai Moldovan2015-04-301-50/+57
|
* debian/libnx-xinerama1.*: move Xinerama dir back to nx-x11-common. Only ↵Mihai Moldovan2015-04-303-8/+14
| | | | delete known files. Fixes RPM build failures.
* Merge pull request #19 from ↵Mike Gabriel2015-04-293-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 Moldovan2015-04-293-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 Moldovan2015-04-2824-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 Gabriel2015-04-2820-2679/+24
| |
| * imake cleanup: Break up multiple vars into invidual lines to ease further ↵Mike Gabriel2015-04-287-36/+128
|/ | | | work on patches / pull requests.
* COPYING: Add Arctica Project to copyright holders.Mike Gabriel2015-04-271-0/+1
|
* debian/changelog: merge with 3.5.0.x branch.Mihai Moldovan2015-04-271-0/+134
|
* README.keystrokes: remove accidentally copied Dokuwiki syntax.Mihai Moldovan2015-04-271-1/+1
|
* etc/keystrokes.cfg: fix whitespace errors.Mihai Moldovan2015-04-271-16/+16
|
* README.keystrokes: add documentation for branding behavior.Mihai Moldovan2015-04-271-2/+10
|
* README.keystrokes: copy actions documentation from the wiki.Mihai Moldovan2015-04-271-0/+11
|
* debian/roll-tarballs.sh: don't escape last newline of a multiline command.Mihai Moldovan2015-04-261-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 Moldovan2015-04-261-3/+3
| | | | Prevents random characters as being treated as part of a variable name.
* debian/roll-tarballs.sh: convert tabs to spaces.Mihai Moldovan2015-04-261-9/+9
|
* debian/roll-tarballs.sh: use more quotes.Mihai Moldovan2015-04-261-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 Gabriel2015-04-261-1/+1
| | | | 'XShmQueryVersion', 'XShmDetach', 'XShmCreateImage', 'XShmAttach', and 'XShmGetImage'.
* Fix underlinking issues for libNX_X{composite,damage,fixes}.Mike Gabriel2015-04-261-0/+3
|
* libX11 underlinking problem: Fix undefined reference to 'XdmcpWrap' (by ↵Mike Gabriel2015-04-261-1/+1
| | | | linking against X.Org'x libXdmcp).
* libX11 underlinking problem: Fix undefined reference to 'dlopen' and ↵Mike Gabriel2015-04-261-1/+1
| | | | 'dlsym'. (Fixes: X2GoBTS#853).
* 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 08:06:15 +0000