diff --git a/pidgin-ssl-cache.patch b/pidgin-ssl-cache.patch deleted file mode 100644 index e0d8e01..0000000 --- a/pidgin-ssl-cache.patch +++ /dev/null @@ -1,18 +0,0 @@ -# -# old_revision [075c2902b90abb6349a6b689e26fa0ecf720ca04] -# -# patch "libpurple/plugins/ssl/ssl-nss.c" -# from [124c474174cbde7da43e375e4ffa1f47950ab95b] -# to [600583b354d9a94ed7aafa37460174404a9903aa] -# -============================================================ ---- libpurple/plugins/ssl/ssl-nss.c 124c474174cbde7da43e375e4ffa1f47950ab95b -+++ libpurple/plugins/ssl/ssl-nss.c 600583b354d9a94ed7aafa37460174404a9903aa -@@ -428,6 +428,7 @@ ssl_nss_connect(PurpleSslConnection *gsc - - SSL_OptionSet(nss_data->in, SSL_SECURITY, PR_TRUE); - SSL_OptionSet(nss_data->in, SSL_HANDSHAKE_AS_CLIENT, PR_TRUE); -+ SSL_OptionSet(nss_data->in, SSL_NO_CACHE, PR_TRUE); - - /* If we have our internal verifier set up, use it. Otherwise, - * use default. */ diff --git a/pidgin.changes b/pidgin.changes index 20454fc..c8c4dc2 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 20 10:04:54 UTC 2015 - tbehrens@suse.com + +- Remove pidgin-ssl-cache.patch: testing with the usual suspects in + irc land suggests this workaround is no longer necessary + ------------------------------------------------------------------- Mon Nov 24 10:55:10 UTC 2014 - dimstar@opensuse.org diff --git a/pidgin.spec b/pidgin.spec index b72faf1..44a6052 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -1,7 +1,7 @@ # # spec file for package pidgin # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,8 +33,6 @@ Patch2: %{name}-nonblock-common2.patch Patch3: %{name}-gnome-keyring.patch # PATCH-FIX-OPENSUSE pidgin-fix-perl-build.patch vuntz@opensuse.org -- Revert http://developer.pidgin.im/viewmtn/revision/info/f32151852a00fb5abd3fdccdd8df2419031666de as it breaks the build Patch4: %{name}-fix-perl-build.patch -# PATCH-FIX-UPSTREAM pidgin-ssl-cache.patch pidgin.im#11568 tbehrens@suse.com -- Disable caching the SSL Session keys, as some (broken) IRC servers are not willing to re-use them upon a disconnect. -Patch5: %{name}-ssl-cache.patch # PATCH-FIX-UPSTREAM pidgin-crash-missing-gst-registry.patch bnc#866455 pidgin.im#16224 cxiong@suse.com -- Fix crash when GST registry cache file is missing. Patch6: pidgin-crash-missing-gst-registry.patch BuildRequires: NetworkManager-devel @@ -255,7 +253,6 @@ translation-update-upstream %patch4 -p1 %if 0%{?suse_version} >= 1310 -%patch5 %patch6 -p1 %endif