Resolves: #1446850 - drop link-time vs. run-time TLS backend check
This commit is contained in:
parent
7f51a76545
commit
a80dc1d76c
53
0002-python-pycurl-7.43.0-tls-backend.patch
Normal file
53
0002-python-pycurl-7.43.0-tls-backend.patch
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
From 36dcccb94bef72a7c4cf6acf7479f18568e545bb Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
Date: Tue, 2 May 2017 17:19:20 +0200
|
||||||
|
Subject: [PATCH] module: drop link-time vs. run-time TLS backend check
|
||||||
|
|
||||||
|
This effectively reverts the following commit:
|
||||||
|
8891398a31119ce7c872509ed60328926c51cdfb
|
||||||
|
|
||||||
|
Bug: https://bugzilla.redhat.com/1446850
|
||||||
|
---
|
||||||
|
src/module.c | 19 +------------------
|
||||||
|
1 file changed, 1 insertion(+), 18 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/module.c b/src/module.c
|
||||||
|
index a7108a0..af79875 100644
|
||||||
|
--- a/src/module.c
|
||||||
|
+++ b/src/module.c
|
||||||
|
@@ -315,7 +315,7 @@ initpycurl(void)
|
||||||
|
{
|
||||||
|
PyObject *m, *d;
|
||||||
|
const curl_version_info_data *vi;
|
||||||
|
- const char *libcurl_version, *runtime_ssl_lib;
|
||||||
|
+ const char *libcurl_version;
|
||||||
|
size_t libcurl_version_len, pycurl_version_len;
|
||||||
|
PyObject *collections_module = NULL;
|
||||||
|
PyObject *named_tuple = NULL;
|
||||||
|
@@ -333,23 +333,6 @@ initpycurl(void)
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
|
||||||
|
- /* Our compiled crypto locks should correspond to runtime ssl library. */
|
||||||
|
- if (vi->ssl_version == NULL) {
|
||||||
|
- runtime_ssl_lib = "none/other";
|
||||||
|
- } else if (!strncmp(vi->ssl_version, "OpenSSL/", 8) || !strncmp(vi->ssl_version, "LibreSSL/", 9)) {
|
||||||
|
- runtime_ssl_lib = "openssl";
|
||||||
|
- } else if (!strncmp(vi->ssl_version, "GnuTLS/", 7)) {
|
||||||
|
- runtime_ssl_lib = "gnutls";
|
||||||
|
- } else if (!strncmp(vi->ssl_version, "NSS/", 4)) {
|
||||||
|
- runtime_ssl_lib = "nss";
|
||||||
|
- } else {
|
||||||
|
- runtime_ssl_lib = "none/other";
|
||||||
|
- }
|
||||||
|
- if (strcmp(runtime_ssl_lib, COMPILE_SSL_LIB)) {
|
||||||
|
- PyErr_Format(PyExc_ImportError, "pycurl: libcurl link-time ssl backend (%s) is different from compile-time ssl backend (%s)", runtime_ssl_lib, COMPILE_SSL_LIB);
|
||||||
|
- goto error;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
/* Initialize the type of the new type objects here; doing it here
|
||||||
|
* is required for portability to Windows without requiring C++. */
|
||||||
|
p_Curl_Type = &Curl_Type;
|
||||||
|
--
|
||||||
|
2.10.2
|
||||||
|
|
||||||
@ -2,15 +2,19 @@
|
|||||||
|
|
||||||
Name: python-%{modname}
|
Name: python-%{modname}
|
||||||
Version: 7.43.0
|
Version: 7.43.0
|
||||||
Release: 8%{?dist}
|
Release: 9%{?dist}
|
||||||
Summary: A Python interface to libcurl
|
Summary: A Python interface to libcurl
|
||||||
|
|
||||||
License: LGPLv2+ or MIT
|
License: LGPLv2+ or MIT
|
||||||
URL: http://pycurl.sourceforge.net/
|
URL: http://pycurl.sourceforge.net/
|
||||||
Source0: https://dl.bintray.com/pycurl/pycurl/pycurl-%{version}.tar.gz
|
Source0: https://dl.bintray.com/pycurl/pycurl/pycurl-%{version}.tar.gz
|
||||||
|
|
||||||
|
# disable TLS-SRP test because TLS-SRP is not supported by OpenSSL in Fedora
|
||||||
Patch1: 0001-python-pycurl-7.43.0-openssl-srp.patch
|
Patch1: 0001-python-pycurl-7.43.0-openssl-srp.patch
|
||||||
|
|
||||||
|
# drop link-time vs. run-time TLS backend check (#1446850)
|
||||||
|
Patch2: 0002-python-pycurl-7.43.0-tls-backend.patch
|
||||||
|
|
||||||
BuildRequires: libcurl-devel
|
BuildRequires: libcurl-devel
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
BuildRequires: vsftpd
|
BuildRequires: vsftpd
|
||||||
@ -116,6 +120,9 @@ rm -fv tests/fake-curl/libcurl/*.so
|
|||||||
%{python3_sitearch}/%{modname}-%{version}-*.egg-info
|
%{python3_sitearch}/%{modname}-%{version}-*.egg-info
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 02 2017 Kamil Dudka <kdudka@redhat.com> - 7.43.0-9
|
||||||
|
- drop link-time vs. run-time TLS backend check (#1446850)
|
||||||
|
|
||||||
* Thu Apr 27 2017 Kamil Dudka <kdudka@redhat.com> - 7.43.0-8
|
* Thu Apr 27 2017 Kamil Dudka <kdudka@redhat.com> - 7.43.0-8
|
||||||
- make pycurl compile against libcurl-openssl (#1445153)
|
- make pycurl compile against libcurl-openssl (#1445153)
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user