From 34ba4d05d9d2b7f5d72aded4eb35aa617cb8629d Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sun, 29 Aug 2021 18:23:50 +0000
Subject: Sun Aug 29 18:23:50 UTC 2021

ap/man-pages-5.13-noarch-1.txz:  Upgraded.
d/binutils-2.37-x86_64-1.txz:  Upgraded.
  With a few upstream patches to fix some regressions in the release, we no
  longer get any new FTBFS with this, so we'll take it.
d/oprofile-1.4.0-x86_64-8.txz:  Rebuilt.
  Recompiled against binutils-2.37.
kde/sddm-0.19.0-x86_64-8.txz:  Rebuilt.
  Patched to fix build.
l/libcap-2.54-x86_64-1.txz:  Upgraded.
l/libssh-0.9.6-x86_64-1.txz:  Upgraded.
  Fix possible heap-buffer overflow when rekeying with different key exchange
  mechanism.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3634
  (* Security fix *)
l/qt5-5.15.3_20210826_21ea9c12-x86_64-1.txz:  Upgraded.
  Switched to the patched qt5 from https://invent.kde.org/qt/qt/qt5.git.
  Huge thanks to Heinz Wiesinger for the script to create a release tarball.
  Likely this fixes many security issues.
  (* Security fix *)
x/libglvnd-1.3.3-x86_64-1.txz:  Upgraded.
  Reverted to this version because changes to the header files won't allow the
  EGL portions of Qt to properly compile.
---
 source/kde/kde/build/sddm                     |  2 +-
 source/kde/kde/patch/sddm.patch               |  3 +++
 source/kde/kde/patch/sddm/sddm.fix.build.diff | 11 +++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 source/kde/kde/patch/sddm/sddm.fix.build.diff

(limited to 'source/kde/kde')

diff --git a/source/kde/kde/build/sddm b/source/kde/kde/build/sddm
index 7f8f011eb..45a4fb75d 100644
--- a/source/kde/kde/build/sddm
+++ b/source/kde/kde/build/sddm
@@ -1 +1 @@
-7
+8
diff --git a/source/kde/kde/patch/sddm.patch b/source/kde/kde/patch/sddm.patch
index 5c905557a..319bad684 100644
--- a/source/kde/kde/patch/sddm.patch
+++ b/source/kde/kde/patch/sddm.patch
@@ -9,3 +9,6 @@ cat $CWD/patch/sddm/sddm.do.not.source.HOME.xsession.diff | patch -p1 --verbose
 
 # List Wayland sessions after X11 sessions since Wayland is more experimental:
 cat $CWD/patch/sddm/sddm.list.X11.sessions.before.Wayland.Sessions.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Fix build with Qt from git:
+cat $CWD/patch/sddm/sddm.fix.build.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/sddm/sddm.fix.build.diff b/source/kde/kde/patch/sddm/sddm.fix.build.diff
new file mode 100644
index 000000000..b481cfa6a
--- /dev/null
+++ b/source/kde/kde/patch/sddm/sddm.fix.build.diff
@@ -0,0 +1,11 @@
+--- ./src/daemon/XorgDisplayServer.cpp.orig	2020-11-03 03:49:10.000000000 -0600
++++ ./src/daemon/XorgDisplayServer.cpp	2021-08-29 11:36:20.356811948 -0500
+@@ -65,7 +65,7 @@
+         // create a random hexadecimal number
+         const char *digits = "0123456789abcdef";
+         for (int i = 0; i < 32; ++i)
+-            m_cookie[i] = digits[dis(gen)];
++            m_cookie[i] = QLatin1Char(digits[dis(gen)]);
+     }
+ 
+     XorgDisplayServer::~XorgDisplayServer() {
-- 
cgit v1.2.3