[Pkg-bitcoin-commits] [electrum] 08/11: Remove 1001_use_sslv23_method.patch: merged upstream.

[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 cc775de977ac8f9a9c945e90764d016d18f77960
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Fri May 1 22:16:51 2015 +0200

    Remove 1001_use_sslv23_method.patch: merged upstream.
---
 debian/changelog                            |  1 +
 debian/patches/1001_use_sslv23_method.patch | 28 ----------------------------
 debian/patches/series                       |  1 -
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a632305..2e09fab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ electrum (2.1.1-1) UNRELEASED; urgency=medium
     - Remove 3001_dont_fetch_translations_from_web.patch: obsolete.
     - Remove 2001_add_tailing_semicolon.patch: merged upstream.
     - Remove 2002_dont_use_local_share.patch: obsolete.
+    - Remove 1001_use_sslv23_method.patch: merged upstream.
 
  -- Vasudev Kamath <kamathvasudev at gmail.com>  Sun, 23 Nov 2014 20:07:00 +0530
 
diff --git a/debian/patches/1001_use_sslv23_method.patch b/debian/patches/1001_use_sslv23_method.patch
deleted file mode 100644
index dd1517f..0000000
--- a/debian/patches/1001_use_sslv23_method.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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 98cfd78..bd27469 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-1001_use_sslv23_method.patch
 1002_qt_compatibility.patch

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