From 2c6fe7918e78779e06f1a7497682121cb2d6896594ae9017245f3a55fd3d984f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 23 Jul 2019 10:28:57 +0000 Subject: [PATCH] - Update to 7.43.0.3: * This release primarily fixes an OpenSSL-related installation issue, and repairs the ability to use PycURL with newer libcurls compiled without FTP support. - Rebase patch: * python-pycurl-7.43.0-tls-backend.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pycurl?expand=0&rev=64 --- pycurl-7.43.0.2.tar.gz | 3 --- pycurl-7.43.0.3.tar.gz | 3 +++ python-pycurl-7.43.0-tls-backend.patch | 15 +++++++-------- python-pycurl.changes | 10 ++++++++++ python-pycurl.spec | 10 +++++----- 5 files changed, 25 insertions(+), 16 deletions(-) delete mode 100644 pycurl-7.43.0.2.tar.gz create mode 100644 pycurl-7.43.0.3.tar.gz diff --git a/pycurl-7.43.0.2.tar.gz b/pycurl-7.43.0.2.tar.gz deleted file mode 100644 index 0e7a031..0000000 --- a/pycurl-7.43.0.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f0cdfc7a92d4f2a5c44226162434e34f7d6967d3af416a6f1448649c09a25a4 -size 214212 diff --git a/pycurl-7.43.0.3.tar.gz b/pycurl-7.43.0.3.tar.gz new file mode 100644 index 0000000..23c4986 --- /dev/null +++ b/pycurl-7.43.0.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f08330c5cf79fa8ef68b9912b9901db7ffd34b63e225dce74db56bb21deda8e +size 215003 diff --git a/python-pycurl-7.43.0-tls-backend.patch b/python-pycurl-7.43.0-tls-backend.patch index 2d8b547..cb3fb3f 100644 --- a/python-pycurl-7.43.0-tls-backend.patch +++ b/python-pycurl-7.43.0-tls-backend.patch @@ -11,10 +11,10 @@ Bug: https://bugzilla.redhat.com/1446850 src/module.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) -diff --git a/src/module.c b/src/module.c -index a7108a0..af79875 100644 ---- a/src/module.c -+++ b/src/module.c +Index: pycurl-7.43.0.3/src/module.c +=================================================================== +--- pycurl-7.43.0.3.orig/src/module.c ++++ pycurl-7.43.0.3/src/module.c @@ -322,7 +322,7 @@ initpycurl(void) { PyObject *m, *d; @@ -24,7 +24,7 @@ index a7108a0..af79875 100644 size_t libcurl_version_len, pycurl_version_len; PyObject *xio_module = NULL; PyObject *collections_module = NULL; -@@ -345,24 +345,6 @@ initpycurl(void) +@@ -345,26 +345,6 @@ initpycurl(void) goto error; } @@ -38,6 +38,8 @@ index a7108a0..af79875 100644 - 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"; - } @@ -49,6 +51,3 @@ index a7108a0..af79875 100644 /* 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 - diff --git a/python-pycurl.changes b/python-pycurl.changes index 9abe935..78527bf 100644 --- a/python-pycurl.changes +++ b/python-pycurl.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jul 23 10:20:14 UTC 2019 - Tomáš Chvátal + +- Update to 7.43.0.3: + * This release primarily fixes an OpenSSL-related installation issue, and + repairs the ability to use PycURL with newer libcurls compiled without + FTP support. +- Rebase patch: + * python-pycurl-7.43.0-tls-backend.patch + ------------------------------------------------------------------- Mon Apr 8 15:35:42 CEST 2019 - Matej Cepl diff --git a/python-pycurl.spec b/python-pycurl.spec index 4c6ed3e..8eb1449 100644 --- a/python-pycurl.spec +++ b/python-pycurl.spec @@ -18,7 +18,6 @@ %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} - %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" %define psuffix -test @@ -28,7 +27,7 @@ %bcond_with test %endif Name: python-pycurl%{psuffix} -Version: 7.43.0.2 +Version: 7.43.0.3 Release: 0 Summary: PycURL -- cURL library module License: LGPL-2.1-or-later AND MIT @@ -45,9 +44,10 @@ Patch3: disable_randomly_failing_tests.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes -BuildRequires: libcurl-devel >= 7.19.0 -BuildRequires: openssl-devel +BuildRequires: pkgconfig BuildRequires: python-rpm-macros +BuildRequires: pkgconfig(libcurl) >= 7.19.0 +BuildRequires: pkgconfig(openssl) %if %{with test} BuildRequires: %{python_module bottle} BuildRequires: %{python_module flaky} @@ -81,7 +81,7 @@ This package contains documentation and examples. %build export CFLAGS="%{optflags} -fno-strict-aliasing" export PYCURL_SSL_LIBRARY=openssl -%python_build --with-ssl +%python_build --with-openssl %install export PYCURL_SSL_LIBRARY=openssl