summaryrefslogtreecommitdiff
path: root/source/kde
diff options
context:
space:
mode:
Diffstat (limited to 'source/kde')
-rw-r--r--source/kde/build/kdelibs2
-rw-r--r--source/kde/build/kdepim2
-rw-r--r--source/kde/build/kdepimlibs2
-rw-r--r--source/kde/patch/kdelibs.patch2
-rw-r--r--source/kde/patch/kdelibs/kde4libs-4.14.26.diff11
-rw-r--r--source/kde/patch/kdepim.patch2
-rw-r--r--source/kde/patch/kdepim/libkf5ksieve-16.04.3.diff11
-rw-r--r--source/kde/patch/kdepimlibs.patch3
-rw-r--r--source/kde/patch/kdepimlibs/kimap-16.04.2.diff11
9 files changed, 43 insertions, 3 deletions
diff --git a/source/kde/build/kdelibs b/source/kde/build/kdelibs
index b8626c4c..7ed6ff82 100644
--- a/source/kde/build/kdelibs
+++ b/source/kde/build/kdelibs
@@ -1 +1 @@
-4
+5
diff --git a/source/kde/build/kdepim b/source/kde/build/kdepim
index b8626c4c..7ed6ff82 100644
--- a/source/kde/build/kdepim
+++ b/source/kde/build/kdepim
@@ -1 +1 @@
-4
+5
diff --git a/source/kde/build/kdepimlibs b/source/kde/build/kdepimlibs
index 45a4fb75..ec635144 100644
--- a/source/kde/build/kdepimlibs
+++ b/source/kde/build/kdepimlibs
@@ -1 +1 @@
-8
+9
diff --git a/source/kde/patch/kdelibs.patch b/source/kde/patch/kdelibs.patch
index 00b4ebc8..e74d8bf0 100644
--- a/source/kde/patch/kdelibs.patch
+++ b/source/kde/patch/kdelibs.patch
@@ -18,3 +18,5 @@ zcat $CWD/patch/kdelibs/kdelibs-openssl-1.1.patch.gz | patch -p1 --verbose || {
# Security: remove support for $(...) in config keys with [$e] marker. (CVE-2019-14744)
zcat $CWD/patch/kdelibs/kdelibs.2c3762feddf7e66cf6b64d9058f625a715694a00.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+# Support TLS v1.1 and TLS v1.2:
+zcat $CWD/patch/kdelibs/kde4libs-4.14.26.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/patch/kdelibs/kde4libs-4.14.26.diff b/source/kde/patch/kdelibs/kde4libs-4.14.26.diff
new file mode 100644
index 00000000..2bc275ac
--- /dev/null
+++ b/source/kde/patch/kdelibs/kde4libs-4.14.26.diff
@@ -0,0 +1,11 @@
+--- a/kio/kio/tcpslavebase.cpp
++++ b/kio/kio/tcpslavebase.cpp
+@@ -499,7 +499,7 @@
+ {
+ if (d->usingSSL)
+ return false;
+- return d->startTLSInternal(KTcpSocket::TlsV1) & ResultOk;
++ return d->startTLSInternal(KTcpSocket::SecureProtocols) & ResultOk;
+ }
+
+ TCPSlaveBase::SslResult TCPSlaveBase::TcpSlaveBasePrivate::startTLSInternal (KTcpSocket::SslVersion version,
diff --git a/source/kde/patch/kdepim.patch b/source/kde/patch/kdepim.patch
index fc417749..48c25961 100644
--- a/source/kde/patch/kdepim.patch
+++ b/source/kde/patch/kdepim.patch
@@ -2,3 +2,5 @@
# This used to be fixed?
zcat $CWD/patch/kdepim/kdepim-install_kleopatra_headers.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+# Support TLS v1.1 and TLS v1.2:
+zcat $CWD/patch/kdepim/libkf5ksieve-16.04.3.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/patch/kdepim/libkf5ksieve-16.04.3.diff b/source/kde/patch/kdepim/libkf5ksieve-16.04.3.diff
new file mode 100644
index 00000000..ea1f1711
--- /dev/null
+++ b/source/kde/patch/kdepim/libkf5ksieve-16.04.3.diff
@@ -0,0 +1,11 @@
+--- ./libksieve/kmanagesieve/session.cpp.orig 2015-06-25 12:47:38.000000000 -0500
++++ ./libksieve/kmanagesieve/session.cpp 2019-11-08 15:49:06.212790078 -0600
+@@ -368,7 +368,7 @@
+ m_sslCheck->setInterval(60*1000);
+ connect(m_sslCheck, SIGNAL(timeout()), this, SLOT(slotSslTimeout()));
+ }
+- m_socket->setAdvertisedSslVersion( KTcpSocket::TlsV1 );
++ m_socket->setAdvertisedSslVersion( KTcpSocket::SecureProtocols );
+ m_socket->ignoreSslErrors();
+ connect(m_socket, SIGNAL(encrypted()), SLOT(slotEncryptedDone()));
+ m_sslCheck->start();
diff --git a/source/kde/patch/kdepimlibs.patch b/source/kde/patch/kdepimlibs.patch
index 2e9017c2..0939702f 100644
--- a/source/kde/patch/kdepimlibs.patch
+++ b/source/kde/patch/kdepimlibs.patch
@@ -1 +1,4 @@
zcat $CWD/patch/kdepimlibs/kdepimlibs.libical3.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Support TLS v1.1 and TLS v1.2:
+zcat $CWD/patch/kdepimlibs/kimap-16.04.2.diff.gz | patch -p1 -l --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/patch/kdepimlibs/kimap-16.04.2.diff b/source/kde/patch/kdepimlibs/kimap-16.04.2.diff
new file mode 100644
index 00000000..dabca4e3
--- /dev/null
+++ b/source/kde/patch/kdepimlibs/kimap-16.04.2.diff
@@ -0,0 +1,11 @@
+--- ./kimap/loginjob.cpp.orig 2015-06-24 07:43:14.000000000 -0500
++++ ./kimap/loginjob.cpp 2019-11-08 15:44:05.687811741 -0600
+@@ -382,7 +382,7 @@
+
+ switch ( d->authState ) {
+ case LoginJobPrivate::StartTls:
+- d->sessionInternal()->startSsl( KTcpSocket::TlsV1 );
++ d->sessionInternal()->startSsl( KTcpSocket::SecureProtocols );
+ break;
+
+ case LoginJobPrivate::Capability: