Tue Oct 29 20:09:01 UTC 201920191029200901

a/aaa_elflibs-15.0-x86_64-14.txz:  Rebuilt.
  Upgraded: libglib-2.0.so.0.6200.2, libgmodule-2.0.so.0.6200.2,
  libgobject-2.0.so.0.6200.2, libgthread-2.0.so.0.6200.2.
  Added: libgomp.so.1.0.0.
a/kernel-firmware-20191029_4065643-noarch-1.txz:  Upgraded.
a/kernel-generic-4.19.81-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.19.81-x86_64-1.txz:  Upgraded.
a/kernel-modules-4.19.81-x86_64-1.txz:  Upgraded.
ap/sudo-1.8.29-x86_64-1.txz:  Upgraded.
d/kernel-headers-4.19.81-x86-1.txz:  Upgraded.
d/python-setuptools-41.6.0-x86_64-1.txz:  Upgraded.
k/kernel-source-4.19.81-noarch-1.txz:  Upgraded.
l/harfbuzz-2.6.3-x86_64-1.txz:  Upgraded.
n/samba-4.11.2-x86_64-1.txz:  Upgraded.
  This update fixes bugs and these security issues:
  Client code can return filenames containing path separators.
  Samba AD DC check password script does not receive the full password.
  User with "get changes" permission can crash AD DC LDAP server via dirsync.
  For more information, see:
    https://www.samba.org/samba/security/CVE-2019-10218.html
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-10218
    https://www.samba.org/samba/security/CVE-2019-14833.html
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-14833
    https://www.samba.org/samba/security/CVE-2019-14847.html
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-14847
  (* Security fix *)
x/libglvnd-1.2.0-x86_64-4.txz:  Rebuilt.
  Applied upstream patches to fix EGL/eglplatform.h.
x/xorg-server-1.20.5-x86_64-3.txz:  Rebuilt.
  #define EGL_NO_X11 to fix glamor build against libglvnd-1.2.0.
x/xorg-server-xephyr-1.20.5-x86_64-3.txz:  Rebuilt.
x/xorg-server-xnest-1.20.5-x86_64-3.txz:  Rebuilt.
x/xorg-server-xvfb-1.20.5-x86_64-3.txz:  Rebuilt.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

3 files changed, 84 insertions, 2 deletions

diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xorg-server
+++ b/source/x/x11/build/xorg-server
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch
index 6099fad0f..b9fb711a0 100644
--- a/source/x/x11/patch/xorg-server.patch
+++ b/source/x/x11/patch/xorg-server.patch
@@ -23,6 +23,7 @@ zcat $CWD/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch.gz | patch -p
 # Added here 2018/7.
 zcat $CWD/patch/xorg-server/0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 
-# Patch to build with libglvnd-1.2.0:
+# Patches to build with libglvnd-1.2.0:
 zcat $CWD/patch/xorg-server/e6ef2b12404dfec7f23592a3524d2a63d9d25802.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 zcat $CWD/patch/xorg-server/c7486613b0dc586f93f6ba293d9b55c69995b05c.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+zcat $CWD/patch/xorg-server/0001-replace-MESA_EGL_NO_X11_HEADERS-hack-with-upstream-E.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xorg-server/0001-replace-MESA_EGL_NO_X11_HEADERS-hack-with-upstream-E.patch b/source/x/x11/patch/xorg-server/0001-replace-MESA_EGL_NO_X11_HEADERS-hack-with-upstream-E.patch
new file mode 100644
index 000000000..952114797
--- /dev/null
+++ b/source/x/x11/patch/xorg-server/0001-replace-MESA_EGL_NO_X11_HEADERS-hack-with-upstream-E.patch
@@ -0,0 +1,81 @@
+From 80d7c1ad75cc4cd3aa844d5ff34fee723966d9fc Mon Sep 17 00:00:00 2001
+From: fafryd <dz1125.bug.tracker@gmail.com>
+Date: Sat, 19 Oct 2019 21:58:09 +0200
+Subject: [PATCH] replace MESA_EGL_NO_X11_HEADERS hack with upstream EGL_NO_X11
+
+---
+ glamor/glamor_egl.h                     | 2 +-
+ glamor/glamor_priv.h                    | 2 +-
+ hw/xwayland/xwayland-glamor-eglstream.c | 2 +-
+ hw/xwayland/xwayland-glamor-gbm.c       | 2 +-
+ hw/xwayland/xwayland-glamor.c           | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/glamor/glamor_egl.h b/glamor/glamor_egl.h
+index 2f7566b24..af1c707d2 100644
+--- a/glamor/glamor_egl.h
++++ b/glamor/glamor_egl.h
+@@ -27,7 +27,7 @@
+ #ifndef GLAMOR_EGL_H
+ #define GLAMOR_EGL_H
+ 
+-#define MESA_EGL_NO_X11_HEADERS
++#define EGL_NO_X11
+ #include <epoxy/gl.h>
+ #include <epoxy/egl.h>
+ #include <glamor_egl_ext.h>
+diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
+index 7d9a7d4fb..bcdaf4040 100644
+--- a/glamor/glamor_priv.h
++++ b/glamor/glamor_priv.h
+@@ -39,7 +39,7 @@
+ 
+ #include <epoxy/gl.h>
+ #ifdef GLAMOR_HAS_GBM
+-#define MESA_EGL_NO_X11_HEADERS
++#define EGL_NO_X11
+ #include <epoxy/egl.h>
+ #endif
+ 
+diff --git a/hw/xwayland/xwayland-glamor-eglstream.c b/hw/xwayland/xwayland-glamor-eglstream.c
+index c62c0d2ac..e665b963e 100644
+--- a/hw/xwayland/xwayland-glamor-eglstream.c
++++ b/hw/xwayland/xwayland-glamor-eglstream.c
+@@ -32,7 +32,7 @@
+ #include "wayland-eglstream-client-protocol.h"
+ #include "wayland-eglstream-controller-client-protocol.h"
+ 
+-#define MESA_EGL_NO_X11_HEADERS
++#define EGL_NO_X11
+ #include <glamor_egl.h>
+ #include <glamor.h>
+ #include <glamor_transform.h>
+diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c
+index 291e060cf..c92d6073f 100644
+--- a/hw/xwayland/xwayland-glamor-gbm.c
++++ b/hw/xwayland/xwayland-glamor-gbm.c
+@@ -35,7 +35,7 @@
+ #include <xf86drm.h>
+ #include <drm_fourcc.h>
+ 
+-#define MESA_EGL_NO_X11_HEADERS
++#define EGL_NO_X11
+ #include <gbm.h>
+ #include <glamor_egl.h>
+ 
+diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
+index 7ea6def61..587ef5ed0 100644
+--- a/hw/xwayland/xwayland-glamor.c
++++ b/hw/xwayland/xwayland-glamor.c
+@@ -25,7 +25,7 @@
+ 
+ #include "xwayland.h"
+ 
+-#define MESA_EGL_NO_X11_HEADERS
++#define EGL_NO_X11
+ #include <glamor_egl.h>
+ 
+ #include <glamor.h>
+-- 
+2.23.0
+