!6 Upgrade python-pycurl to 7.43.0.6 in master
From: @s17723959267 Reviewed-by: @xiezhipeng1 Signed-off-by: @xiezhipeng1
This commit is contained in:
commit
40f8a1ec95
@ -1,54 +0,0 @@
|
|||||||
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 | 20 +-------------------
|
|
||||||
1 file changed, 1 insertion(+), 19 deletions(-)
|
|
||||||
|
|
||||||
diff -Naur a/src/module.c b/src/module.c
|
|
||||||
--- a/src/module.c 2019-07-05 07:24:02.000000000 +0800
|
|
||||||
+++ b/src/module.c 2020-08-04 10:31:28.845250826 +0800
|
|
||||||
@@ -322,7 +322,7 @@
|
|
||||||
{
|
|
||||||
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 *xio_module = NULL;
|
|
||||||
PyObject *collections_module = NULL;
|
|
||||||
@@ -345,28 +345,6 @@
|
|
||||||
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) ||
|
|
||||||
- !strncmp(vi->ssl_version, "BoringSSL", 9)) {
|
|
||||||
- runtime_ssl_lib = "openssl";
|
|
||||||
- } else if (!strncmp(vi->ssl_version, "wolfSSL/", 8)) {
|
|
||||||
- runtime_ssl_lib = "wolfssl";
|
|
||||||
- } 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 if (!strncmp(vi->ssl_version, "mbedTLS/", 8)) {
|
|
||||||
- runtime_ssl_lib = "mbedtls";
|
|
||||||
- } 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;
|
|
||||||
Binary file not shown.
BIN
pycurl-7.43.0.6.tar.gz
Normal file
BIN
pycurl-7.43.0.6.tar.gz
Normal file
Binary file not shown.
@ -3,16 +3,16 @@
|
|||||||
%global libcurl_sed '/^#define LIBCURL_VERSION "/!d;s/"[^"]*$//;s/.*"//;q'
|
%global libcurl_sed '/^#define LIBCURL_VERSION "/!d;s/"[^"]*$//;s/.*"//;q'
|
||||||
%global curlver_h /usr/include/curl/curlver.h
|
%global curlver_h /usr/include/curl/curlver.h
|
||||||
%global libcurl_ver %(sed %{libcurl_sed} %{curlver_h} 2>/dev/null || echo 0)
|
%global libcurl_ver %(sed %{libcurl_sed} %{curlver_h} 2>/dev/null || echo 0)
|
||||||
|
%global srcname pycurl
|
||||||
|
|
||||||
Name: python-pycurl
|
Name: python-%{srcname}
|
||||||
Version: 7.43.0.5
|
Version: 7.43.0.6
|
||||||
Release: 2
|
Release: 1
|
||||||
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: %{pypi_source}
|
||||||
# drop link-time vs. run-time TLS backend check (#1446850)
|
# drop link-time vs. run-time TLS backend check (#1446850)
|
||||||
Patch0: 0002-python-pycurl-7.43.0-tls-backend.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc libcurl-devel openssl-devel vsftpd
|
BuildRequires: gcc libcurl-devel openssl-devel vsftpd
|
||||||
|
|
||||||
@ -93,6 +93,9 @@ rm -fv tests/fake-curl/libcurl/*.so
|
|||||||
%{python3_sitearch}/pycurl-%{version}-*.egg-info
|
%{python3_sitearch}/pycurl-%{version}-*.egg-info
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 2 2021 shangyibin <shangyibin1@huawei.com> - 7.43.0.6-1
|
||||||
|
- Upgrade to version 7.43.0.6
|
||||||
|
|
||||||
* Mon Nov 9 2020 wangjie<wangjie294@huawei.com> -7.43.0.5-2
|
* Mon Nov 9 2020 wangjie<wangjie294@huawei.com> -7.43.0.5-2
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user