summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2019-11-11 21:36:25 +0100
committer Eric Hameleers <alien@slackware.com>2019-11-11 21:36:25 +0100
commit3c4df70919a97e6e7fcf08c20e1f3c6497efb665 (patch)
tree3a84fc46dc3e185540b4c103363971ca2a78c626
parent3f0fd1bc5f1f8e27c4bf70893cb6949e5d3d4815 (diff)
downloadktown-3c4df70919a97e6e7fcf08c20e1f3c6497efb665.tar.gz
ktown-3c4df70919a97e6e7fcf08c20e1f3c6497efb665.tar.xz
KDE4: recompile kdelibs
This removes hardcoded TLSv1 allowing TLSv1.1 and TLSv1.2
-rw-r--r--kde/build/kdelibs2
-rw-r--r--kde/patch/kdelibs.patch2
-rw-r--r--kde/patch/kdelibs/kde4libs-4.14.26.diff11
3 files changed, 14 insertions, 1 deletions
diff --git a/kde/build/kdelibs b/kde/build/kdelibs
index 0cfbf08..00750ed 100644
--- a/kde/build/kdelibs
+++ b/kde/build/kdelibs
@@ -1 +1 @@
-2
+3
diff --git a/kde/patch/kdelibs.patch b/kde/patch/kdelibs.patch
index d51fd45..44e201e 100644
--- a/kde/patch/kdelibs.patch
+++ b/kde/patch/kdelibs.patch
@@ -23,3 +23,5 @@ cat $CWD/patch/kdelibs/kdelibs-openssl-1.1.patch | patch -p1 --verbose || { touc
# (CVE-2019-14744):
cat $CWD/patch/kdelibs/kdelibs.2c3762feddf7e66cf6b64d9058f625a715694a00.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+# Support TLS v1.1 and TLS v1.2:
+cat $CWD/patch/kdelibs/kde4libs-4.14.26.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/kde/patch/kdelibs/kde4libs-4.14.26.diff b/kde/patch/kdelibs/kde4libs-4.14.26.diff
new file mode 100644
index 0000000..2bc275a
--- /dev/null
+++ b/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,