From 86d93c9e88f570d4da416499da0e43f714b99c1c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Nov 03 2014 12:52:00 +0000
Subject: Connection to TLS-only server does not work (kde#340396)


---

diff --git a/0024-Switch-to-KTcpSocket-SecureProtocols.patch b/0024-Switch-to-KTcpSocket-SecureProtocols.patch
new file mode 100644
index 0000000..47f5797
--- /dev/null
+++ b/0024-Switch-to-KTcpSocket-SecureProtocols.patch
@@ -0,0 +1,42 @@
+From 718a37c810718ddc297174046961544bd889700f Mon Sep 17 00:00:00 2001
+From: Eike Hein <hein@kde.org>
+Date: Mon, 3 Nov 2014 12:57:28 +0100
+Subject: [PATCH 24/24] Switch to KTcpSocket::SecureProtocols.
+
+This bumps the kdelibs version requirement to v4.9.0.
+
+BUG:340396
+---
+ CMakeLists.txt     | 2 +-
+ src/irc/server.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 15aba0c..972e6a0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,7 +3,7 @@ project(konversation)
+ #paranoid?
+ cmake_minimum_required(VERSION 2.6.2)
+ 
+-set(KDE_MIN_VERSION "4.7.0")
++set(KDE_MIN_VERSION "4.9.0")
+ #atm this gets us FindQt4 and FindX11 (provided that the default cmake FindQt4 doesn't get used)
+ find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
+ find_package(KdepimLibs REQUIRED)
+diff --git a/src/irc/server.cpp b/src/irc/server.cpp
+index 6c07129..410f888 100644
+--- a/src/irc/server.cpp
++++ b/src/irc/server.cpp
+@@ -493,7 +493,7 @@ void Server::connectToIRCServer()
+                 m_socket->setPrivateKey(getIdentity()->getPemClientCertFile().toLocalFile());
+             }
+ 
+-            m_socket->setAdvertisedSslVersion(KTcpSocket::TlsV1);
++            m_socket->setAdvertisedSslVersion(KTcpSocket::SecureProtocols);
+ 
+             m_socket->connectToHostEncrypted(getConnectionSettings().server().host(), getConnectionSettings().server().port());
+         }
+-- 
+1.9.3
+
diff --git a/konversation.spec b/konversation.spec
index 2ecd71a..7dba5c9 100644
--- a/konversation.spec
+++ b/konversation.spec
@@ -1,7 +1,7 @@
 
 Name:           konversation
 Version:        1.5
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A user friendly IRC client
 
 License:        GPLv2+
@@ -22,10 +22,11 @@ Patch16: 0016-Update-cached-auto-join-command-when-setting-CHANTYP.patch
 Patch18: 0018-Fix-viewtype-check-during-setup.patch
 Patch19: 0019-Fix-incorrect-getAutomaticRequest-usage.patch
 Patch23: 0023-Do-a-bounds-check-on-ECB-blocks.patch
+Patch24: 0024-Switch-to-KTcpSocket-SecureProtocols.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  kdelibs4-devel >= 4.7.0
+BuildRequires:  kdelibs4-devel >= 4.9
 BuildRequires:  kdepimlibs-devel
 BuildRequires:  pkgconfig(xscrnsaver) 
 BuildRequires:  pkgconfig(phonon)
@@ -54,6 +55,7 @@ to chat windows; configurable background colors and much more
 %patch18 -p1 -b .0018
 %patch19 -p1 -b .0019
 %patch23 -p1 -b .0023
+%patch24 -p1 -b .0024
 
 
 %build
@@ -89,7 +91,6 @@ if [ $1 -eq 0 ] ; then
   update-desktop-database -q &> /dev/null ||:
 fi
 
-
 %files  -f konversation.lang
 %doc ChangeLog COPYING README TODO 
 %{_kde4_bindir}/konversation
@@ -101,6 +102,9 @@ fi
 
 
 %changelog
+* Mon Nov 03 2014 Rex Dieter <rdieter@fedoraproject.org> 1.5-8
+- Connection to TLS-only server does not work (kde#340396)
+
 * Wed Oct 29 2014 Rex Dieter <rdieter@fedoraproject.org> 1.5-7
 - add update-desktop-database scriptlets