Sat Dec 11 20:02:51 UTC 202120211211200251

kde/kdepim-runtime-21.12.0-x86_64-2.txz:  Rebuilt.
  Applied upstream patch:
  [PATCH] POP3: Fix SSL/TLS connections
  Thanks to gmgf.

7 files changed, 144 insertions, 2 deletions

diff --git a/source/kde/kde/build/digikam b/source/kde/kde/build/digikam
index 00750edc0..d00491fd7 100644
--- a/source/kde/kde/build/digikam
+++ b/source/kde/kde/build/digikam
@@ -1 +1 @@
-3
+1
diff --git a/source/kde/kde/build/kdepim-runtime b/source/kde/kde/build/kdepim-runtime
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kdepim-runtime
+++ b/source/kde/kde/build/kdepim-runtime
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/patch/kdepim-runtime.patch b/source/kde/kde/patch/kdepim-runtime.patch
new file mode 100644
index 000000000..f8ea45d72
--- /dev/null
+++ b/source/kde/kde/patch/kdepim-runtime.patch
@@ -0,0 +1 @@
+cat $CWD/patch/kdepim-runtime/fb456a2ad77b8d2bd4b0013832591c1dda8bb09a.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kdepim-runtime/fb456a2ad77b8d2bd4b0013832591c1dda8bb09a.patch b/source/kde/kde/patch/kdepim-runtime/fb456a2ad77b8d2bd4b0013832591c1dda8bb09a.patch
new file mode 100644
index 000000000..9aa39dbfe
--- /dev/null
+++ b/source/kde/kde/patch/kdepim-runtime/fb456a2ad77b8d2bd4b0013832591c1dda8bb09a.patch
@@ -0,0 +1,95 @@
+From fb456a2ad77b8d2bd4b0013832591c1dda8bb09a Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Fri, 10 Dec 2021 21:55:13 +0100
+Subject: [PATCH] POP3: Fix SSL/TLS connections
+
+We need to go into ssl before trying to read from the socket, otherwise
+nothing works
+
+BUGS: 446751
+---
+ resources/pop3/pop3protocol.cpp | 61 +++++++++++++++++----------------
+ 1 file changed, 31 insertions(+), 30 deletions(-)
+
+diff --git a/resources/pop3/pop3protocol.cpp b/resources/pop3/pop3protocol.cpp
+index c2d01d33a..02fa49770 100644
+--- a/resources/pop3/pop3protocol.cpp
++++ b/resources/pop3/pop3protocol.cpp
+@@ -560,6 +560,37 @@ Result POP3Protocol::openConnection()
+             return Result::fail(mSocket->error(), errorString);
+         }
+ 
++        if (mSettings.useSSL() || mSettings.useTLS()) {
++            mSocket->ignoreSslErrors(); // Don't worry, errors are handled manually below
++            mSocket->startClientEncryption();
++            const bool encryptionStarted = mSocket->waitForEncrypted(s_connectTimeout);
++
++            const QSslCipher cipher = mSocket->sessionCipher();
++            const QList<QSslError> errors = mSocket->sslHandshakeErrors();
++            if (!encryptionStarted || !errors.isEmpty() || !mSocket->isEncrypted() || cipher.isNull() || cipher.usedBits() == 0) {
++                QString errorString = std::accumulate(errors.begin(), errors.end(), QString(), [](QString cur, const QSslError &error) {
++                    if (!cur.isEmpty())
++                        cur += QLatin1Char('\n');
++                    cur += error.errorString();
++                    return cur;
++                });
++
++                qCDebug(POP3_LOG) << "Initial SSL handshake failed. cipher.isNull() is" << cipher.isNull() << ", cipher.usedBits() is" << cipher.usedBits()
++                                  << ", the socket says:" << mSocket->errorString() << "and the SSL errors are:" << errorString;
++                mContinueAfterSslError = false;
++                Q_EMIT sslError(KSslErrorUiData(mSocket));
++                if (!mContinueAfterSslError) {
++                    if (errorString.isEmpty())
++                        errorString = mSocket->errorString();
++                    qCDebug(POP3_LOG) << "TLS setup has failed. Aborting." << errorString;
++                    closeConnection();
++                    return Result::fail(ERR_SSL_FAILURE, i18n("SSL/TLS error: %1", errorString));
++                }
++            } else {
++                qCDebug(POP3_LOG) << "TLS has been enabled.";
++            }
++        }
++
+         mConnected = true;
+ 
+         greeting_buf = new char[GREETING_BUF_LEN];
+@@ -609,36 +640,6 @@ Result POP3Protocol::openConnection()
+                                          "disable TLS in the POP account settings dialog."));
+             }
+         }
+-        if (mSettings.useSSL() || mSettings.useTLS()) {
+-            mSocket->ignoreSslErrors(); // Don't worry, errors are handled manually below
+-            mSocket->startClientEncryption();
+-            const bool encryptionStarted = mSocket->waitForEncrypted(s_connectTimeout);
+-
+-            const QSslCipher cipher = mSocket->sessionCipher();
+-            const QList<QSslError> errors = mSocket->sslHandshakeErrors();
+-            if (!encryptionStarted || !errors.isEmpty() || !mSocket->isEncrypted() || cipher.isNull() || cipher.usedBits() == 0) {
+-                QString errorString = std::accumulate(errors.begin(), errors.end(), QString(), [](QString cur, const QSslError &error) {
+-                    if (!cur.isEmpty())
+-                        cur += QLatin1Char('\n');
+-                    cur += error.errorString();
+-                    return cur;
+-                });
+-
+-                qCDebug(POP3_LOG) << "Initial SSL handshake failed. cipher.isNull() is" << cipher.isNull() << ", cipher.usedBits() is" << cipher.usedBits()
+-                                  << ", the socket says:" << mSocket->errorString() << "and the SSL errors are:" << errorString;
+-                mContinueAfterSslError = false;
+-                Q_EMIT sslError(KSslErrorUiData(mSocket));
+-                if (!mContinueAfterSslError) {
+-                    if (errorString.isEmpty())
+-                        errorString = mSocket->errorString();
+-                    qCDebug(POP3_LOG) << "TLS setup has failed. Aborting." << errorString;
+-                    closeConnection();
+-                    return Result::fail(ERR_SSL_FAILURE, i18n("SSL/TLS error: %1", errorString));
+-                }
+-            } else {
+-                qCDebug(POP3_LOG) << "TLS has been enabled.";
+-            }
+-        }
+ 
+         if (supports_apop && m_try_apop) {
+             qCDebug(POP3_LOG) << "Trying APOP";
+-- 
+GitLab
+
diff --git a/source/l/FTBFSlog b/source/l/FTBFSlog
index d6ee17f21..395c8dbed 100644
--- a/source/l/FTBFSlog
+++ b/source/l/FTBFSlog
@@ -1,3 +1,6 @@
+Sat Dec 11 19:31:59 UTC 2021
+  SDL2: Fix build against wayland-1.20.0. Thanks to nobodino and Daedra.
++--------------------------+
 Mon Oct 11 18:41:49 UTC 2021
   mozjs78: Fix build with Python 3.10. Thanks to nobodino.
 +--------------------------+
diff --git a/source/l/SDL2/SDL2.SlackBuild b/source/l/SDL2/SDL2.SlackBuild
index 984c58803..ae64b7273 100755
--- a/source/l/SDL2/SDL2.SlackBuild
+++ b/source/l/SDL2/SDL2.SlackBuild
@@ -88,6 +88,9 @@ find . \
 # Fix video-opengles1 build failure:
 zcat $CWD/SDL2-2.0.9-khrplatform.patch.gz | patch -p1 --verbose || exit 1
 
+# Fix build against wayland-1.20.0:
+zcat $CWD/e2ade2bfc46d915cd306c63c830b81d800b2575f.patch.gz | patch -p1 --verbose || exit 1
+
 # Configure:
 CFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source/l/SDL2/e2ade2bfc46d915cd306c63c830b81d800b2575f.patch b/source/l/SDL2/e2ade2bfc46d915cd306c63c830b81d800b2575f.patch
new file mode 100644
index 000000000..8d80735c4
--- /dev/null
+++ b/source/l/SDL2/e2ade2bfc46d915cd306c63c830b81d800b2575f.patch
@@ -0,0 +1,40 @@
+From e2ade2bfc46d915cd306c63c830b81d800b2575f Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Fri, 10 Dec 2021 16:22:34 +0100
+Subject: [PATCH] Fix build against wayland 1.20
+
+Fixes #5088
+---
+ src/video/wayland/SDL_waylanddyn.h | 2 ++
+ src/video/wayland/SDL_waylandsym.h | 4 ++++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h
+index 13b0884d076..2268555604a 100644
+--- a/src/video/wayland/SDL_waylanddyn.h
++++ b/src/video/wayland/SDL_waylanddyn.h
+@@ -95,6 +95,8 @@ void SDL_WAYLAND_UnloadSymbols(void);
+ #define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned)
+ #define wl_proxy_set_tag (*WAYLAND_wl_proxy_set_tag)
+ #define wl_proxy_get_tag (*WAYLAND_wl_proxy_get_tag)
++#define wl_proxy_marshal_flags (*WAYLAND_wl_proxy_marshal_flags)
++#define wl_proxy_marshal_array_flags (*WAYLAND_wl_proxy_marshal_array_flags)
+ 
+ #define wl_seat_interface (*WAYLAND_wl_seat_interface)
+ #define wl_surface_interface (*WAYLAND_wl_surface_interface)
+diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h
+index d6e6a761d39..32e47d26e2d 100644
+--- a/src/video/wayland/SDL_waylandsym.h
++++ b/src/video/wayland/SDL_waylandsym.h
+@@ -84,6 +84,10 @@ SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_18)
+ SDL_WAYLAND_SYM(void, wl_proxy_set_tag, (struct wl_proxy *, const char * const *))
+ SDL_WAYLAND_SYM(const char * const *, wl_proxy_get_tag, (struct wl_proxy *))
+ 
++SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_20)
++SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interfac, uint32_t version, uint32_t flags, ...))
++SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_array_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version,  uint32_t flags, union wl_argument *args))
++
+ SDL_WAYLAND_INTERFACE(wl_seat_interface)
+ SDL_WAYLAND_INTERFACE(wl_surface_interface)
+ SDL_WAYLAND_INTERFACE(wl_shm_pool_interface)
+