Cherry-picked from branch 3.5.0.x.

Cherry-picked from branch 3.5.0.x.

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.

nxcomp{,ext,shad}: only use the first three numbers in the full version for current_version on OS X. ld(1) on 10.6 fails otherwise.

Cherry-picked from branch 3.5.0.x.

Cherry-picked from branch 3.5.0.x.

Conflicts:
  debian/changelog

nxcomp{,ext,shad}: use the correct library naming scheme on OS X. It differs from other UNIX-based systems.

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.

Ensure that the given strings length in an XkbSetGeometry request remain
within the limits of the size of the request.

v3: backport to nx-libs 3.6.x because this is
the CVE-2015-0255 fix (Mike DePaulo)
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 20079c36cf7d377938ca5478447d8b9045cb7d43)
(cherry picked from commit f160e722672dbb2b5215870b47bcc51461d96ff1)
Signed-off-by: Julien Cristau <jcristau@debian.org>

The XkbSetGeometry request embeds data which needs to be swapped when the
server and the client have different endianess.

_XkbSetGeometry() invokes functions that swap these data directly in the
input buffer.

However, ProcXkbSetGeometry() may call _XkbSetGeometry() more than once
(if there is more than one keyboard), thus causing on swapped clients the
same data to be swapped twice in memory, further causing a server crash
because the strings lengths on the second time are way off bounds.

To allow _XkbSetGeometry() to run reliably more than once with swapped
clients, do not swap the data in the buffer, use variables instead.

v3: backport to nx-libs 3.6.x as a prereq for
the CVE-2015-0255 fix (Mike DePaulo)
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 81c90dc8f0aae3b65730409b1b615b5fa7280ebd)
(cherry picked from commit 29be310c303914090298ddda93a5bd5d00a94945)
Signed-off-by: Julien Cristau <jcristau@debian.org>
index 2405090..7db0959 100644

This patch adds the following three functions:
 bits_to_bytes(bits) - the number of bytes needed to hold 'bits'
 bytes_to_int32(bytes) - the number of 4-byte units to hold 'bytes'
 pad_to_int32(bytes) - the closest multiple of 4 equal to or larger than
                        'bytes'.

All three operations are common in protocol processing and currently the
server has ((foo + 7)/8 + 3)/4 operations all over the place. A common set
of functions reduce the error rate of these (albeit simple) calculations and
improve readability of the code.

The functions do not check for overflow.

v2: backport to nx-libs 3.6.x as a prereq for
the CVE-2015-0255 fix (Mike DePaulo)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

v2: backport to nx-libs 3.6.x as a prereq for
the CVE-2015-0255 fix (Mike DePaulo)

Make nxagent aware of its NX'ish version string (and number).

  This feature copies the way how X.Org version string and number
  are propagated at build time.

  First use case: if people start nxagent, it reports its version number
  on stderr. This is about being human-friendly.

  Second use case: None, so far. But it will now be easy to use
  the NXAGENT_VERSION_STRING in later feature add-ons.