From 7c194c908856679b453df2a0cd74fc1bb41a3e8b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 13 2019 14:39:13 +0000 Subject: import python-websocket-client-0.56.0-3.git3c25814.el7 --- diff --git a/SOURCES/0001-provide-system-ca-bundle-as-default-if-no-bundle-is-.patch b/SOURCES/0001-provide-system-ca-bundle-as-default-if-no-bundle-is-.patch new file mode 100644 index 0000000..2553682 --- /dev/null +++ b/SOURCES/0001-provide-system-ca-bundle-as-default-if-no-bundle-is-.patch @@ -0,0 +1,26 @@ +From 81003c91187947e7f3baf99186e0604ea3e66cc2 Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Tue, 11 Jun 2019 10:32:53 -0400 +Subject: [PATCH] provide system ca-bundle as default if no bundle is set + +Signed-off-by: rpm-build +--- + websocket/_http.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/websocket/_http.py b/websocket/_http.py +index 5b9a26d..34a87f1 100644 +--- a/websocket/_http.py ++++ b/websocket/_http.py +@@ -245,6 +245,8 @@ def _ssl_socket(sock, user_sslopt, hostname): + sslopt.update(user_sslopt) + + certPath = os.environ.get('WEBSOCKET_CLIENT_CA_BUNDLE') ++ if certPath is None: ++ certPath = '/etc/pki/tls/certs/ca-bundle.crt' + if certPath and os.path.isfile(certPath) \ + and user_sslopt.get('ca_certs', None) is None \ + and user_sslopt.get('ca_cert', None) is None: +-- +2.17.2 + diff --git a/SPECS/python-websocket-client.spec b/SPECS/python-websocket-client.spec index 052de6a..311549a 100644 --- a/SPECS/python-websocket-client.spec +++ b/SPECS/python-websocket-client.spec @@ -17,7 +17,7 @@ Name: python-websocket-client Version: 0.56.0 -Release: 1.git%{shortcommit}%{?dist} +Release: 3.git%{shortcommit}%{?dist} Summary: WebSocket client for python Group: Development/Libraries License: LGPLv2 @@ -25,6 +25,7 @@ URL: http://pypi.python.org/pypi/websocket-client #Source0: http://pypi.python.org/packages/source/w/%%{distname}/%%{eggname}-%%{version}.tar.gz Source0: https://github.com/%{distname}/%{distname}/archive/%{commit}/%{distname}-%{shortcommit}.tar.gz Patch0: 0001-urlparse-import-conditionals-for-rhel7.patch +Patch1: 0001-provide-system-ca-bundle-as-default-if-no-bundle-is-.patch BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-setuptools @@ -149,6 +150,12 @@ popd %endif %changelog +* Wed Jun 12 2019 Lokesh Mandvekar - 0.56.0-3.git3c25814 +- Correct bug id in previous changelog + +* Wed Jun 12 2019 Lokesh Mandvekar - 0.56.0-2.git3c25814 +- Resolves: #1719354 + * Mon May 13 2019 Lokesh Mandvekar - 0.56.0-1.git3c25814 - Resolves: #1702715