[Python-modules-commits] [websocket-client] 02/03: merge patched into master

[Thomas Goirand]

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

zigo pushed a commit to branch master
in repository websocket-client.

commit 1a8f5899cba9a61da6869c0d4c2b2be115dcd698
Merge: 3a9942e ae22a25
Author: Thomas Goirand <thomas at goirand.fr>
Date:   Thu Sep 8 15:45:02 2016 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...global-ca-cert-store-instead-of-local-moz.patch | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  1 -
 websocket/_http.py                                 |  3 +-
 5 files changed, 40 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 7b68923,0000000..d5b3acc
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 11541fc8f50ba2eae6614694fa6e1e35a9449be8
- 11541fc8f50ba2eae6614694fa6e1e35a9449be8
++ae22a2564d2be8f1bea90a2c05e5dd05c8760597
++ae22a2564d2be8f1bea90a2c05e5dd05c8760597
 +11541fc8f50ba2eae6614694fa6e1e35a9449be8
 +11541fc8f50ba2eae6614694fa6e1e35a9449be8
 +websocket-client_0.37.0.orig.tar.gz
 +1ae08f0a73671ae24261a71b48a2eb40ab4269a9
 +190144
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Use-debian-global-ca-cert-store-instead-of-local-moz.patch
index 0000000,0000000..1fcf106
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-debian-global-ca-cert-store-instead-of-local-moz.patch
@@@ -1,0 -1,0 +1,36 @@@
++From ae22a2564d2be8f1bea90a2c05e5dd05c8760597 Mon Sep 17 00:00:00 2001
++From: Thomas Goirand <thomas at goirand.fr>
++Date: Thu, 8 Sep 2016 15:44:33 +0000
++Subject: Use debian-global ca cert store, instead of local mozilla copy
++
++---
++ setup.py           | 1 -
++ websocket/_http.py | 3 +--
++ 2 files changed, 1 insertion(+), 3 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index 13778d7..9b91574 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -41,7 +41,6 @@ setup(
++     packages=["websocket", "websocket.tests"],
++     package_data={
++         'websocket.tests': ['data/*.txt'],
++-        'websocket': ["cacert.pem"]
++     },
++     tests_require=tests_require,
++     test_suite="websocket.tests.test_websocket",
++diff --git a/websocket/_http.py b/websocket/_http.py
++index 63f3f83..224ebe2 100644
++--- a/websocket/_http.py
+++++ b/websocket/_http.py
++@@ -159,8 +159,7 @@ def _ssl_socket(sock, user_sslopt, hostname):
++     sslopt = dict(cert_reqs=ssl.CERT_REQUIRED)
++     sslopt.update(user_sslopt)
++     
++-    certPath = os.path.join(
++-        os.path.dirname(__file__), "cacert.pem")
+++    certPath = "/etc/ssl/certs/ca-certificates.crt"
++     if os.path.isfile(certPath) and user_sslopt.get('ca_certs', None) == None:
++         sslopt['ca_certs'] = certPath
++     check_hostname = sslopt["cert_reqs"] != ssl.CERT_NONE and sslopt.pop('check_hostname', True)
diff --cc debian/patches/series
index 0000000,0000000..6d26251
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-debian-global-ca-cert-store-instead-of-local-moz.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/websocket-client.git