forked from pool/python-pycurl
- update to 7.43.0.6:
* Fixed offset parameter usage in seek callback * Added support for libcurl SSL backend detection via `curl-config --ssl-backends` * Added support for libcurl MultiSSL * Added ability to unset CURLOPT_PROXY. * Added support for CURLOPT_UPLOAD_BUFFERSIZE * Added support for CURLOPT_MAXAGE_CONN * Added support for sharing connection cache in libcurl * Added support for CURLOPT_HAPROXYPROTOCOL * CC and CFLAGS environment variables are now respected when building * Fixed OpenSSL detection on CentOS 7 and 8 * surrogateescape error handler is used in multi_info_read to handle invalid UTF-8. - drop python-pycurl-7.43.0-tls-backend.patch (upstream) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pycurl?expand=0&rev=81
This commit is contained in:
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:ec7dd291545842295b7b56c12c90ffad2976cc7070c98d7b1517b7b6cd5994b3
|
|
||||||
size 216877
|
|
3
pycurl-7.43.0.6.tar.gz
Normal file
3
pycurl-7.43.0.6.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:8301518689daefa53726b59ded6b48f33751c383cf987b0ccfbbc4ed40281325
|
||||||
|
size 222895
|
@@ -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(-)
|
|
||||||
|
|
||||||
Index: pycurl-7.43.0.5/src/module.c
|
|
||||||
===================================================================
|
|
||||||
--- pycurl-7.43.0.5.orig/src/module.c
|
|
||||||
+++ pycurl-7.43.0.5/src/module.c
|
|
||||||
@@ -322,7 +322,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 *xio_module = NULL;
|
|
||||||
PyObject *collections_module = NULL;
|
|
||||||
@@ -345,27 +345,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) ||
|
|
||||||
- !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++. */
|
|
@@ -1,3 +1,22 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jan 28 23:06:36 UTC 2021 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
- update to 7.43.0.6:
|
||||||
|
* Fixed offset parameter usage in seek callback
|
||||||
|
* Added support for libcurl SSL backend detection via
|
||||||
|
`curl-config --ssl-backends`
|
||||||
|
* Added support for libcurl MultiSSL
|
||||||
|
* Added ability to unset CURLOPT_PROXY.
|
||||||
|
* Added support for CURLOPT_UPLOAD_BUFFERSIZE
|
||||||
|
* Added support for CURLOPT_MAXAGE_CONN
|
||||||
|
* Added support for sharing connection cache in libcurl
|
||||||
|
* Added support for CURLOPT_HAPROXYPROTOCOL
|
||||||
|
* CC and CFLAGS environment variables are now respected when building
|
||||||
|
* Fixed OpenSSL detection on CentOS 7 and 8
|
||||||
|
* surrogateescape error handler is used in multi_info_read to handle
|
||||||
|
invalid UTF-8.
|
||||||
|
- drop python-pycurl-7.43.0-tls-backend.patch (upstream)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Dec 15 12:56:23 UTC 2020 - Matej Cepl <mcepl@suse.com>
|
Tue Dec 15 12:56:23 UTC 2020 - Matej Cepl <mcepl@suse.com>
|
||||||
|
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package python-pycurl
|
# spec file for package python-pycurl
|
||||||
#
|
#
|
||||||
# Copyright (c) 2020 SUSE LLC
|
# Copyright (c) 2021 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@@ -27,7 +27,7 @@
|
|||||||
%bcond_with test
|
%bcond_with test
|
||||||
%endif
|
%endif
|
||||||
Name: python-pycurl%{psuffix}
|
Name: python-pycurl%{psuffix}
|
||||||
Version: 7.43.0.5
|
Version: 7.43.0.6
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: PycURL -- cURL library module
|
Summary: PycURL -- cURL library module
|
||||||
License: LGPL-2.1-or-later AND MIT
|
License: LGPL-2.1-or-later AND MIT
|
||||||
@@ -37,8 +37,6 @@ Source: https://files.pythonhosted.org/packages/source/p/pycurl/pycurl-%
|
|||||||
Patch0: increase_test_timeout.diff
|
Patch0: increase_test_timeout.diff
|
||||||
# PATCH-FIX-UPSTREAM handle difference between libssh and libssh2
|
# PATCH-FIX-UPSTREAM handle difference between libssh and libssh2
|
||||||
Patch1: pycurl-libssh.patch
|
Patch1: pycurl-libssh.patch
|
||||||
# PATCH-FIX-OPENSUSE python-pycurl-7.43.0-tls-backend.patch -- do not run runtime tests to compare linked libs
|
|
||||||
Patch2: python-pycurl-7.43.0-tls-backend.patch
|
|
||||||
Patch3: disable_randomly_failing_tests.patch
|
Patch3: disable_randomly_failing_tests.patch
|
||||||
# PATCH-FEATURE-UPSTREAM remove_nose.patch gh#pycurl/pycurl#655 mcepl@suse.com
|
# PATCH-FEATURE-UPSTREAM remove_nose.patch gh#pycurl/pycurl#655 mcepl@suse.com
|
||||||
# remove dependency on nose
|
# remove dependency on nose
|
||||||
|
Reference in New Issue
Block a user