[Pkg-bitcoin-commits] [electrum] 01/04: Backport upstream PROTOCOL_SSLv23 change.

[Tristan Seligmann]

This is an automated email from the git hooks/post-receive script.

mithrandi pushed a commit to branch master
in repository electrum.

commit 05f72101b08efba7b2aeecb5042b1eefe7f6e373
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Sun Nov 23 09:56:11 2014 +0200

    Backport upstream PROTOCOL_SSLv23 change.
---
 debian/changelog                            |  7 +++++++
 debian/patches/1001_use_sslv23_method.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a4a0d14..ff4240d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+electrum (1.9.8-3) UNRELEASED; urgency=medium
+
+  * Backport upstream change to use PROTOCOL_SSL23 instead of
+    PROTOCOL_SSL3 which was removed in python 2.7.8-12.
+
+ -- Tristan Seligmann <mithrandi at debian.org>  Sun, 23 Nov 2014 09:55:10 +0200
+
 electrum (1.9.8-2) unstable; urgency=medium
 
   * Update / fix package description.
diff --git a/debian/patches/1001_use_sslv23_method.patch b/debian/patches/1001_use_sslv23_method.patch
new file mode 100644
index 0000000..dd1517f
--- /dev/null
+++ b/debian/patches/1001_use_sslv23_method.patch
@@ -0,0 +1,28 @@
+Description: Use SSLv23 method instead of SSLv3
+ Taken from upstream revision c225795793696c5b5d4a9243ebeb129091229ca5
+Author: ThomasV
+Forwarded: yes
+Last-Update: 2014-11-23
+
+Index: electrum/lib/interface.py
+===================================================================
+--- electrum.orig/lib/interface.py	2014-11-23 09:51:02.756184724 +0200
++++ electrum/lib/interface.py	2014-11-23 09:51:53.444984556 +0200
+@@ -333,7 +333,7 @@
+                         continue
+ 
+                     try:
+-                        s = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_SSLv3, cert_reqs=ssl.CERT_NONE, ca_certs=None)
++                        s = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_SSLv23, cert_reqs=ssl.CERT_NONE, ca_certs=None)
+                     except ssl.SSLError, e:
+                         print_error("SSL error retrieving SSL certificate:", self.host, e)
+                         s = None
+@@ -379,7 +379,7 @@
+         if self.use_ssl:
+             try:
+                 s = ssl.wrap_socket(s,
+-                                    ssl_version=ssl.PROTOCOL_SSLv3,
++                                    ssl_version=ssl.PROTOCOL_SSLv23,
+                                     cert_reqs=ssl.CERT_REQUIRED,
+                                     ca_certs= (temporary_path if is_new else cert_path),
+                                     do_handshake_on_connect=True)
diff --git a/debian/patches/series b/debian/patches/series
index 1af46fa..d331e3f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 3001_dont_fetch_translations_from_web.patch
 2001_add_tailing_semicolon.patch
 2002_dont_use_local_share.patch
+1001_use_sslv23_method.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/electrum.git