From cdea680437e2afe627210ed696c16969e268ad84 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Fri, 8 Nov 2019 23:23:40 +0000 Subject: Fri Nov 8 23:23:40 UTC 2019 a/hostname-3.23-x86_64-1.txz: Upgraded. a/kernel-firmware-20191108_f1100dd-noarch-1.txz: Upgraded. ap/mariadb-10.4.10-x86_64-1.txz: Upgraded. kde/kdelibs-4.14.38-x86_64-5.txz: Rebuilt. Remove hardcoded TLSv1 allowing TLSv1.1 and TLSv1.2. Thanks to PJ Beers. kde/kdepim-4.14.10-x86_64-5.txz: Rebuilt. Remove hardcoded TLSv1 allowing TLSv1.1 and TLSv1.2. Thanks to PJ Beers. kde/kdepimlibs-4.14.10-x86_64-9.txz: Rebuilt. Remove hardcoded TLSv1 allowing TLSv1.1 and TLSv1.2. Thanks to PJ Beers. l/adwaita-icon-theme-3.34.3-noarch-1.txz: Upgraded. testing/packages/rust-1.39.0-x86_64-1.txz: Upgraded. --- source/kde/build/kdelibs | 2 +- source/kde/build/kdepim | 2 +- source/kde/build/kdepimlibs | 2 +- source/kde/patch/kdelibs.patch | 2 ++ source/kde/patch/kdelibs/kde4libs-4.14.26.diff | 11 +++++++++++ source/kde/patch/kdepim.patch | 2 ++ source/kde/patch/kdepim/libkf5ksieve-16.04.3.diff | 11 +++++++++++ source/kde/patch/kdepimlibs.patch | 3 +++ source/kde/patch/kdepimlibs/kimap-16.04.2.diff | 11 +++++++++++ 9 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 source/kde/patch/kdelibs/kde4libs-4.14.26.diff create mode 100644 source/kde/patch/kdepim/libkf5ksieve-16.04.3.diff create mode 100644 source/kde/patch/kdepimlibs/kimap-16.04.2.diff (limited to 'source/kde') diff --git a/source/kde/build/kdelibs b/source/kde/build/kdelibs index b8626c4cf..7ed6ff82d 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 b8626c4cf..7ed6ff82d 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 45a4fb75d..ec635144f 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 00b4ebc80..e74d8bf0e 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 000000000..2bc275ac7 --- /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 fc4177495..48c259610 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 000000000..ea1f17116 --- /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 2e9017c22..0939702f2 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 000000000..dabca4e3c --- /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: -- cgit v1.2.3-80-g2a13