xorg-server: Changes to 'debian-unstable'
ChangeLog | 2626 ++++++++++++++++++++++++++++++++
Xext/xace.c | 15
Xext/xace.h | 3
Xext/xselinux_hooks.c | 8
Xi/exevents.c | 12
configure.ac | 6
debian/changelog | 19
debian/patches/02_kbsd-input-devd.diff | 14
debian/patches/03_static-nettle.diff | 2
debian/patches/series | 2
debian/patches/xext-fix-udeb-build.diff | 37
debian/patches/xorg-wrapper-envp.diff | 24
dev/null |binary
dix/Xserver.d | 5
dix/dispatch.c | 5
dix/dixfonts.c | 21
dix/events.c | 8
dix/getevents.c | 7
dix/main.c | 1
dix/privates.c | 9
dix/protocol.txt | 299 ---
dix/resource.c | 5
exa/exa_render.c | 2
fb/fb.h | 5
fb/fbpict.c | 13
glamor/glamor.c | 27
glamor/glamor_font.c | 37
glamor/glamor_image.c | 4
glamor/glamor_prepare.c | 2
glx/createcontext.c | 15
glx/extension_string.c | 1
glx/extension_string.h | 3
glx/glxcmds.c | 22
glx/glxcontext.h | 5
glx/glxdri2.c | 7
glx/glxdriswrast.c | 44
hw/dmx/config/dmxparse.h | 3
hw/dmx/config/dmxprint.c | 20
hw/dmx/dmx.c | 1
hw/dmx/dmxcb.c | 3
hw/dmx/dmxfont.h | 2
hw/dmx/dmxgc.c | 4
hw/dmx/dmxgc.h | 4
hw/dmx/dmxinit.c | 42
hw/dmx/dmxpict.c | 1
hw/dmx/dmxprop.c | 6
hw/dmx/dmxscrinit.c | 1
hw/dmx/dmxwindow.c | 4
hw/dmx/glxProxy/compsize.h | 7
hw/dmx/glxProxy/g_disptab.h | 21
hw/dmx/glxProxy/glxcmds.c | 7
hw/dmx/glxProxy/glxcmds.h | 6
hw/dmx/glxProxy/glxcmdsswap.c | 4
hw/dmx/glxProxy/glxext.h | 1
hw/dmx/glxProxy/glxscreens.c | 6
hw/dmx/glxProxy/glxscreens.h | 2
hw/dmx/glxProxy/glxserver.h | 8
hw/dmx/glxProxy/glxsingle.c | 6
hw/dmx/glxProxy/glxsingle.h | 4
hw/dmx/glxProxy/glxswap.c | 4
hw/dmx/glxProxy/glxvendor.c | 6
hw/dmx/input/dmxinputinit.c | 10
hw/kdrive/ephyr/hostx.c | 10
hw/xfree86/dri2/dri2ext.c | 14
hw/xfree86/man/Xorg.man | 2
hw/xfree86/modes/xf86EdidModes.c | 2
hw/xfree86/modes/xf86RandR12.c | 13
hw/xfree86/os-support/linux/lnx_init.c | 22
hw/xfree86/os-support/shared/sigio.c | 2
hw/xfree86/os-support/xf86_OSlib.h | 4
hw/xfree86/x86emu/debug.c | 6
hw/xfree86/xorg-wrapper.c | 6
hw/xquartz/GL/indirect.c | 37
hw/xquartz/X11Application.m | 27
hw/xquartz/X11Controller.m | 13
hw/xquartz/bundle/Info.plist.cpp | 13
hw/xquartz/bundle/Makefile.am | 30
hw/xquartz/bundle/mk_bundke.sh | 2
hw/xquartz/darwinEvents.c | 11
hw/xquartz/quartzKeyboard.c | 2
hw/xwayland/xwayland-input.c | 2
hw/xwayland/xwayland-output.c | 2
include/Makefile.am | 1
include/probes.h | 41
man/Xserver.man | 11
mi/miarc.c | 2
mi/mieq.c | 2
mi/miexpose.c | 13
mi/miwideline.c | 2
miext/rootless/rootlessCommon.h | 22
miext/rootless/rootlessGC.c | 2
miext/rootless/rootlessValTree.c | 2
os/connection.c | 12
os/utils.c | 50
os/xdmauth.c | 4
os/xdmcp.c | 33
present/present.c | 16
randr/rrcrtc.c | 67
randr/rrdispatch.c | 4
randr/rrtransform.c | 2
render/picture.c | 13
render/render.c | 15
102 files changed, 3340 insertions(+), 692 deletions(-)
New commits:
commit d31ba8691ede955e4c34a8550fb64e27e5ba7fd4
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Oct 27 13:27:47 2015 +0100
New patch xext-fix-udeb-build.diff to fix build regression in 1.17.3.
diff --git a/debian/changelog b/debian/changelog
index 768267d..cfb841c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xorg-server (2:1.17.3-1) UNRELEASED; urgency=medium
- mi: fix typo in warning about overflowing queue (closes: #726041)
* Refresh 02_kbsd-input-devd.diff and 03_static-nettle.diff.
* Replace xorg-wrapper-envp.diff with a cherry-pick from master.
+ * New patch xext-fix-udeb-build.diff to fix build regression in 1.17.3.
* Add NEWS file for xserver-xorg-core with info about the -legacy split
(closes: #801487).
* Recommend libpam-systemd (closes: #802544, #802618, #802327, #802566,
diff --git a/debian/patches/series b/debian/patches/series
index 2c8af94..ea13f87 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
03_static-nettle.diff
05_Revert-Unload-submodules.diff
#08_xfree86_fix_ia64_inx_outx.diff
+xext-fix-udeb-build.diff
diff --git a/debian/patches/xext-fix-udeb-build.diff b/debian/patches/xext-fix-udeb-build.diff
new file mode 100644
index 0000000..dd41201
--- /dev/null
+++ b/debian/patches/xext-fix-udeb-build.diff
@@ -0,0 +1,37 @@
+From aaa1928f80c6b3cae614182248a41f92f7f865af Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Tue, 27 Oct 2015 13:02:18 +0100
+Subject: [PATCH xserver] Xext: fix build with --disable-xace
+
+Regression from 990cf5b2828f73dc7a07f1e38f608af39acfd81d
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+Cc: Andrew Eikum <aeikum@codeweavers.com>
+Cc: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ Xext/xace.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Xext/xace.h b/Xext/xace.h
+index 3303f76..6a8d0c4 100644
+--- a/Xext/xace.h
++++ b/Xext/xace.h
+@@ -112,6 +112,7 @@ extern _X_EXPORT void XaceCensorImage(ClientPtr client,
+
+ #ifdef __GNUC__
+ #define XaceHook(args...) Success
++#define XaceHookIsSet(args...) 0
+ #define XaceHookDispatch(args...) Success
+ #define XaceHookPropertyAccess(args...) Success
+ #define XaceHookSelectionAccess(args...) Success
+@@ -119,6 +120,7 @@ extern _X_EXPORT void XaceCensorImage(ClientPtr client,
+ #define XaceCensorImage(args...) { ; }
+ #else
+ #define XaceHook(...) Success
++#define XaceHookIsSet(...) 0
+ #define XaceHookDispatch(...) Success
+ #define XaceHookPropertyAccess(...) Success
+ #define XaceHookSelectionAccess(...) Success
+--
+2.6.1
+
commit 8e9611e993ede85b64caad917e6f45f47f5bd138
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Oct 27 12:40:14 2015 +0100
Replace xorg-wrapper-envp.diff with a cherry-pick from master.
diff --git a/debian/changelog b/debian/changelog
index 2e6a954..768267d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xorg-server (2:1.17.3-1) UNRELEASED; urgency=medium
* New upstream release
- mi: fix typo in warning about overflowing queue (closes: #726041)
* Refresh 02_kbsd-input-devd.diff and 03_static-nettle.diff.
+ * Replace xorg-wrapper-envp.diff with a cherry-pick from master.
* Add NEWS file for xserver-xorg-core with info about the -legacy split
(closes: #801487).
* Recommend libpam-systemd (closes: #802544, #802618, #802327, #802566,
diff --git a/debian/patches/series b/debian/patches/series
index 24628e2..2c8af94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
03_static-nettle.diff
05_Revert-Unload-submodules.diff
#08_xfree86_fix_ia64_inx_outx.diff
-xorg-wrapper-envp.diff
diff --git a/debian/patches/xorg-wrapper-envp.diff b/debian/patches/xorg-wrapper-envp.diff
deleted file mode 100644
index 47fa90e..0000000
--- a/debian/patches/xorg-wrapper-envp.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: xorg-server/hw/xfree86/xorg-wrapper.c
-===================================================================
---- xorg-server.orig/hw/xfree86/xorg-wrapper.c
-+++ xorg-server/hw/xfree86/xorg-wrapper.c
-@@ -190,6 +190,7 @@ int main(int argc, char *argv[])
- int total_cards = 0;
- int allowed = CONSOLE_ONLY;
- int needs_root_rights = -1;
-+ char *const envp[1] = { NULL, };
-
- progname = argv[0];
-
-@@ -265,7 +266,10 @@ int main(int argc, char *argv[])
- }
-
- argv[0] = buf;
-- (void) execv(argv[0], argv);
-+ if (getuid() == geteuid())
-+ (void) execv(argv[0], argv);
-+ else
-+ (void) execve(argv[0], argv, envp);
- fprintf(stderr, "%s: Failed to execute %s: %s\n",
- progname, buf, strerror(errno));
- exit(1);
commit d7d1f52592b7a79eccefe653dac70a56f2f7e00c
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Oct 19 15:42:30 2015 +0200
xorg-wrapper: when starting the server as root, reset its environment
When the server is privileged, we shouldn't be passing the user's
environment directly.
Clearing the environment is recommended by the libdbus maintainers, see
https://bugs.freedesktop.org/show_bug.cgi?id=52202
v2: rename envp to empty_envp (Jeremy)
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83849
Signed-off-by: Julien Cristau <jcristau@debian.org>
(cherry picked from commit 1d4aa672424d8b1629fda11400b88607b5066965)
diff --git a/hw/xfree86/xorg-wrapper.c b/hw/xfree86/xorg-wrapper.c
index 7cc79be..4c37cfc 100644
--- a/hw/xfree86/xorg-wrapper.c
+++ b/hw/xfree86/xorg-wrapper.c
@@ -196,6 +196,7 @@ int main(int argc, char *argv[])
int total_cards = 0;
int allowed = CONSOLE_ONLY;
int needs_root_rights = -1;
+ char *const empty_envp[1] = { NULL, };
progname = argv[0];
@@ -273,7 +274,10 @@ int main(int argc, char *argv[])
}
argv[0] = buf;
- (void) execv(argv[0], argv);
+ if (getuid() == geteuid())
+ (void) execv(argv[0], argv);
+ else
+ (void) execve(argv[0], argv, empty_envp);
fprintf(stderr, "%s: Failed to execute %s: %s\n",
progname, buf, strerror(errno));
exit(1);
commit ad24fa6d38ea3b1da2711e9876cc0bb92e1a96ea
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Oct 27 12:38:21 2015 +0100
Refresh 02_kbsd-input-devd.diff and 03_static-nettle.diff.
diff --git a/debian/changelog b/debian/changelog
index 2f17a64..2e6a954 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xorg-server (2:1.17.3-1) UNRELEASED; urgency=medium
[ Julien Cristau ]
* New upstream release
- mi: fix typo in warning about overflowing queue (closes: #726041)
+ * Refresh 02_kbsd-input-devd.diff and 03_static-nettle.diff.
* Add NEWS file for xserver-xorg-core with info about the -legacy split
(closes: #801487).
* Recommend libpam-systemd (closes: #802544, #802618, #802327, #802566,
diff --git a/debian/patches/02_kbsd-input-devd.diff b/debian/patches/02_kbsd-input-devd.diff
index d0de2a5..45e58b5 100644
--- a/debian/patches/02_kbsd-input-devd.diff
+++ b/debian/patches/02_kbsd-input-devd.diff
@@ -466,7 +466,7 @@ Index: xorg-server/configure.ac
===================================================================
--- xorg-server.orig/configure.ac
+++ xorg-server/configure.ac
-@@ -614,6 +614,7 @@ AC_ARG_ENABLE(dpms, AS_HELP_ST
+@@ -603,6 +603,7 @@ AC_ARG_ENABLE(dpms, AS_HELP_ST
AC_ARG_ENABLE(config-udev, AS_HELP_STRING([--enable-config-udev], [Build udev support (default: auto)]), [CONFIG_UDEV=$enableval], [CONFIG_UDEV=auto])
AC_ARG_ENABLE(config-udev-kms, AS_HELP_STRING([--enable-config-udev-kms], [Build udev kms support (default: auto)]), [CONFIG_UDEV_KMS=$enableval], [CONFIG_UDEV_KMS=auto])
AC_ARG_ENABLE(config-hal, AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto])
@@ -474,7 +474,7 @@ Index: xorg-server/configure.ac
AC_ARG_ENABLE(config-wscons, AS_HELP_STRING([--enable-config-wscons], [Build wscons config support (default: auto)]), [CONFIG_WSCONS=$enableval], [CONFIG_WSCONS=auto])
AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes])
AC_ARG_ENABLE(vgahw, AS_HELP_STRING([--enable-vgahw], [Build Xorg with vga access (default: enabled)]), [VGAHW=$enableval], [VGAHW=yes])
-@@ -956,6 +957,21 @@ if test "x$CONFIG_WSCONS" = xyes; then
+@@ -951,6 +952,21 @@ if test "x$CONFIG_WSCONS" = xyes; then
AC_DEFINE(CONFIG_WSCONS, 1, [Use wscons for input auto configuration])
fi
@@ -496,7 +496,7 @@ Index: xorg-server/configure.ac
if test "x$USE_SIGIO_BY_DEFAULT" = xyes; then
USE_SIGIO_BY_DEFAULT_VALUE=TRUE
else
-@@ -2495,7 +2511,7 @@ AC_SUBST([prefix])
+@@ -2511,7 +2527,7 @@ AC_SUBST([prefix])
AC_CONFIG_COMMANDS([sdksyms], [touch hw/xfree86/sdksyms.dep])
@@ -509,7 +509,7 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c
===================================================================
--- xorg-server.orig/hw/xfree86/common/xf86Config.c
+++ xorg-server/hw/xfree86/common/xf86Config.c
-@@ -1391,15 +1391,18 @@ checkCoreInputDevices(serverLayoutPtr se
+@@ -1362,15 +1362,18 @@ checkCoreInputDevices(serverLayoutPtr se
}
if (!xf86Info.forceInputDevices && !(foundPointer && foundKeyboard)) {
@@ -534,8 +534,8 @@ Index: xorg-server/hw/xfree86/common/xf86Globals.c
===================================================================
--- xorg-server.orig/hw/xfree86/common/xf86Globals.c
+++ xorg-server/hw/xfree86/common/xf86Globals.c
-@@ -123,7 +123,8 @@ xf86InfoRec xf86Info = {
- .log = LogNone,
+@@ -122,7 +122,8 @@ xf86InfoRec xf86Info = {
+ .pmFlag = TRUE,
.disableRandR = FALSE,
.randRFrom = X_DEFAULT,
-#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS)
@@ -548,7 +548,7 @@ Index: xorg-server/include/dix-config.h.in
===================================================================
--- xorg-server.orig/include/dix-config.h.in
+++ xorg-server/include/dix-config.h.in
-@@ -429,6 +429,9 @@
+@@ -439,6 +439,9 @@
/* Enable systemd-logind integration */
#undef SYSTEMD_LOGIND 1
diff --git a/debian/patches/03_static-nettle.diff b/debian/patches/03_static-nettle.diff
index 9424870..11a448e 100644
--- a/debian/patches/03_static-nettle.diff
+++ b/debian/patches/03_static-nettle.diff
@@ -6,7 +6,7 @@ Index: xorg-server/configure.ac
===================================================================
--- xorg-server.orig/configure.ac
+++ xorg-server/configure.ac
-@@ -1657,7 +1657,7 @@ fi
+@@ -1660,7 +1660,7 @@ fi
if test "x$with_sha1" = xlibnettle; then
AC_DEFINE([HAVE_SHA1_IN_LIBNETTLE], [1],
[Use libnettle SHA1 functions])
commit 14c8e0e7a70e98efc3d6dd992a64f1473513db07
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Oct 27 12:28:58 2015 +0100
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 3983221..1343abd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,2629 @@
+commit 780022a8a5d6f8abd02f8b568f522ce5aed99839
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Oct 26 13:03:59 2015 -0400
+
+ xserver 1.17.3
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit d9344ef3ea4f3009d61240e0fefcfca40eaa7dca
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Feb 16 09:49:18 2015 +0000
+
+ present: Fix missed notify MSC computation
+
+ Only treat divisor==0 as async to immediately report the actual vblank.
+ If the user species a non-zero divisor, we should compute the missed
+ vblank properly or else we report too early.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Reviewed-by: Mario Kleiner <mario.kleiner.de@gmail.com>
+ (cherry picked from commit 413cb2ff1d754b5f19d77ff19cddf40793989c03)
+
+commit 88f22fc5dac502c7d57d0b53defda75b44dab985
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Wed Oct 21 11:36:06 2015 +0200
+
+ linux: Do not call FatalError from xf86CloseConsole
+
+ FatalError ends up calling xf86CloseConsole itself, so calling FatalError
+ from within xf86CloseConsole is not a good idea.
+
+ Make switch_to log errors using xf86Msg(X_WARNING, ...) and return success
+ (or failure).
+
+ This makes switch_to match the other error checking done in xf86CloseConsole
+ which all logs warnings and continues.
+
+ Add checking of the return value in xf86OpenConsole and call
+ FatalError there when switch_to fails, to preserve the error-handling
+ behavior of xf86OpenConsole.
+
+ BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1269210
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ (cherry picked from commit 2092f12a243b9f7682f542b593b77c96d455ec89)
+
+commit 0ca79007c940b09bd81823fc2e2276f08057247c
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Sep 21 07:16:12 2015 +0100
+
+ fonts: Continue when font calls return Suspended more than once
+
+ Patch 3ab6cd31cbdf8095b2948034fce5fb645422d8da fixed Xinerama
+ interactions with font servers by not putting clients to sleep
+ multiple times. However, it introduced additional changes dealing with
+ libXfont routine returning Suspended more than once for the same
+ request. This additional change was to abandon processing of the
+ current request and free the closure data by jumping to
+ 'xinerama_sleep' in each of the functions.
+
+ Font library functions shouldn't return Suspended more than once,
+ except for ListFontsWithInfo, which produces multiple replies, and
+ thus ends up returning Suspended many times during processing.
+
+ With the jump to xinerama_sleep occurring after the first reply was
+ processed, the closure for the request was freed and future calls into
+ the ListFontsWithInfo callback resulted in dereferencing freed
+ memory.
+
+ This patch removes the added branches, reverting the code to its
+ previous behaviour, which permitted multiple Suspended returns and
+ simply waited for the client to be signaled again so that the callback
+ could continue processing the request.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit f9a04d19aef77bf787b8d322305a6971d24a6ba1)
+
+commit 82000d6d0376bdd5c6bb4e0daefcb85879f7c5c7
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Oct 18 23:12:50 2015 -0700
+
+ glx: Fix header length error checking in __glXDisp_RenderLarge
+
+ glxcmds.c:2206:46: warning: comparison of unsigned expression < 0 is always false [-Wtautological-compare,Semantic Issue]
+ if ((cmdlen = safe_pad(hdr->length)) < 0)
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ (cherry picked from commit e09875701b980b8c4578fb310a922c9934c34eef)
+
+commit 2ae94d6e8978faff330e9433eddf1697ba4693f6
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Oct 14 15:13:42 2015 -0700
+
+ xdmcp: Declare XdmcpFatal _X_NORETURN
+
+ xdmcp.c:1404:1: warning: function 'XdmcpFatal' could be declared with attribute 'noreturn'
+ [-Wmissing-noreturn,Semantic Issue]
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ (cherry picked from commit 9a2a05a9a7ba02921fa29844c4cad41243c41326)
+
+commit a88460ca82c7aed00177a5bb733b98a7f9b45968
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Oct 14 15:13:36 2015 -0700
+
+ xdmauth: Correct miscall of abs() to instrad call labs()
+
+ xdmauth.c:230:13: warning: absolute value function 'abs' given an argument of type 'long' but has parameter of
+ type
+ 'int'
+ which may cause truncation of value [-Wabsolute-value,Semantic Issue]
+ if (abs(now - client->time) > TwentyFiveMinutes) {
+ ^
+ xdmauth.c:230:13: note: use function 'labs' instead [Semantic Issue]
+ if (abs(now - client->time) > TwentyFiveMinutes) {
+ ^~~
+ labs
+ xdmauth.c:302:9: warning: absolute value function 'abs' given an argument of type 'long' but has parameter of type
+ 'int' which
+ may cause truncation of value [-Wabsolute-value,Semantic Issue]
+ if (abs(client->time - now) > TwentyMinutes) {
+ ^
+ xdmauth.c:302:9: note: use function 'labs' instead [Semantic Issue]
+ if (abs(client->time - now) > TwentyMinutes) {
+ ^~~
+ labs
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ (cherry picked from commit 85eb90ea45e89033b97bf71a13c5c70fec8f6871)
+
+commit 0f051cb4c3af6c3b906c2f210e3b6858dd7a5f53
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Oct 14 15:13:35 2015 -0700
+
+ randr: Correct a miscall of abs() to instead call fabs()
+
+ rrtransform.c:124:22: warning: using integer absolute value function 'abs' when
+ argument is of floating point type [-Wabsolute-value,Semantic Issue]
+ if ((v = abs(f_transform->m[j][i])) > max)
+ ^
+ rrtransform.c:124:22: note: use function 'fabs' instead [Semantic Issue]
+ if ((v = abs(f_transform->m[j][i])) > max)
+ ^~~
+ fabs
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ (cherry picked from commit 9f0fcd14b52f8481cbb3b3b9c6e06f64ff003cc8)
+
+commit 8a30fd207cd4f560696ffd4463284ef123970e96
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Oct 14 15:13:34 2015 -0700
+
+ mi: Correct a miscall of abs() to instead call fabs()
+
+ miarc.c:1714:9: warning: using integer absolute value function
+ 'abs' when
+ argument is of floating point type [-Wabsolute-value,Semantic Issue]
+ if (abs(parc->angle2) >= 360.0)
+ ^
+ miarc.c:1714:9: note: use function 'fabs' instead [Semantic Issue]
+ if (abs(parc->angle2) >= 360.0)
+ ^~~
+ fabs
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ (cherry picked from commit 610dd8a58a75bb6a5b7d7abbae476d1cc4be519e)
+
+commit 0c5ef339ae36b530745b883347accf11b21b1fd6
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Dec 14 15:55:22 2011 +0000
+
+ render: Propagate allocation failure from createSourcePicture()
+
+ All the callers were already checking for failure, except that
+ createSourcePicture() itself was failing to check whether it
+ successfully allocated the Picture.
+
+ [ajax: Rebase, fix line wrap of preceding line]
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ (cherry picked from commit 211d4c2d353b5e379716484055a3f58235ea65f4)
+
+commit 025ae119a7561a911533ca69c8232147273af300
+Author: Arcady Goldmints-Orlov <arcadyg@nvidia.com>
+Date: Thu Oct 4 14:22:13 2012 -0700
+
+ Fix alphamap interactions with wfb
+
+ Set a destructor function on pixman images and call fbFinishAccess()
+ from there, rather than directly from free_pixman_pict(). This ensures
+ that fbFinishAccess() gets called even if pixman still has a reference
+ to the image after free_pixman_pict(), as is the case for alphamaps.
+
+ [ajax: Squash an unused variable warning in the non-wfb build]
+
+ Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
+ Signed-off-by: Arcady Goldmints-Orlov <arcadyg@nvidia.com>
+ Reviewed-by: Søren Sandmann <ssp@redhat.com>
+ (cherry picked from commit fbac451724f7e1b8ce6b6e0505cc33ccd41c5158)
+
+commit 62e2aa02efe45198d6b013530d269815ebd4c9ba
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Sep 21 22:36:41 2015 -0700
+
+ dri2: better checks for integer overflow in GetBuffers*
+
+ Check for integer overflow before using stuff->count in a multiplication,
+ to avoid compiler optimizing out due to undefined behaviour, but only
+ after we've checked to make sure stuff->count is in the range of the
+ request we're parsing.
+
+ Reported-by: jes@posteo.de
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ (cherry picked from commit 6ca496b7c3ccfd677c8c1bee88cc509a5e3c9e04)
+
+commit 616239c15d03f5b527288965f7eee0edebdcf20f
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Sep 21 07:16:13 2015 +0100
+
+ Xext/xselinux: Warning fixes
+
+ There's a 'const char *' adventure here that I'm mostly ignoring; some
+ client information gets const poisoned. Worked around by adding a
+ couple of casts. Ick.
+
+ Added an _X_ATTRIBUTE_PRINTF to SELinuxLog.
+
+ Ignore a couple of unused return values.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 9af111fe045d82192bacc722940e1d92a8ba4cbd)
+
+commit 87151fefb06dc96fac79e93a3151300bd8037f3d
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon May 5 11:10:06 2014 -0700
+
+ x86emu: Fix some set-but-not-used warnings.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ (cherry picked from commit e6f8a0340b72113474ccfbf1ea447558b705995a)
+
+commit 20bdec91712957c069c410ed34045f4090821ac7
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Jan 27 09:44:48 2014 +0000
+
+ render: Fix leak of filter params
+
+ ==11097== 2,048 (+1,640) bytes in 32 (+26) blocks are definitely lost in loss record 1,570 of 1,719
+ ==11097== at 0x4C2A2DB: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+ ==11097== by 0x225EF3: SetPicturePictFilter (filter.c:339)
+ ==11097== by 0x22DF4F: ProcRenderSetPictureFilter (render.c:1773)
+ ==11097== by 0x15D25D: Dispatch (dispatch.c:432)
+ ==11097== by 0x14C7B9: main (main.c:298)
+
+ [ajax: Fixed whitespace]
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+ (cherry picked from commit c7f84c880bbbb508016ad80390a11961b1c4214d)
+
+commit 5c0aea5fb3bda98a442b982b4622cc81a700ebd7
+Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Date: Mon Oct 14 17:07:29 2013 +0300
+
+ xfree86: Fix the 1792x1344-75 EST III mode
+
+ The correct refresh rate for this mode is 75, not 85.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
+ (cherry picked from commit 98e170971c6b06d64a5bc7418bf6ae6ae985a3ae)
+
+commit 293d0efe3c742f5010cddf5ad0420d0d1c43959b
+Author: Michal Srb <msrb@suse.com>
+Date: Mon Oct 7 17:57:14 2013 +0300
+
+ randr: Allow RRSelectInput for ProviderChange and ResourceChange events
+
+ [ajax: To be clear, we already have code to emit these events, and it
+ looks like it works, but to get them you'd have had to also ask for one
+ of the other notify types. This makes it possible to listen for e.g.
+ ProviderChange alone.]
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Michal Srb <msrb@suse.com>
+ (cherry picked from commit 91c7acfc3447a0073dd1db260cf05115d94ce7e8)
+
+commit 833e3e84a077766b16b42d2b24931c14cd00bfb9
+Author: Dave Airlie <airlied@redhat.com>
+Date: Thu Oct 20 11:44:28 2011 +0100
+
+ exa: initialise mask_off_x and mask_off_y
+
+ These get used at the end of the function in a calculation,
+ even though the result isn't used its not pretty.
+
+ Pointed out by coverity.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ (cherry picked from commit 4c7cefe24001279a558dd875949d40ede49ef702)
+
+commit 26a5364d507dff012283dc5d6f86b80c5936a807
+Author: Andrea Canciani <ranma42@gmail.com>
+Date: Wed Jul 27 10:52:31 2011 +0200
+
+ render: Allow single-stop gradients
+
+ The Render specification allows single-stop gradients and pixman 0.22
+ (X server requires >= 0.27.2 now) can rasterize them correctly.
+
+ [ajax: update commit message]
+
+ Signed-off-by: Andrea Canciani <ranma42@gmail.com>
+ Reviewed-by: Soren Sandmann <ssp@redhat.com>
+ (cherry picked from commit 7ed0c3912e1cbab960df308b9d4ea618be757fd2)
+
+commit a22b828dad72091210234a9e671c93015c970ac6
+Author: Cyril Brulebois <kibi@debian.org>
+Date: Sun Jun 5 23:32:26 2011 +0200
+
+ man: Fix case for MIT-unspecified.
+
+ include/site.h says that COMPILEDDISPLAYCLASS is MIT-unspecified, rather
+ than MIT-Unspecified. Fix the manpage accordingly.
+
+ Signed-off-by: Cyril Brulebois <kibi@debian.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ (cherry picked from commit 4803f7139131cee7bbf50b32d667d6e60302df09)
+
+commit 92f6b363972c13f564e1f8f555783fe9cb557db5
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Sep 22 19:25:43 2015 -0700
+
+ protocol.txt: Add MIT-SHM 1.2 requests
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ (cherry picked from commit a31bbc450a08622aadafc264b3efe57e465eaecb)
+
+commit 0b2a9db19bad7567ea30341f3432ae384a21c106
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Sep 22 19:25:42 2015 -0700
+
+ protocol.txt: Add DRI3 1.0 requests
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ (cherry picked from commit 424ba5de56e2ddf173bb0d26daa821f12897f18f)
+
+commit d135b4cf6bc427f6f83f57ff70c673b64a6ae6af
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Sep 22 19:25:41 2015 -0700
+
+ protocol.txt: Add Present 1.0 requests
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ (cherry picked from commit 7e6b7c799455fdeac082cf2a064fe1ba432e92ca)
+
+commit 32f3432ea65f2eec01a7eed0e9bf93e1bc082241
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Sep 22 19:25:39 2015 -0700
+
+ protocol.txt: Remove extensions that died before Xorg was born
+
+ Adobe-DPS-Extension, DEC-XTRAP, X3D-PEX, XIE
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ (cherry picked from commit 1ea8fb96bc6a95d98dd67fc9d4c4e4b858383d34)
+
+commit 5c5bc6a9c2050562e9330c0b7b98a5261ee0b113
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Tue Sep 7 15:50:26 2010 +0300
+
+ dix: remove dead extensions to protocol.txt
+
+ lbx and mbe.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ (cherry picked from commit 593270038d8983b99aa0aaa24509da3cb944be5c)
+
+commit a55bfcc0df09920a5e3ec9f923d5168992a63f29
+Author: Robert Hooker <sarvatt@ubuntu.com>
+Date: Fri Dec 3 23:42:27 2010 -0500
+
+ Add new GLX events errors and requests to protocol.txt
+
+ Based off of glproto 1.4.11.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Robert Hooker <robert.hooker@canonical.com>
+ (cherry picked from commit 3cd56dd2cfbfcce6ba68c22450d51139208993ab)
+
+commit 9cb53672b4b4c847544c37888db6e2ae354697a2
+Author: Robert Hooker <sarvatt@ubuntu.com>
+Date: Fri Dec 3 23:39:51 2010 -0500
+
+ Add DRI2 2.2/2.3 events and requests to protocol.txt
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Robert Hooker <robert.hooker@canonical.com>
+ (cherry picked from commit 272ba9f021c6d08ebd6a2d96da3737f5630bcbd5)
+
+commit 8810c46a98a107cf53b30696cfad6e388b73024d
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Sep 21 15:23:23 2015 -0400
+
+ rootless: Fix bogus handling of broken root clip
+
+ gcc quite correctly complains about this:
+
+ In file included from ../../include/scrnintstr.h:51:0,
+ from rootlessValTree.c:98:
+ In function 'RegionUninit.isra.1',
+ inlined from 'RegionEmpty' at ../../include/regionstr.h:194:5,
+ inlined from 'RootlessMiValidateTree' at rootlessValTree.c:490:9:
+ ../../include/regionstr.h:166:9: warning: attempt to free a non-heap object 'RegionBrokenData' [-Wfree-nonheap-object]
+ free((_pReg)->data);
+
+ So that'd crash if you ever got there. RegionNull will do almost the
+ same thing only without the free(), so let's do that instead; it might
+ still not be an entirely sane way to recover, but it at least won't
+ crash.
+
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit fa0bb01899d586e02cf51892c17edd22e462a46c)
+
+commit 9a4ea1f5ea7f813d28cf322aca6f2ea8c427bd1a
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Sep 21 07:16:17 2015 +0100
+
+ os/xdmcp: Just send XDMCP keepalive packets once every three minutes
+
+ There was a complicated scheme to increase the time between keepalives
+ from 3 minutes up to as much as 24 hours in an attempt to reduce
+ network traffic from idle X terminals. X terminals receiving X
+ traffic, or receiving user input would use the 3 minute value; X
+ terminals without any network traffic would use a longer value.
+
+ However, this was actually broken -- any activity in the X server,
+ either client requests or user input, would end up resetting the
+ keepalive timeout, so a user mashing on the keyboard would never
+ discover that the XDMCP master had disappeared and have the session
+ terminated, which was precisely the design goal of the XDMCP keepalive
+ mechanism.
+
+ Instead of attempting to fix this, accept the cost of a pair of XDMCP
+ packets once every three minutes and just perform keepalives
+ regularly.
+
+ This will also make reworking the block and wakeup handler APIs to
+ eliminate select masks easier.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit db1089eafc1c5371fa0030202de588d2e2b4f8e5)
+
+commit abe44851018d0e5bace2971682e724aa7444e96f
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Sep 21 07:16:16 2015 +0100
+
+ os/xdmcp: Remove dead 'restart' code
+
+ The X server used to wait for the user to hit a key or move the mouse
+ before restarting the session after a keepalive failure. This,
+ presumably, was to avoid having the X server continuously spew XDMCP
+ protocol on the network while the XDM server was dead.
+
+ Switching into this state was removed from the server some time before
+ XFree86 4.3.99.16, so the remaining bits of code have been dead for
+ over a decade, and no-one ever noticed.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit a3a40291330bad10401fe2bcdbc097ce742b026a)
+
+commit c72d4f00277c977faecd697ef3407518f11f909d
+Author: Egbert Eich <eich@freedesktop.org>
+Date: Tue Mar 31 09:06:46 2015 +0200
+
+ randr: Remove senseless checks for xf86RandR12Key
+
+ When xf86RandR12Key is not set we will not get to the places where
+ these tests are done as the functions in question are not called.
+ In most cases we would have crashed before these checks anyway.
+
+ Signed-off-by: Egbert Eich <eich@freedesktop.org>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 3cd7d33380953f2a315dd79ab74d7340c83fd80a)
+
+commit 7a53179425ab5112adcace1489cad6e8072af6b1
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Oct 6 10:02:22 2014 +0100
+
+ randr/prime: Don't stop on the first pipe when disabling ReplaceScanoutPixmap
+
+ As we define sizeFits based on whether a CRTC is active, and skip trying
+ to redirect the scanout on a disable pipe, we then attempt to undo it
+ later and fail because crtc->scanout_pixmap != DRI2_Pixmap and
+ !sizeFits. Paper over this failure by skipping unredirected CRTC when
+ disabling.
+
+ v2: Unwind upon failure
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84653
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Cc: Dave Airlie <airlied@redhat.com>
+ Reported-by: Christoph Haag <haagch@frickel.club>
+ Tested-by: Christoph Haag <haagch@frickel.club>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+ (cherry picked from commit 245040f0d0b937efe14d947468a641a95398776a)
+
+commit a85808ce3fc26511996d01e7e6ec1192b8c3d216
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Sep 18 08:44:07 2015 -0700
+
+ Remove DECnet from Xserver.man
+
+ DECnet support died in modularization (X11R7.0)
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ (cherry picked from commit 9d65a0de95a20632f2a6a04ba596dcdd76d9f5e2)
+
+commit 49d04a43360267fb7cbbeec0ea4985ba224fb59c
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Thu Sep 17 16:04:33 2015 -0700
+
+ privates: Clear screen-specific keys during CloseScreen
+
+ The modesetting driver corrupts memory when used after a server regeneration
+ because not enough memory is allocated for its pixmap privates. This happens
+ because its call to dixRegisterScreenSpecificPrivateKey() does nothing because
+ key->initialized is still TRUE from the first server generation. However, the
+ key is not in the screen's linked list of screen-specific privates because
+ that's freed and reallocated during the server generation loop in dix_main().
+
+ Fix this by clearing key->initialized before CloseScreen and add a call to
+ dixFreeScreenSpecificPrivates() for GPU screens.
+
+ v2: Just set key->initialized to FALSE and move dixFreeScreenSpecificPrivates()
+ calls to after CloseScreen.
+
+ v3: Move dixFreeScreenSpecificPrivates() calls back to just before CloseScreen.
+
+ Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 82eb490b0a341729f25d0c42a937fe29d99da521)
+
+commit daf15b551631e8a98960e629039bef1880de8f82
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Jun 10 13:20:59 2015 -0400
+
+ render: Simplify SProcRenderScale
+
+ Since ProcRenderScale throws BadImplementation anyway it's pointless to
+ waste time carefully swapping the request.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ (cherry picked from commit 67dd34fa734085ed67ba7790820fe4743d48b60f)
+
+commit 10a944889228acdeaf471766407fc84c8947e931
+Author: Ian Scott <ian.scott@arteris.com>
+Date: Thu May 21 16:13:12 2015 -0700
+
+ Xephyr: Paint with subimage for non-Glamor & non-XSHM case
+
+ This improves the case for when we paint an area without SHM.
+ xcb_image_subimage() is used to create a subimage for the damaged area, which
+ is converted to native format if necessary.
+
+ Signed-off-by: Ian Scott <ian.scott@arteris.com>
+ Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
+ (cherry picked from commit a579e6ba7763749d51d16e3a54941e06939df07a)
+
+commit 0134dc1b56e8c7c19f655e583ff3f3ba0d6cae4e
+Author: Daniel Drake <drake@endlessm.com>
+Date: Wed May 20 13:16:12 2015 -0600
+
+ Keep SIGALRM restart flag after Popen
+
+ Commit 94ab7455 added SA_RESTART to the SIGALRM handler. However, the
+ Popen code tears down and recreates the SIGALRM handler via OsSignal(),
+ and this flag is dropped at this time.
+
+ Clean the code to use just a single codepath for creating this signal
+ handler, always applying SA_RESTART.
+
+ [ajax: Fixed commit id]
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Daniel Drake <drake@endlessm.com>
+ (cherry picked from commit 1f915e8b524dd02011158aa038935970684c7630)
+
+commit f92c0b9f94deaa03f792c3c93efd802fec268e8f
+Author: Daniel Drake <drake@endlessm.com>
+Date: Tue May 12 16:39:22 2015 -0600
+
+ Allow system call restarts upon signal interruption
+
+ The X server frequently deals with SIGIO and SIGALRM interruptions.
+ If process execution is inside certain blocking system calls
+ when these signals arrive, e.g. with the kernel blocked on
+ a contended semaphore, the system calls will be interrupted.
Reply to: