Backport from X.org:

 commit 724dbc2f8bbe2f21bf16f20ca7b8bb555516626c
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Tue May 2 01:30:37 2006 +0000

    Use min() [defined in include/misc.h] instead of MIN() [not defined in any
        Xorg header].
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

Backported from X.org:

  commit 491cf02e191e70c5ce24c19da880bb79bebfc03c
  Author: Jon TURNEY <jon.turney@dronecode.org.uk>
  Date:   Tue Feb 10 2015 14:37:26 +0000

    [PATCH] os: XDMCP options like -query etc. should imply -listen tcp

    In X server 1.17, the default configuration is now -nolisten tcp.  In this
    configuration, XDMCP options don't work usefully, as the X server is not
    listening on the port for the display that it tells the display manager to
    connect to.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>

Backported-to-NX-by: Mihai Moldovan <ionic@ionic.de

misc: fix more regressions and whitespace weirdness introduced in 913fcf1a.

 Remove one over-zealous free() call. Thanks to Ulrich Sibiller for
 spotting this.

Fixes ArcticaProject/nx-libs#704

Backport from kbproto:

  commit 2306fcd4c511d41ae4b31b9cbd9f79cf69287730
  Author: Dirk Wallenstein <halsmit@t-online.de>
  Date:   Fri Feb 5 20:42:43 2010 +0100

      Use the correct value for XkbAllAccessXEventsMask
Signed-off-by: Dirk Wallenstein <halsmit@t-online.de>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>

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

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

Fixes: ArcticaProject/nx-libs#708

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

 commit 1ef60ce8ebb681b3cfb5e515be5c187c0442dcda
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Sat Mar 25 22:35:48 2006 +0000

    Really remove all DDX pre-config code.

 commit ec10f70b2114e5369a5b2f34b084dcf55634dcb4
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Sat Mar 25 21:52:49 2006 +0000

    Remove XkbCF DDX configuration code.
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 Spotted in and backported from X.org:

 commit 021fc5cb2cb4a7972b4a6fcb570c1da92787d68d
 Author: Adam Jackson <ajax@benzedrine.nwnk.net>
 Date:   Sun Mar 18 16:31:19 2007 -0400

    Static markup and dead code cull over xkb/.

    The former <X11/extensions/XKBsrv.h> has been pulled into the server now as
    include/xkbsrv.h, and the world updated to look for it in the new place,
    since it made no sense to define server API in an extension header.  Any
    further work along this line will need to do similar things with XKBgeom.h
    and friends.
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 Backported from X.org:

 commit fd8bde8bb0f9d796b3464973b53285c0a6d22a31
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Mon May 29 11:14:03 2006 +0000

    Remove -xkbmap argument.
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 * Support for XkbCF has been dropped in XKB extension by X.org
 * Has never been used in recent NXv3 implementations (e.g. X2Go)
 * Config file parsing is error prone, use setxkbmap API instead

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

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

    ... to keep dix/dixfonts and hw/nxagnet/NXdixfonts.c in sync.

so let's remove some superflous tests

so let's remove some superflous tests

Just to be sure. It is used at lots of locations afterwards.

and do it identically everywhere. As we are using C99 designated
initializers here we remove the memset and bzero calls that had been
used for this at some locations.

... by implementing some kind of recalloc (mix of realloc and calloc).

Fixes this valgrind finding:

==7061== Syscall param writev(vector[...]) points to uninitialised byte(s)
==7061==    at 0x781EFE0: __writev_nocancel (syscall-template.S:84)
==7061==    by 0x488974: _XSERVTransSocketWritev (Xtranssock.c:2914)
==7061==    by 0x47DBD3: FlushClient (io.c:1080)
==7061==    by 0x47DBD3: FlushAllOutput.part.0 (io.c:817)
==7061==    by 0x477304: WaitForSomething (WaitFor.c:246)
==7061==    by 0x434369: Dispatch (NXdispatch.c:360)
==7061==    by 0x40EB92: main (main.c:353)
==7061==  Address 0x102106f3 is 50,211 bytes inside a block of size 54,308 alloc'd
==7061==    at 0x4C2FD5F: realloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==7061==    by 0x47F08F: FlushClient (io.c:1123)
==7061==    by 0x47F307: WriteToClient (io.c:991)
==7061==    by 0x42903C: doListFontsAndAliases (NXdixfonts.c:660)
==7061==    by 0x42B7D6: ListFonts (NXdixfonts.c:735)
==7061==    by 0x433A6D: ProcListFonts (NXdispatch.c:989)
==7061==    by 0x4344A5: Dispatch (NXdispatch.c:482)
==7061==    by 0x40EB92: main (main.c:353)
==7061==  Uninitialised value was created by a heap allocation
==7061==    at 0x4C2FD5F: realloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==7061==    by 0x47F08F: FlushClient (io.c:1123)
==7061==    by 0x47F307: WriteToClient (io.c:991)
==7061==    by 0x42903C: doListFontsAndAliases (NXdixfonts.c:660)
==7061==    by 0x42B7D6: ListFonts (NXdixfonts.c:735)
==7061==    by 0x433A6D: ProcListFonts (NXdispatch.c:989)
==7061==    by 0x4344A5: Dispatch (NXdispatch.c:482)
==7061==    by 0x40EB92: main (main.c:353)
==7061==

Backport of this xorg upstream commit (with omitting the mentioned
d792ac125a0462a04a930af543cbc732f8cdab7d).

  commit 34cf559bcf99dad550527b5ff53f247f0e8e73ee
  Author: Keith Packard <keithp@keithp.com>
  Date:   Tue Jul 10 15:58:48 2012 -0700

    ProcGetPointerMapping uses rep.nElts before it is initialized

    In:

            commit d792ac125a0462a04a930af543cbc732f8cdab7d
            Author: Alan Coopersmith <alan.coopersmith@oracle.com>
            Date:   Mon Jul 9 19:12:43 2012 -0700

                Use C99 designated initializers in dix Replies

    the initializer for the .length element of the xGetPointerMappingReply
    structure uses the value of rep.nElts, but that won't be set until
    after this initializer runs, so we get garbage in the length element
    and clients using it will generally wedge.

    Easy to verify:

            $ xmodmap -pp

    Fixed by creating a local nElts variable and using that.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>

Some of them have not been seen in the wild yet.

Partly fixes ArcticaProject/nx-libs#711

as in xorg-xserver upstream's hw/xnest/Keyboard.c

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

 Reviewed by Ulrich Sibiller <uli42@gmx.de> -- Tue,  3 Jul 2018 15:24:31 +0200 (CEST)

 Backported from X.org's Xserver:

    commit c1d901d723c3bee523736eacc15b44a7dff484fe
    Author: Richard Hughes <richard@hughsie.com>
    Date:   Fri Aug 14 11:44:35 2009 +0100

        Don't reset the lastDeviceEventTime when doing DPMS actions

        When we change the DPMS mode, don't play games with the last event time as
        this breaks applications using IDLETIME to turn the backlight off after a
        preset time.

        This patch fixes gnome-power-manager and xfce-power-manager
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Backport-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 Backported from X.org's Xserver:

    commit 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066
    Author: Richard Hughes <richard@hughsie.com>
    Date:   Mon Aug 17 09:15:32 2009 +0100

        Do not reset lastDeviceEventTime when we do dixSaveScreens

        When we turn off DPMS with DPMSModeOff and do dixSaveScreens, don't reset the
        event time else session clients using IDLETIME will be reset.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 This resolves issues with non-starting mate-screensaver which
 relies on the IDLETIME API these days.

 This commit backports the following X.org Xserver commits:

    commit a2e67a6412386782cb8b644b86a5744591397d45
    Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
    Date:   Mon Dec 6 11:24:01 2010 +1100

        IDLETIME: Fix edge-case in IdleTimeBlockHandler

        Ensure that if we're called exactly on the threshold of a
        NegativeTransition trigger that we reshedule to pick up
        an idle time over the threshold.
Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>

    commit 1f4fb0225b278d1cf4145aebeb0bdd23dc8f62d5
    Author: Adam Jackson <ajax@redhat.com>
    Date:   Wed Dec 10 16:13:20 2008 -0500

        xsync: Fix wakeup storm in idletime counter.

        Wakeup scheduling only considered the threshold values, and not whether
        the trigger was edge or level.

        See also:
        https://bugzilla.redhat.com/show_bug.cgi?id=474586
        http://svn.gnome.org/viewvc/gnome-screensaver/trunk/src/test-idle-ext.c?view=markup

    commit 0f9e89b4e309e570d7d366489d250ca2143f0ad7
    Author: Fredrik Höglund <fredrik@kde.org>
    Date:   Tue Aug 14 22:47:49 2007 +0200

        Fix the value comparisons in the IDLETIME wakeup handler.

        LessThan/GreaterThan comparisons were used in the wakeup handler,
        and LessOrEqual/GreaterOrEqual in the block handler.

        Change it to use LessOrEqual/GreaterOrEqual in both functions,
        since this is what XSyncNegativeComparison and
        XSyncPositiveComparison imply.

    commit 7e2c935920cafadbd87c351f1a3239932864fb90
    Author: Fredrik Höglund <fredrik@kde.org>
    Date:   Fri May 18 20:06:14 2007 +0200

        Add a new IDLETIME system sync counter.

        This counter exposes the time in milliseconds since the last
        input event. Clients such as screen savers and power managers
        can set an alarm on this counter to find out when the idle time
        reaches a certain value, without having to poll the server.
Backport-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

What actually happened was that MFLAGS were passed-through more
correctly, which forced make into jobserver mode (due to the inclusion
of --jobserver-fds=... in %{_smp_mflags}), but the processes were not
able to read from their FD's, so it defaulted to non-parallel builds
instead.

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