Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2018-07-22 23:38:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and      /work/SRC/openSUSE:Factory/.xorg-x11-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xorg-x11-server"

Sun Jul 22 23:38:18 2018 rev:359 rq:624084 version:1.20.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2018-04-22 14:32:05.109370922 +0200
+++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes     
2018-07-22 23:38:24.580193378 +0200
@@ -1,0 +2,80 @@
+Thu Jul 19 14:12:01 CEST 2018 - [email protected]
+
+- u_modesetting-Fix-cirrus-24bpp-breakage.patch
+  * Fix breakage of cirrus 24bpp support on modesetting driver
+    (bsc#1101699)
+
+-------------------------------------------------------------------
+Tue Jul 10 12:03:43 UTC 2018 - [email protected]
+
+- Remove /var/lib/X11 and its symlink, it is no longer needed and
+  doesn't work with transaction-updates (FATE#325524).
+- Move README.compiled to another location and use tmpfiles to
+  copy it at runtime.
+
+-------------------------------------------------------------------
+Mon Jul  2 12:46:54 UTC 2018 - [email protected]
+
+- U_modesetting-use-drmmode_bo_import-for-rotate_fb.patch
+  * fixes rotation in modesetting driver (regression with
+    xorg-server 1.20.0, fdo#106715)
+  * might also fix boo#1099812 ...
+
+-------------------------------------------------------------------
+Tue Jun 26 07:51:15 UTC 2018 - [email protected]
+
+- U_xkb-Fix-heap-overflow-caused-by-optimized-away-min.patch
+  * Fix heap overflow caused by unexpected optimization, which was
+    possible because of relying on undefined behavior.
+    (boo#1099113)
+
+-------------------------------------------------------------------
+Wed Jun 20 15:40:58 UTC 2018 - [email protected]
+
+- U_Xext-shm-Refuse-to-work-for-remote-clients.patch
+  * Avoid access to System V shared memory segment on the X server
+    side for clients forwarded via SSH. Also prevent them from
+    hanging while waiting for the reply from the ShmCreateSegment
+    request. (boo#1097227)
+
+-------------------------------------------------------------------
+Tue May 22 07:47:26 UTC 2018 - [email protected]
+
+- Remove n_add-dummy-xf86DisableRandR.patch
+  * After upgrade to 1.20.0 the API officially no longer includes
+    xf86DisableRandR, so there is no need to add it back.
+
+-------------------------------------------------------------------
+Sat May 12 15:03:54 UTC 2018 - [email protected]
+
+- Update to version 1.20.0:
+  New features:
+  + RANDR 1.6, which enables leasing RANDR resources to a client for its 
+    exclusive use (e.g. head mounted displays)
+  + Depth 30 support in glamor and the modesetting driver
+  + A meson-based build system, parallel to autotools
+  + Pageflipping support for PRIME output sinks
+  + OutputClass device matching for xorg.conf
+  + Input grab and tablet support in Xwayland
+- Remove upstream patches:
+  + u_xorg-x11-server-reproducible.patch
+     Solved slightly different
+  + u_os-inputthread-Force-unlock-when-stopping-thread.patch
+  + u_xfree86-add-default-modes-for-16-9-and-16-10.patch
+  + U_xwayland-Don-t-process-cursor-warping-without-an-xwl.patch
+  + U_xwayland-Give-up-cleanly-on-Wayland-socket-errors.patch
+  + U_xwayland-avoid-race-condition-on-new-keymap.patch
+  + U_xwayland-remove-dirty-window-unconditionally-on-unre.patch
+  + U_0001-animcur-Use-fixed-size-screen-private.patch
+  + U_0002-animcur-Return-the-next-interval-directly-from-the-t.patch
+  + U_0003-animcur-Run-the-timer-from-the-device-not-the-screen.patch
+  + U_0004-animcur-Fix-transitions-between-animated-cursors.patch
+  + U_xfree86-Remove-broken-RANDR-disabling-logic-v4.patch
+- Adapt patches to work with the new release:
+  + N_zap_warning_xserver.diff
+  + N_fix_fglrx_screendepth_issue.patch
+  + n_xserver-optimus-autoconfig-hack.patch
+  + u_Use-better-fallbacks-to-generate-cookies-if-arc4rand.patch
+  + u_xorg-wrapper-build-Build-position-independent-code.patch
+
+-------------------------------------------------------------------

Old:
----
  U_0001-animcur-Use-fixed-size-screen-private.patch
  U_0002-animcur-Return-the-next-interval-directly-from-the-t.patch
  U_0003-animcur-Run-the-timer-from-the-device-not-the-screen.patch
  U_0004-animcur-Fix-transitions-between-animated-cursors.patch
  U_glx-Do-not-call-into-Composite-if-it-is-disabled.patch
  U_xfree86-Remove-broken-RANDR-disabling-logic-v4.patch
  U_xwayland-Don-t-process-cursor-warping-without-an-xwl.patch
  U_xwayland-Give-up-cleanly-on-Wayland-socket-errors.patch
  U_xwayland-avoid-race-condition-on-new-keymap.patch
  U_xwayland-remove-dirty-window-unconditionally-on-unre.patch
  n_add-dummy-xf86DisableRandR.patch
  u_os-inputthread-Force-unlock-when-stopping-thread.patch
  u_xfree86-add-default-modes-for-16-9-and-16-10.patch
  u_xorg-x11-server-reproducible.patch
  xorg-server-1.19.6.tar.bz2

New:
----
  U_Xext-shm-Refuse-to-work-for-remote-clients.patch
  U_modesetting-use-drmmode_bo_import-for-rotate_fb.patch
  U_xkb-Fix-heap-overflow-caused-by-optimized-away-min.patch
  u_modesetting-Fix-cirrus-24bpp-breakage.patch
  xkb-tmpfiles.conf
  xorg-server-1.20.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.4dzrAF/_old  2018-07-22 23:38:26.140192861 +0200
+++ /var/tmp/diff_new_pack.4dzrAF/_new  2018-07-22 23:38:26.140192861 +0200
@@ -46,7 +46,7 @@
 %endif
 
 Name:           xorg-x11-server
-Version:        1.19.6
+Version:        1.20.0
 Release:        0
 Url:            http://xorg.freedesktop.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -62,6 +62,7 @@
 Source4:        xorg-backtrace
 Source5:        50-extensions.conf
 Source6:        modesetting.ids
+Source7:        xkb-tmpfiles.conf
 # RPM Macros to be installed. The ABI Versions will be injected by configure.
 Source90:       xorg-x11-server.macros.in
 # Source91 and Source99 are used to ensure proper ABI provides.
@@ -127,6 +128,7 @@
 BuildRequires:  pkgconfig(xfont2)
 BuildRequires:  pkgconfig(xi) >= 1.2.99.1
 BuildRequires:  pkgconfig(xineramaproto)
+BuildRequires:  pkgconfig(xkbcomp)
 BuildRequires:  pkgconfig(xkbfile)
 BuildRequires:  pkgconfig(xmu)
 BuildRequires:  pkgconfig(xorg-macros)
@@ -198,6 +200,7 @@
 Patch100:       u_01-Improved-ConfineToShape.patch
 Patch101:       
u_02-DIX-ConfineTo-Don-t-bother-about-the-bounding-box-when-grabbing-a-shaped-window.patch
 # PATCH-FIX-UPSTREAM u_x86emu-include-order.patch [email protected] -- Change 
include order to avoid conflict with system header, remove duplicate definitions
+
 Patch104:       u_xorg-server-xdmcp.patch
 Patch112:       
u_render-Cast-color-masks-to-unsigned-long-before-shifting-them.patch
 
@@ -212,13 +215,6 @@
 Patch210:       u_os-connections-Check-for-stale-FDs.patch
 
 Patch215:       u_Use-better-fallbacks-to-generate-cookies-if-arc4rand.patch
-Patch216:       u_os-inputthread-Force-unlock-when-stopping-thread.patch
-Patch217:       u_xfree86-add-default-modes-for-16-9-and-16-10.patch
-
-Patch300:       U_xwayland-Don-t-process-cursor-warping-without-an-xwl.patch
-Patch301:       U_xwayland-Give-up-cleanly-on-Wayland-socket-errors.patch
-Patch302:       U_xwayland-avoid-race-condition-on-new-keymap.patch
-Patch303:       U_xwayland-remove-dirty-window-unconditionally-on-unre.patch
 
 Patch1000:      n_xserver-optimus-autoconfig-hack.patch
 
@@ -226,17 +222,13 @@
 Patch1211:      
b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch
 Patch1222:      b_sync-fix.patch
 
-Patch1301:      U_0001-animcur-Use-fixed-size-screen-private.patch
-Patch1302:      
U_0002-animcur-Return-the-next-interval-directly-from-the-t.patch
-Patch1303:      
U_0003-animcur-Run-the-timer-from-the-device-not-the-screen.patch
-Patch1304:      U_0004-animcur-Fix-transitions-between-animated-cursors.patch
-Patch1305:      u_xorg-x11-server-reproducible.patch
-
-Patch1400:      U_xfree86-Remove-broken-RANDR-disabling-logic-v4.patch
 Patch1401:      u_randr-Do-not-crash-if-slave-screen-does-not-have-pro.patch
-Patch1402:      n_add-dummy-xf86DisableRandR.patch
 
-Patch1500:      U_glx-Do-not-call-into-Composite-if-it-is-disabled.patch
+Patch1500:      U_Xext-shm-Refuse-to-work-for-remote-clients.patch
+Patch1501:      U_xkb-Fix-heap-overflow-caused-by-optimized-away-min.patch
+
+Patch1600:      U_modesetting-use-drmmode_bo_import-for-rotate_fb.patch
+Patch1601:      u_modesetting-Fix-cirrus-24bpp-breakage.patch
 
 %description
 This package contains the X.Org Server.
@@ -347,6 +339,7 @@
 #
 %patch100 -p1
 #%patch101 -p1
+
 %patch104 -p1
 
 %patch112 -p1
@@ -364,8 +357,6 @@
 #%patch210 -p1
 
 %patch215 -p1
-%patch216 -p1
-%patch217 -p1
 
 %patch1000 -p1
 
@@ -376,22 +367,13 @@
 ### patch222 might not be applicable anymore
 #%patch1222 -p1
 
-%patch300 -p1
-%patch301 -p1
-%patch302 -p1
-%patch303 -p1
-
-%patch1301 -p1
-%patch1302 -p1
-%patch1303 -p1
-%patch1304 -p1
-%patch1305 -p1
-
-%patch1400 -p1
 %patch1401 -p1
-%patch1402 -p1
 
 %patch1500 -p1
+%patch1501 -p1
+
+%patch1600 -p1
+%patch1601 -p1
 
 %build
 test -e source-file-list || \
@@ -469,15 +451,18 @@
   xargs rm
 install -m 644 hw/xfree86/parser/{xf86Parser.h,xf86Optrec.h} \
   %{buildroot}%{_includedir}/xorg
+# FATE#325524
+mkdir -p %{buildroot}%{_datadir}/factory/%{_localstatedir}/lib/xkb/compiled
+mv %{buildroot}%{_localstatedir}/lib/xkb/compiled/README.compiled 
%{buildroot}%{_datadir}/factory/%{_localstatedir}/lib/xkb/compiled/
+mkdir -p %{buildroot}%{_tmpfilesdir}
+install -m 644 %{S:7} %{buildroot}%{_tmpfilesdir}/xkb.conf
 # bnc #632737
 chmod u-s %{buildroot}%{_bindir}/Xorg
-mkdir -p %{buildroot}%{_localstatedir}/lib/X11
 %if 0%{?pci_ids_dir:1}
 %__mkdir_p %{buildroot}%{pci_ids_dir}
 install -m 644 %{S:6} %{buildroot}%{pci_ids_dir}
 %endif
-ln -snf ../../../usr/bin/Xorg %{buildroot}%{_localstatedir}/lib/X11/X
-ln -snf ../../var/lib/X11/X %{buildroot}%{_bindir}/X
+ln -snf Xorg %{buildroot}%{_bindir}/X
 %if 0%{?suse_version} > 1120
 # get rid of evdev config file, since it's meanwhile shipped with
 # evdev driver itself (since 2.10.0)
@@ -521,6 +506,7 @@
 xargs cp --parents --target-directory=%{buildroot}/usr/src/xserver < 
source-file-list
 
 %post
+%tmpfiles_create xbb.conf
 %ifnarch s390 s390x
 %{fillup_only -an displaymanager}
 # Move SaX2 generated xorg.conf file to xorg.conf.sle11
@@ -578,12 +564,12 @@
 %dir %{pci_ids_dir}
 %{pci_ids_dir}/modesetting.ids
 %endif
+%{_tmpfilesdir}/xkb.conf
 %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/10-quirks.conf
 %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/50-extensions.conf
 %dir %{_datadir}/X11/xorg.conf.d
 %{_datadir}/X11/xorg.conf.d/10-*.conf
 %endif
-%dir %{_localstatedir}/lib/X11
 %endif
 %dir %{_localstatedir}/lib/xkb
 %dir %{_localstatedir}/lib/xkb/compiled
@@ -593,7 +579,12 @@
 %exclude %{_mandir}/man1/Xdmx.1*
 %exclude %{_mandir}/man1/Xephyr.1*
 %exclude %{_mandir}/man1/Xnest.1*
-%{_localstatedir}/lib/xkb/compiled/README.compiled
+%dir %{_datadir}/factory
+%dir %{_datadir}/factory/var
+%dir %{_datadir}/factory/var/lib
+%dir %{_datadir}/factory/var/lib/xkb
+%dir %{_datadir}/factory/var/lib/xkb/compiled
+%{_datadir}/factory/%{_localstatedir}/lib/xkb/compiled/README.compiled
 %ifnarch s390 s390x
 %{_bindir}/Xorg
 %if 0%{?build_suid_wrapper} == 1
@@ -607,7 +598,6 @@
 %{_mandir}/man4/*
 %{_mandir}/man5/*
 %{_fillupdir}/sysconfig.displaymanager-%{name}
-%{_localstatedir}/lib/X11/X
 %if 0%{?suse_version} >= 1315
 %ghost %{_sysconfdir}/alternatives/libglx.so
 %endif

++++++ N_fix_fglrx_screendepth_issue.patch ++++++
--- /var/tmp/diff_new_pack.4dzrAF/_old  2018-07-22 23:38:26.168192852 +0200
+++ /var/tmp/diff_new_pack.4dzrAF/_new  2018-07-22 23:38:26.168192852 +0200
@@ -23,15 +23,18 @@
  #define BUILTIN_LAYOUT_SECTION_PRE \
        "Section \"ServerLayout\"\n" \
        "\tIdentifier\t\"Builtin Default Layout\"\n"
-@@ -153,7 +160,10 @@ xf86AutoConfig(void)
-     for (p = deviceList; *p; p++) {
-         snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION, *p, 0, *p);
+@@ -187,8 +187,12 @@ xf86AutoConfig(void)
+         snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION,
+                 md.matches[i], 0, md.matches[i]);
          AppendToConfig(buf);
--        snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION, *p, 0, *p, 0);
-+      if( strcmp(*p, "fglrx") == 0 )
-+              snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION_FOR_FGLRX, 
*p, 0, *p, 0);
-+      else
-+              snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION, *p, 0, *p, 
0);
+-        snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION,
+-                md.matches[i], 0, md.matches[i], 0);
++        if (strcmp(md.matches[i], "fglrx") == 0)
++            snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION_FOR_FGLRX,
++                     md.matches[i], 0, md.matches[i], 0);
++         else
++            snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION,
++                     md.matches[i], 0, md.matches[i], 0);
          AppendToConfig(buf);
      }
- 
+

++++++ N_zap_warning_xserver.diff ++++++
--- /var/tmp/diff_new_pack.4dzrAF/_old  2018-07-22 23:38:26.172192850 +0200
+++ /var/tmp/diff_new_pack.4dzrAF/_new  2018-07-22 23:38:26.172192850 +0200
@@ -83,7 +83,7 @@
 +    .ZapWarning = TRUE,
      .dontZoom = FALSE,
      .notrapSignals = FALSE,
-     .caughtSignal = FALSE,
+     .currentScreen = NULL,
 Index: xorg-server-1.12.1/hw/xfree86/common/xf86Privstr.h
 ===================================================================
 --- xorg-server-1.12.1.orig/hw/xfree86/common/xf86Privstr.h
@@ -95,4 +95,4 @@
 +    Bool ZapWarning;
      Bool dontZoom;
      Bool notrapSignals;         /* don't exit cleanly - die at fault */
-     Bool caughtSignal;
+ 

++++++ U_Xext-shm-Refuse-to-work-for-remote-clients.patch ++++++
>From ec7e2b54c5b4a34b2a077082967bc3ead30e227e Mon Sep 17 00:00:00 2001
From: Alexander Volkov <[email protected]>
Date: Tue, 5 Jun 2018 13:05:39 +0300
Subject: [PATCH] Xext/shm: Refuse to work for remote clients

Avoid access to System V shared memory segment on the X server side
for clients forwarded via SSH. Also prevent them from hanging while
waiting for the reply from the ShmCreateSegment request.

v2: Allow ShmQueryVersion request even for remote clients

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=11080
Signed-off-by: Alexander Volkov <[email protected]>
Reviewed-by: Adam Jackson <[email protected]>
---
 Xext/shm.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/Xext/shm.c b/Xext/shm.c
index fc8441c43..896a966e3 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -1302,9 +1302,14 @@ static int
 ProcShmDispatch(ClientPtr client)
 {
     REQUEST(xReq);
-    switch (stuff->data) {
-    case X_ShmQueryVersion:
+
+    if (stuff->data == X_ShmQueryVersion)
         return ProcShmQueryVersion(client);
+
+    if (!client->local)
+        return BadRequest;
+
+    switch (stuff->data) {
     case X_ShmAttach:
         return ProcShmAttach(client);
     case X_ShmDetach:
@@ -1461,9 +1466,14 @@ static int _X_COLD
 SProcShmDispatch(ClientPtr client)
 {
     REQUEST(xReq);
-    switch (stuff->data) {
-    case X_ShmQueryVersion:
+
+    if (stuff->data == X_ShmQueryVersion)
         return SProcShmQueryVersion(client);
+
+    if (!client->local)
+        return BadRequest;
+
+    switch (stuff->data) {
     case X_ShmAttach:
         return SProcShmAttach(client);
     case X_ShmDetach:
-- 
2.16.3

++++++ U_modesetting-use-drmmode_bo_import-for-rotate_fb.patch ++++++
>From a85e94a50c94b07574c8701a3ff3c1243f4257f4 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <[email protected]>
Date: Fri, 15 Jun 2018 08:57:12 +0200
Subject: [PATCH] modesetting: use drmmode_bo_import() for rotate_fb

drmmode_shadow_allocate() still uses drmModeAddFB() which may fail if
the format is not as expected, preventing from using a rotated output.

Change it to use the new function drmmode_bo_import() which takes care
of calling the drmModeAddFB2() API.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106715
Signed-off-by: Olivier Fourdan <[email protected]>
Tested-by: Tomas Pelka <[email protected]>
Reviewed-by: Lyude Paul <[email protected]>
---
 hw/xfree86/drivers/modesetting/drmmode_display.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c 
b/hw/xfree86/drivers/modesetting/drmmode_display.c
index 859a21a9d..ec11b3f56 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -1794,11 +1794,8 @@ drmmode_shadow_allocate(xf86CrtcPtr crtc, int width, int 
height)
         return NULL;
     }
 
-    ret = drmModeAddFB(drmmode->fd, width, height, crtc->scrn->depth,
-                       drmmode->kbpp,
-                       drmmode_bo_get_pitch(&drmmode_crtc->rotate_bo),
-                       drmmode_bo_get_handle(&drmmode_crtc->rotate_bo),
-                       &drmmode_crtc->rotate_fb_id);
+    ret = drmmode_bo_import(drmmode, &drmmode_crtc->rotate_bo,
+                            &drmmode_crtc->rotate_fb_id);
 
     if (ret) {
         ErrorF("failed to add rotate fb\n");
-- 
2.16.3

++++++ U_xkb-Fix-heap-overflow-caused-by-optimized-away-min.patch ++++++
Git-commit: ba1e6eaea84b73e6ccd5f73acb93110eadb1a640
Author: Michal Srb <[email protected]>
Subject: xkb: Fix heap overflow caused by optimized away min.
Patch-mainline: Upstream
References: boo#1099113

Calling strlen on char[4] that does not need to contain '\0' is wrong and X
server may end up running into invalid memory.

In addition GCC 8 is clever enough that it knows that strlen on char[4] can
return 0, 1, 2, 3 or cause undefined behavior. With this knowledge it can
optimize away the min(..., 4). When the undefined behavior happens, any long
value can be passed as size to the memcpy which will overflow the destination
buffer.

Fixes: 83913de25d35 (xkb: Silence some compiler warnings)
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86259
---
 xkb/XKBGAlloc.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index 8958b0c52..f0cda24fe 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -588,8 +588,7 @@ XkbAddGeomKeyAlias(XkbGeometryPtr geom, char *aliasStr, 
char *realStr)
          i++, alias++) {
         if (strncmp(alias->alias, aliasStr, XkbKeyNameLength) == 0) {
             memset(alias->real, 0, XkbKeyNameLength);
-            memcpy(alias->real, realStr,
-                   min(XkbKeyNameLength, strlen(realStr)));
+            memcpy(alias->real, realStr, strnlen(realStr, XkbKeyNameLength));
             return alias;
         }
     }
@@ -599,8 +598,8 @@ XkbAddGeomKeyAlias(XkbGeometryPtr geom, char *aliasStr, 
char *realStr)
     }
     alias = &geom->key_aliases[geom->num_key_aliases];
     memset(alias, 0, sizeof(XkbKeyAliasRec));
-    memcpy(alias->alias, aliasStr, min(XkbKeyNameLength, strlen(aliasStr)));
-    memcpy(alias->real, realStr, min(XkbKeyNameLength, strlen(realStr)));
+    memcpy(alias->alias, aliasStr, strnlen(aliasStr, XkbKeyNameLength));
+    memcpy(alias->real, realStr, strnlen(realStr, XkbKeyNameLength));
     geom->num_key_aliases++;
     return alias;
 }
@@ -815,8 +814,8 @@ XkbAddGeomOverlayKey(XkbOverlayPtr overlay,
         (_XkbAllocOverlayKeys(row, 1) != Success))
         return NULL;
     key = &row->keys[row->num_keys];
-    memcpy(key->under.name, under, min(XkbKeyNameLength, strlen(under)));
-    memcpy(key->over.name, over, min(XkbKeyNameLength, strlen(over)));
+    memcpy(key->under.name, under, strnlen(under, XkbKeyNameLength));
+    memcpy(key->over.name, over, strnlen(over, XkbKeyNameLength));
     row->num_keys++;
     return key;
 }
-- 
2.13.6

++++++ n_xserver-optimus-autoconfig-hack.patch ++++++
--- /var/tmp/diff_new_pack.4dzrAF/_old  2018-07-22 23:38:26.204192840 +0200
+++ /var/tmp/diff_new_pack.4dzrAF/_new  2018-07-22 23:38:26.204192840 +0200
@@ -27,7 +27,7 @@
 --- xorg-server-1.19.6.orig/hw/xfree86/common/xf86Init.c
 +++ xorg-server-1.19.6/hw/xfree86/common/xf86Init.c
 @@ -297,6 +297,16 @@ xf86PrivsElevated(void)
-     return privsElevated;
+     return PrivsElevated();
  }
  
 +extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr 
master);                              
@@ -41,7 +41,7 @@
 +}
 +
  static void
- InstallSignalHandlers(void)
+ TrapSignals(void)
  {
 @@ -872,6 +882,8 @@ InitOutput(ScreenInfo * pScreenInfo, int
      for (i = 0; i < xf86NumGPUScreens; i++)

++++++ u_Use-better-fallbacks-to-generate-cookies-if-arc4rand.patch ++++++
--- /var/tmp/diff_new_pack.4dzrAF/_old  2018-07-22 23:38:26.224192833 +0200
+++ /var/tmp/diff_new_pack.4dzrAF/_new  2018-07-22 23:38:26.224192833 +0200
@@ -85,9 +85,9 @@
  
  struct protocol {
      unsigned short name_length;
-@@ -302,18 +306,142 @@ GenerateAuthorization(unsigned name_leng
-     return -1;
- }
+@@ -304,16 +308,140 @@ GenerateAuthorization(unsigned name_length,
+ 
+ #endif                          /* XCSECURITY */
  
 +#if ! defined(HAVE_ARC4RANDOM_BUF)
 +
@@ -231,5 +231,3 @@
 +    }
 +#endif // HAVE_ARC4RANDOM_BUF
  }
- 
- #endif                          /* XCSECURITY */

++++++ u_modesetting-Fix-cirrus-24bpp-breakage.patch ++++++
From: Takashi Iwai <[email protected]>
Subject: modesetting: Fix cirrus 24bpp breakage
References: bsc#1101699

The recent rewrite of modesetting driver broke the 24bpp support.
As typically found on cirrus KMS, it leads to a blank screen, spewing
the error like:
  failed to add fb -22
  (EE) modeset(0): failed to set mode: Invalid argument

The culript is that the wrong bpp value of the front buffer is passed
to drmModeAddFB().  Fix it by replacing with the back buffer bpp,
drmmode->kbpp.

Signed-off-by: Takashi Iwai <[email protected]>

---
 hw/xfree86/drivers/modesetting/drmmode_display.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -990,7 +990,7 @@ drmmode_bo_import(drmmode_ptr drmmode, d
     }
 #endif
     return drmModeAddFB(drmmode->fd, bo->width, bo->height,
-                        drmmode->scrn->depth, drmmode->scrn->bitsPerPixel,
+                        drmmode->scrn->depth, drmmode->kbpp,
                         drmmode_bo_get_pitch(bo),
                         drmmode_bo_get_handle(bo), fb_id);
 }
++++++ u_xorg-wrapper-build-Build-position-independent-code.patch ++++++
--- /var/tmp/diff_new_pack.4dzrAF/_old  2018-07-22 23:38:26.240192828 +0200
+++ /var/tmp/diff_new_pack.4dzrAF/_new  2018-07-22 23:38:26.244192827 +0200
@@ -15,8 +15,8 @@
 --- a/hw/xfree86/Makefile.am
 +++ b/hw/xfree86/Makefile.am
 @@ -87,6 +87,7 @@ if SUID_WRAPPER
- wrapdir = $(SUID_WRAPPER_DIR)
- wrap_PROGRAMS = Xorg.wrap
+ wrapexecdir = $(SUID_WRAPPER_DIR)
+ wrapexec_PROGRAMS = Xorg.wrap
  Xorg_wrap_SOURCES = xorg-wrapper.c
 +Xorg_wrap_CFLAGS = $(AM_CFLAGS) -pie -fpie
  endif

++++++ xkb-tmpfiles.conf ++++++
C /var/lib/xkb/compiled/README.compiled 0644 - - - 
/usr/share/factory/var/lib/xkb/compiled/README.compiled
++++++ xorg-server-1.19.6.tar.bz2 -> xorg-server-1.20.0.tar.bz2 ++++++
++++ 101096 lines of diff (skipped)

++++++ xorg-server-provides ++++++
--- /var/tmp/diff_new_pack.4dzrAF/_old  2018-07-22 23:38:29.720191675 +0200
+++ /var/tmp/diff_new_pack.4dzrAF/_new  2018-07-22 23:38:29.720191675 +0200
@@ -1,4 +1,4 @@
 Provides: X11_ABI_XINPUT = 24.1
-Provides: X11_ABI_VIDEODRV = 23.0
+Provides: X11_ABI_VIDEODRV = 24.0
 Provides: X11_ABI_ANSIC = 0.4
 Provides: X11_ABI_EXTENSION = 10.0


Reply via email to