Sun Jul 16 20:35:56 UTC 202320230716203556

Hey folks! It's time to acknowledge another one of those milestones... 30 (!)
years since I made the post linked below announcing Slackware's first stable
release after months of beta testing. Thanks to all of our dedicated
contributors, loyal users, and those who have helped us to keep the lights on
here. It's really been a remarkable journey that I couldn't have anticipated
starting out back in 1993. Cheers! :-)
  https://www.slackware.com/announce/1.0.php
kde/sddm-0.20.0-x86_64-1.txz:  Upgraded.
l/imagemagick-7.1.1_13-x86_64-1.txz:  Upgraded.
n/nghttp2-1.55.1-x86_64-1.txz:  Upgraded.
xap/xlockmore-5.72-x86_64-1.txz:  Upgraded.

5 files changed, 24 insertions, 296 deletions

diff --git a/source/kde/kde/patch/sddm.patch b/source/kde/kde/patch/sddm.patch
index 319bad684..a84399001 100644
--- a/source/kde/kde/patch/sddm.patch
+++ b/source/kde/kde/patch/sddm.patch
@@ -1,7 +1,3 @@
-# Properly honor supplemental groups, https://github.com/sddm/sddm/issues/1159 :
-cat $CWD/patch/sddm/sddm_revert-honor-PAM-supplemental-groups.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-cat $CWD/patch/sddm/sddm_honor-PAM-supplemental-groups-v2.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
 # Don't source $HOME/.xession in SDDM's Xsession script. It may cause the
 # wrong session type to launch, or run a second copy of dbus-run-session which
 # will break logout:
@@ -9,6 +5,3 @@ 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
deleted file mode 100644
index b481cfa6a..000000000
--- a/source/kde/kde/patch/sddm/sddm.fix.build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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() {
diff --git a/source/kde/kde/patch/sddm/sddm.list.X11.sessions.before.Wayland.Sessions.diff b/source/kde/kde/patch/sddm/sddm.list.X11.sessions.before.Wayland.Sessions.diff
index 78a6c966b..23577f97b 100644
--- a/source/kde/kde/patch/sddm/sddm.list.X11.sessions.before.Wayland.Sessions.diff
+++ b/source/kde/kde/patch/sddm/sddm.list.X11.sessions.before.Wayland.Sessions.diff
@@ -1,12 +1,29 @@
---- ./src/greeter/SessionModel.cpp.orig	2020-11-03 01:41:06.000000000 -0600
-+++ ./src/greeter/SessionModel.cpp	2021-04-26 12:54:48.558769977 -0500
-@@ -41,8 +41,8 @@
-     SessionModel::SessionModel(QObject *parent) : QAbstractListModel(parent), d(new SessionModelPrivate()) {
+--- ./src/greeter/SessionModel.cpp.orig	2023-06-23 07:28:38.000000000 -0500
++++ ./src/greeter/SessionModel.cpp	2023-07-16 14:56:32.741943650 -0500
+@@ -46,9 +46,9 @@
+ 
          // initial population
          beginResetModel();
--        populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get());
-         populate(Session::X11Session, mainConfig.X11.SessionDir.get());
-+        populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get());
++        populate(Session::X11Session, mainConfig.X11.SessionDir.get());
+         if (dri_active)
+             populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get());
+-        populate(Session::X11Session, mainConfig.X11.SessionDir.get());
          endResetModel();
  
          // refresh everytime a file is changed, added or removed
+@@ -59,13 +59,13 @@
+             beginResetModel();
+             d->sessions.clear();
+             d->displayNames.clear();
++            populate(Session::X11Session, mainConfig.X11.SessionDir.get());
+             if (dri_active)
+                 populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get());
+-            populate(Session::X11Session, mainConfig.X11.SessionDir.get());
+             endResetModel();
+         });
+-        watcher->addPaths(mainConfig.Wayland.SessionDir.get());
+         watcher->addPaths(mainConfig.X11.SessionDir.get());
++        watcher->addPaths(mainConfig.Wayland.SessionDir.get());
+     }
+ 
+     SessionModel::~SessionModel() {
diff --git a/source/kde/kde/patch/sddm/sddm_honor-PAM-supplemental-groups-v2.patch b/source/kde/kde/patch/sddm/sddm_honor-PAM-supplemental-groups-v2.patch
deleted file mode 100644
index bf3bfd255..000000000
--- a/source/kde/kde/patch/sddm/sddm_honor-PAM-supplemental-groups-v2.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From 75e6e00d9e1ecf25e3a9c8332530a1e40d737cdb Mon Sep 17 00:00:00 2001
-From: "J. Konrad Tegtmeier-Rottach" <jktr@0x16.de>
-Date: Thu, 9 May 2019 03:06:48 +0200
-Subject: [PATCH] Honor PAM's supplemental groups (v2) (#834, #1159)
-
-This moves the supplemental group initialization step from
-UserSession.cpp to the Backend system, so that the Pam Backend can
-inject additional supplemental groups via modules like pam_group.so.
-
-pam_setcred(3) assumes that it operates on an already initialized
-supplemental group list. However, PamBackend calls
-pam_setcred(PAM_ESTABLISH_CRED) earlier, at the start
-PamBackend::openSession, so a pam_setcred(PAM_REINITIALIZE_CRED) call
-must be issued to repeat the injection of PAM's supplemental groups.
----
- src/helper/Backend.cpp            |  5 +++++
- src/helper/Backend.h              |  3 +++
- src/helper/HelperApp.cpp          |  4 ++++
- src/helper/HelperApp.h            |  1 +
- src/helper/UserSession.cpp        | 13 ++++++++-----
- src/helper/backend/PamBackend.cpp | 18 ++++++++++++++++++
- src/helper/backend/PamBackend.h   |  2 ++
- 7 files changed, 41 insertions(+), 5 deletions(-)
-
-diff --git a/src/helper/Backend.cpp b/src/helper/Backend.cpp
-index d6bb4d0a..35ae2bdf 100644
---- a/src/helper/Backend.cpp
-+++ b/src/helper/Backend.cpp
-@@ -29,6 +29,7 @@
- #include <QtCore/QProcessEnvironment>
- 
- #include <pwd.h>
-+#include <grp.h>
- 
- namespace SDDM {
-     Backend::Backend(HelperApp* parent)
-@@ -79,4 +80,8 @@ namespace SDDM {
-     bool Backend::closeSession() {
-         return true;
-     }
-+
-+    bool Backend::setupSupplementalGroups(struct passwd *pw) {
-+        return !initgroups(pw->pw_name, pw->pw_gid);
-+    }
- }
-diff --git a/src/helper/Backend.h b/src/helper/Backend.h
-index b790e001..3caf1592 100644
---- a/src/helper/Backend.h
-+++ b/src/helper/Backend.h
-@@ -22,6 +22,7 @@
- #define BACKEND_H
- 
- #include <QtCore/QObject>
-+#include <pwd.h>
- 
- namespace SDDM {
-     class HelperApp;
-@@ -38,6 +39,8 @@ namespace SDDM {
-         void setAutologin(bool on = true);
-         void setGreeter(bool on = true);
- 
-+        virtual bool setupSupplementalGroups(struct passwd *pw);
-+
-     public slots:
-         virtual bool start(const QString &user = QString()) = 0;
-         virtual bool authenticate() = 0;
-diff --git a/src/helper/HelperApp.cpp b/src/helper/HelperApp.cpp
-index cad93bd8..d0891d75 100644
---- a/src/helper/HelperApp.cpp
-+++ b/src/helper/HelperApp.cpp
-@@ -253,6 +253,10 @@ namespace SDDM {
-         return m_session;
-     }
- 
-+    Backend *HelperApp::backend() {
-+        return m_backend;
-+    }
-+
-     const QString& HelperApp::user() const {
-         return m_user;
-     }
-diff --git a/src/helper/HelperApp.h b/src/helper/HelperApp.h
-index 3742df12..cb5959a7 100644
---- a/src/helper/HelperApp.h
-+++ b/src/helper/HelperApp.h
-@@ -39,6 +39,7 @@ namespace SDDM {
-         virtual ~HelperApp();
- 
-         UserSession *session();
-+        Backend *backend();
-         const QString &user() const;
-         const QString &cookie() const;
- 
-diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp
-index f71fd358..62fd4d70 100644
---- a/src/helper/UserSession.cpp
-+++ b/src/helper/UserSession.cpp
-@@ -19,6 +19,7 @@
-  *
-  */
- 
-+#include "Backend.h"
- #include "Configuration.h"
- #include "UserSession.h"
- #include "HelperApp.h"
-@@ -129,7 +130,8 @@ namespace SDDM {
- #endif
- 
-         // switch user
--        const QByteArray username = qobject_cast<HelperApp*>(parent())->user().toLocal8Bit();
-+        HelperApp* app = qobject_cast<HelperApp*>(parent());
-+        const QByteArray username = app->user().toLocal8Bit();
-         struct passwd pw;
-         struct passwd *rpw;
-         long bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
-@@ -146,12 +148,13 @@ namespace SDDM {
-                 qCritical() << "getpwnam_r(" << username << ") failed with error: " << strerror(err);
-             exit(Auth::HELPER_OTHER_ERROR);
-         }
--        if (setgid(pw.pw_gid) != 0) {
--            qCritical() << "setgid(" << pw.pw_gid << ") failed for user: " << username;
-+
-+        if (!app->backend()->setupSupplementalGroups(&pw)) {
-+            qCritical() << "failed to set up supplemental groups for user: " << username;
-             exit(Auth::HELPER_OTHER_ERROR);
-         }
--        if (initgroups(pw.pw_name, pw.pw_gid) != 0) {
--            qCritical() << "initgroups(" << pw.pw_name << ", " << pw.pw_gid << ") failed for user: " << username;
-+        if (setgid(pw.pw_gid) != 0) {
-+            qCritical() << "setgid(" << pw.pw_gid << ") failed for user: " << username;
-             exit(Auth::HELPER_OTHER_ERROR);
-         }
-         if (setuid(pw.pw_uid) != 0) {
-diff --git a/src/helper/backend/PamBackend.cpp b/src/helper/backend/PamBackend.cpp
-index f86d77d6..cccfa258 100644
---- a/src/helper/backend/PamBackend.cpp
-+++ b/src/helper/backend/PamBackend.cpp
-@@ -289,6 +289,24 @@ namespace SDDM {
-         return QString::fromLocal8Bit((const char*) m_pam->getItem(PAM_USER));
-     }
- 
-+    bool PamBackend::setupSupplementalGroups(struct passwd *pw) {
-+        if (!Backend::setupSupplementalGroups(pw))
-+            return false;
-+
-+        // pam_setcred(3) may inject additional groups into the user's
-+        // list of supplemental groups, and assumes that the user's
-+        // supplemental groups have already been initialized before
-+        // its invocation. Since pam_setcred was already called at the
-+        // start of openSession, we need to repeat this step here as
-+        // the user's groups have only just now been initialized.
-+
-+        if (!m_pam->setCred(PAM_REINITIALIZE_CRED)) {
-+            m_app->error(m_pam->errorString(), Auth::ERROR_AUTHENTICATION);
-+            return false;
-+        }
-+        return true;
-+    }
-+
-     int PamBackend::converse(int n, const struct pam_message **msg, struct pam_response **resp) {
-         qDebug() << "[PAM] Conversation with" << n << "messages";
- 
-diff --git a/src/helper/backend/PamBackend.h b/src/helper/backend/PamBackend.h
-index 4c8b4b35..5b079099 100644
---- a/src/helper/backend/PamBackend.h
-+++ b/src/helper/backend/PamBackend.h
-@@ -28,6 +28,7 @@
- #include <QtCore/QObject>
- 
- #include <security/pam_appl.h>
-+#include <pwd.h>
- 
- namespace SDDM {
-     class PamHandle;
-@@ -61,6 +62,7 @@ namespace SDDM {
-         explicit PamBackend(HelperApp *parent);
-         virtual ~PamBackend();
-         int converse(int n, const struct pam_message **msg, struct pam_response **resp);
-+        virtual bool setupSupplementalGroups(struct passwd *pw);
- 
-     public slots:
-         virtual bool start(const QString &user = QString());
-
diff --git a/source/kde/kde/patch/sddm/sddm_revert-honor-PAM-supplemental-groups.patch b/source/kde/kde/patch/sddm/sddm_revert-honor-PAM-supplemental-groups.patch
deleted file mode 100644
index 2391c80ce..000000000
--- a/source/kde/kde/patch/sddm/sddm_revert-honor-PAM-supplemental-groups.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From d3953e88a94ec25a87d3c5136517b3d1009cb1fd Mon Sep 17 00:00:00 2001
-From: "J. Konrad Tegtmeier-Rottach" <jktr@0x16.de>
-Date: Wed, 8 May 2019 18:58:53 +0200
-Subject: [PATCH] Revert "Honor PAM's ambient supplemental groups. (#834)"
-
-This reverts commit 1bc813d08b8130e458a6550ec47fb2bfbe6de080, which
-misuses PAM and leads to pulling in all of root's supplemental groups
-during session initialization instead of only adding PAM's extra
-groups. The problem was masked due to the root user not having any
-supplemental groups in some common contexts, like running sddm from a
-systemd unit.
----
- src/helper/UserSession.cpp | 57 --------------------------------------
- 1 file changed, 57 deletions(-)
-
-diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp
-index b3aec356..f71fd358 100644
---- a/src/helper/UserSession.cpp
-+++ b/src/helper/UserSession.cpp
-@@ -150,67 +150,10 @@ namespace SDDM {
-             qCritical() << "setgid(" << pw.pw_gid << ") failed for user: " << username;
-             exit(Auth::HELPER_OTHER_ERROR);
-         }
--
--#ifdef USE_PAM
--
--        // fetch ambient groups from PAM's environment;
--        // these are set by modules such as pam_groups.so
--        int n_pam_groups = getgroups(0, NULL);
--        gid_t *pam_groups = NULL;
--        if (n_pam_groups > 0) {
--            pam_groups = new gid_t[n_pam_groups];
--            if ((n_pam_groups = getgroups(n_pam_groups, pam_groups)) == -1) {
--                qCritical() << "getgroups() failed to fetch supplemental"
--                            << "PAM groups for user:" << username;
--                exit(Auth::HELPER_OTHER_ERROR);
--            }
--        } else {
--            n_pam_groups = 0;
--        }
--
--        // fetch session's user's groups
--        int n_user_groups = 0;
--        gid_t *user_groups = NULL;
--        if (-1 == getgrouplist(username.constData(), pw.pw_gid,
--                               NULL, &n_user_groups)) {
--            user_groups = new gid_t[n_user_groups];
--            if ((n_user_groups = getgrouplist(username.constData(),
--                                              pw.pw_gid, user_groups,
--                                              &n_user_groups)) == -1 ) {
--                qCritical() << "getgrouplist(" << username << ", " << pw.pw_gid
--                            << ") failed";
--                exit(Auth::HELPER_OTHER_ERROR);
--            }
--        }
--
--        // set groups to concatenation of PAM's ambient
--        // groups and the session's user's groups
--        int n_groups = n_pam_groups + n_user_groups;
--        if (n_groups > 0) {
--            gid_t *groups = new gid_t[n_groups];
--            memcpy(groups, pam_groups, (n_pam_groups * sizeof(gid_t)));
--            memcpy((groups + n_pam_groups), user_groups,
--                   (n_user_groups * sizeof(gid_t)));
--
--            // setgroups(2) handles duplicate groups
--            if (setgroups(n_groups, groups) != 0) {
--                qCritical() << "setgroups() failed for user: " << username;
--                exit (Auth::HELPER_OTHER_ERROR);
--            }
--            delete[] groups;
--        }
--        delete[] pam_groups;
--        delete[] user_groups;
--
--#else
--
-         if (initgroups(pw.pw_name, pw.pw_gid) != 0) {
-             qCritical() << "initgroups(" << pw.pw_name << ", " << pw.pw_gid << ") failed for user: " << username;
-             exit(Auth::HELPER_OTHER_ERROR);
-         }
--
--#endif /* USE_PAM */
--
-         if (setuid(pw.pw_uid) != 0) {
-             qCritical() << "setuid(" << pw.pw_uid << ") failed for user: " << username;
-             exit(Auth::HELPER_OTHER_ERROR);
-