- 0016_nx-X11_install-location.debian.patch
  - 9900-dxpc-license-history.full+lite.patch

Backported from Arctica GH 3.6.x branch.

v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)

nx-libs.spec: copy new debian/x2goagent.options file into build environment, analogous to what debian/roll-tarballs.sh does.

Also, force a rebuild due to the changed versioning.

debian/changelog: Add closures for #757, #758, #760. The issue occurred earlier (#410) and was resolved by properly setting up Xinerama symlinks

Backported from Arctica GH 3.6.x branch.

This reverts commit 5a9f8294.

Conflicts (resolved by Mike Gabriel):
	debian/changelog

Should be a weak dependency, but RPM doesn't support that too well yet.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Backported from Arctica GH 3.6.x branch.

v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)

The lastSetTime value which indicates when the configuration within the
server was last changed was not getting set in the appropriate RandR
requests.
Signed-off-by: Keith Packard <keithp@keithp.com>

Backported from Arctica GH 3.6.x branch.

v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)

set but not used variables
shadowing a previous local

A hidden problem was that the VERIFY_RR_* macros define local 'rc'
variables, any other local definitions for those would be shadowed and
generate warnings from gcc. I've renamed the other locals 'ret'
instead of 'rc'.
Signed-off-by: Keith Packard <keithp@keithp.com>

Backported from Arctica GH 3.6.x branch.

v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)

ProcRRGetScreenSizeRange uses REQUEST(xRRGetScreenSizeRangeReq) followed by
REQUEST_SIZE_MATCH(xRRGetScreenInfoReq).  This happens to work out because both
requests have the same size, so this is not a functional change, just a cosmetic
one.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>

Backported from Arctica GH 3.6.x branch.

v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>

Backported from Arctica GH 3.6.x branch.

v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)

Reported by parfait 1.0:

Error: Memory leak (CWE 401)
   Memory leak of pointer 'newModes' allocated with realloc(((char*)modes), ((num_modes + 1) * 8))
        at line 93 of randr/rrmode.c in function 'RRModeCreate'.
          pointer allocated at line 82 with realloc(((char*)modes), ((num_modes + 1) * 8)).
Error: Memory leak (CWE 401)
   Memory leak of pointer 'newModes' allocated with malloc(8)
        at line 93 of randr/rrmode.c in function 'RRModeCreate'.
          pointer allocated at line 84 with malloc(8).
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>

Backported from Arctica GH 3.6.x branch.

v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)

We don't return rates to randr < 1.1 clients, so don't allocate space
for them.  This fixes a FatalError due to not all allocated space being
used.

X.Org bug#21861 <http://bugs.freedesktop.org/show_bug.cgi?id=21861>
Reported-by: Guillaume Quintin <coincoin169g@gmail.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>

Backported from Arctica GH 3.6.x branch.

v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)

Return a error if the screen is configured to an invalid size.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>

Backported from Arctica GH 3.6.x branch.

v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)

All of the crts and outputs were freed, but not the arrays full of
pointers to them.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Backported from Arctica GH 3.6.x branch.

v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)

User mode has no customer when create until assigned
to some output.

Backported from Arctica GH 3.6.x branch.

v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)

https://bugs.freedesktop.org/show_bug.cgi?id=51375
https://bugs.freedesktop.org/attachment.cgi?id=63397Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>

Backported from Arctica GH 3.6.x branch.

v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)

xorg-server does not follow the convention of using 2 dashes.

Note that --help does produce the help output. However, it
produces this additional output after it:

Error: Aborting session with 'Unrecognized option: --help'.
Session: Aborting session at 'Sun Jun 28 01:35:35 2015'.
Session: Session aborted at 'Sun Jun 28 01:35:35 2015'.

It also causes a return code of 1 rather than 0.

Therefore, we should instruct users to call -help instead.

v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)

Affects:
  - 0009_nxagent_add-man-page.full.patch
  - 0009_nxproxy_add-man-page.full+lite.patch
  - 0209_x2goagent_add-man-page.full.patch

Due to C arithmetic conversion rules we must use an unsigned constant
(or a cast) to perform the multiplication using unsigned arithmetic.

Fixes ArcticaProject/nx-libs#55.

Author: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>

v2: backport to nx-libs 3.6.x (Mike Gabriel)
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)

Adds:
  - 0040_nx-X11_Fix-alpha-premultiplication-in-XRenderPa.full.patch

Problem fixed by adding a select() call to implement a timeout,
and retrying writes if needed.

v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)

Adds:
  - 0660_nxcomp_fix-negotiation-in-stage-10-error.full+lite.patch

v3: port to NXxvdisp.c rather than xvdisp.c (Mike DePaulo)
v4: backport v3 to nx-libs 3.5.0.x (Mihai Moldovan)

Changes:
  - 1026-Xv-unvalidated-lengths-in-XVideo-extension-swap.full.patch

v3: port to NXdispatch.c rather than dispatch.c (Mike DePaulo)
v4: backport v3 to nx-libs 3.5.0.x (Mihai Moldovan)

Changes:
  - 1210-CVE-2015-3418-dix-Allow-zero-height-PutImage-re.full.patch

v3: port to NXdispatch.c rather than dispatch.c (Mike DePaulo)
v4: backport v3 to nx-libs 3.5.0.x (Mihai Moldovan)

Changes:
  - 1019-dix-integer-overflow-in-ProcPutImage-CVE-2014-8.full.patch