Not sure how it came to this situation, but the following commit is
partly contained in our version of the code. Some lines had not been
removed, tough...

  commit c80c41767eb101e9dbd8393d8cca7764b4e248a4
  Author: Aaron Plattner <aplattner@nvidia.com>
  Date:   Mon Oct 25 22:01:32 2010 -0700

    os: Fix BigReq ignoring when another request is pending

    Commit cf88363db0ebb42df7cc286b85d30d7898aea840 fixed the handling of
    BigReq requests that are way too large and handles the case where the
    read() syscall returns a short read.  However, it neglected to handle
    the case where it returns a long read, which happens when the client
    has another request in the queue after the bogus large one.

    Handle the long read case by subtracting the smaller of 'needed' and
    'gotnow' from oci->ignoreBytes.  If needed < gotnow, simply subtract
    the two, leaving gotnow equal to the number of extra bytes read.
    Since the code immediately following the (oci->ignoreBytes > 0) block
    tries to handle the next request, advance oci->bufptr immediately
    instead of setting oci->lenLastReq and letting the next call to
    ReadRequestFromClient do it.

    Fixes the XTS pChangeKeyboardMapping-3 test.

             CASES TESTS  PASS UNSUP UNTST NOTIU  WARN   FIP  FAIL UNRES  UNIN ABORT
    -Xproto    122   389   367     2    19     0     0     0     1     0     0     0
    +Xproto    122   389   368     2    19     0     0     0     0     0     0     0
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>

was missing in 8b5bb2cd

CheckMotion() had been commented in
add88193 as it looked identical to the
version from dix/events.c except for some commented code. But this
based (probably) on a thinko - code that had been disabled by NX
became active again this way. Fix this by removing the comments and
by adding #ifdef/else to emphasize the difference.

Attributes GH PR #811: https://github.com/ArcticaProject/nx-libs/pull/811

As done in these commits:

  commit 6583477035234e23ead2fad9db7a07e5862447a4
  Author: Nicolai Hähnle <nhaehnle@gmail.com>
  Date:   Sat May 23 13:35:24 2009 +0200

    Remove reference to non-existing requestLog and requestLogIndex

    These fields were removed in 252ec504817e05b185e4896a2d899e9c00b8aeef.
Signed-off-by: Nicolai Haehnle <nhaehnle@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

  commit 252ec504817e05b185e4896a2d899e9c00b8aeef
  Author: Adam Jackson <ajax@redhat.com>
  Date:   Mon Mar 30 15:18:30 2009 -0400

    Document which bits of ClientRec are currently unused

Attributes GH PR #809: https://github.com/ArcticaProject/nx-libs/pull/809

We have seen crashes during session shutdown/connection problems
here. These patches should avoid them. There's no proper way to test
them, but they should do no harm..

Fixes ArcticaProject/nx-libs#801
Fixes https://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=695

Fixes ArcticaProject/nx-libs#808

Attributes GH PR #806: https://github.com/ArcticaProject/nx-libs/pull/806

Fixes ArcticaProject/nx-libs#807.

This file has been deleted, but references to it in the build remain,
causing `debuild` to fail.

Attributes GH PR #797: https://github.com/ArcticaProject/nx-libs/pull/797

nxagent does not react on that anyway (see xkb/xkbDflts.h)

transfer to derived file was incomplete in 6acbfab3

This change was missing in 239fe3d0

upstream xorg is also using that name

Some of those fixes have been part of xorg's INITIAL damage.c from
2004. They where missing in NX nevertheless. The other fixes come from
this commit:

commit fec868bf0f67a8f62fc69d55e2ff72b6cacea6f8
  Author: Roland Mainz <roland.mainz@nrubsig.org>
  Date:   Tue Nov 23 17:10:55 2004 +0000

    //freedesktop.org/bugzilla/show_bug.cgi?id=1204): Fix X11 test suite
        (caused by DAMAGE layer) failure with Xvfb when rendering text using
        |XDrawText*()| (XDrawText() tests 1, 3, 4, 27, 28,
    29, 30, 34, 37, 39, 41, 43 and XDrawText16() tests 1, 3, 9, 10, 11, 12,
    13, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 34,
    37, 39, 41, 43). Patch by Hong Bo Peng <penghb@cn.ibm.com> and Stefan
        Dirsch <sndirsch@suse.de>.

was forgotten during backport (see commit 7401a669)

along with the DDXTIME define that has been dropped in Xorg upstream, too.

  commit 985c34bf06af70a7296db8307899a17347a25558
  Author: Adam Jackson <ajax@theobromine.nwnk.net>
  Date:   Thu Jul 20 17:33:13 2006 -0400

      Remove the DDXTIME conditional, for being unused.

  commit a73e0f8cdfec1c9199ffe696146ba7d677c4c10d
  Author: Daniel Stone <daniel@fooishbar.org>
  Date:   Thu Jun 1 18:47:47 2006 +0000

    Die XTESTEXT1, die!

Citing an email from the xorg-modular mailing list:

On Tuesday 21 February 2006 23:04, Enrico Weigelt wrote:
> Hi folks,
>
> I'm wondering what's the difference between XTEST and XTESTEXT1
> (the second one can be configured w/ my current patch ...)
> Are they both the same ( -> XTest extension ) ?
> Can I put both symbols together ?

They're not the same extension.  XTest is the one you want, if you want
either.  The other hasn't been built by default in ages and I should probably
go ahead and nuke it from the tree.

- ajax

We check that via strlen() while never properly initializing it.

Attributes GH PR #795: https://github.com/ArcticaProject/nx-libs/pull/795

This will help on non-supported platforms as it will add a path the current
code might not be aware of.

drop defines and use an array instead. This way adding further paths
can be done much easier.

Dix will only add font paths that are existing on the system. There's no need
to check that ourselves.

Drop the font path defines and build the path strings at runtime instead.

Has been obsoleted in 2005, see https://en.wikipedia.org/wiki/Bitstream_Speedo_Fonts

Attributes GH PR #804: https://github.com/ArcticaProject/nx-libs/pull/804

also add TEST prints, init nxagentProgName with NULL and add const
where it was missing.

Fixes ArcticaProject/nx-libs#803

Attributes GH PR #794: https://github.com/ArcticaProject/nx-libs/pull/794

Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>