From 1da12d1960f5966360f0ec464cde1719b9b22aa7 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Mon, 4 Jun 2018 12:49:34 +0200 Subject: [PATCH] update to 7.43.0.2 --- 0001-python-pycurl-7.43-winbuild.patch | 44 --------------------- 0002-python-pycurl-7.43.0-tls-backend.patch | 13 +++--- python-pycurl.spec | 12 +++--- sources | 2 +- 4 files changed, 15 insertions(+), 56 deletions(-) delete mode 100644 0001-python-pycurl-7.43-winbuild.patch diff --git a/0001-python-pycurl-7.43-winbuild.patch b/0001-python-pycurl-7.43-winbuild.patch deleted file mode 100644 index b7beca7..0000000 --- a/0001-python-pycurl-7.43-winbuild.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 29deba7cdcbec627151de6482d6d78af55da4dfb Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Wed, 23 May 2018 14:34:08 +0200 -Subject: [PATCH] winbuild.py: use NotImplementedError instead of - NotImplemented - ---- - winbuild.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/winbuild.py b/winbuild.py -index 883255c..7e03290 100644 ---- a/winbuild.py -+++ b/winbuild.py -@@ -337,7 +337,7 @@ class OpensslBuilder(Builder): - - @property - def dll_paths(self): -- raise NotImplemented -+ raise NotImplementedError - - @property - def include_path(self): -@@ -371,7 +371,7 @@ class CaresBuilder(Builder): - - @property - def dll_paths(self): -- raise NotImplemented -+ raise NotImplementedError - - @property - def include_path(self): -@@ -431,7 +431,7 @@ BUILD_STATIC_LIB=1 - - @property - def dll_paths(self): -- raise NotImplemented -+ raise NotImplementedError - - @property - def include_path(self): --- -2.14.3 - diff --git a/0002-python-pycurl-7.43.0-tls-backend.patch b/0002-python-pycurl-7.43.0-tls-backend.patch index 68f2c75..1d6da04 100644 --- a/0002-python-pycurl-7.43.0-tls-backend.patch +++ b/0002-python-pycurl-7.43.0-tls-backend.patch @@ -8,30 +8,31 @@ This effectively reverts the following commit: Bug: https://bugzilla.redhat.com/1446850 --- - src/module.c | 19 +------------------ - 1 file changed, 1 insertion(+), 18 deletions(-) + 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 -@@ -315,7 +315,7 @@ initpycurl(void) +@@ -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; - PyObject *named_tuple = NULL; -@@ -333,23 +333,6 @@ initpycurl(void) +@@ -345,24 +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)) { +- } 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, "GnuTLS/", 7)) { - runtime_ssl_lib = "gnutls"; diff --git a/python-pycurl.spec b/python-pycurl.spec index ec50d53..2f7d333 100644 --- a/python-pycurl.spec +++ b/python-pycurl.spec @@ -15,17 +15,14 @@ %global modname pycurl Name: python-%{modname} -Version: 7.43.0 -Release: 17%{?dist} +Version: 7.43.0.2 +Release: 1%{?dist} Summary: A Python interface to libcurl License: LGPLv2+ or MIT URL: http://pycurl.sourceforge.net/ Source0: https://dl.bintray.com/pycurl/pycurl/pycurl-%{version}.tar.gz -# fix build failure caused by NotImplemented exceptions in winbuild.py -Patch1: 0001-python-pycurl-7.43-winbuild.patch - # drop link-time vs. run-time TLS backend check (#1446850) Patch2: 0002-python-pycurl-7.43.0-tls-backend.patch @@ -118,6 +115,7 @@ sed -e 's/ --show-skipped//' \ %endif %install +export PYCURL_SSL_LIBRARY=openssl %if %{with python2} %py2_install %endif @@ -129,6 +127,7 @@ rm -rf %{buildroot}%{_datadir}/doc/pycurl %if %{with python3} %check export PYTHONPATH=%{buildroot}%{python3_sitearch} +export PYCURL_SSL_LIBRARY=openssl export PYCURL_VSFTPD_PATH=vsftpd make test PYTHON=%{__python3} NOSETESTS="nosetests-%{python3_version} -v" rm -fv tests/fake-curl/libcurl/*.so @@ -153,6 +152,9 @@ rm -fv tests/fake-curl/libcurl/*.so %endif %changelog +* Mon Jun 04 2018 Kamil Dudka - 7.43.0.2-1 +- update to 7.43.0.2 + * Wed May 30 2018 Kamil Dudka - 7.43.0-17 - make the python2 and python3 subpackages optional diff --git a/sources b/sources index c76dcd9..47d78c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c94bdba01da6004fa38325e9bd6b9760 pycurl-7.43.0.tar.gz +SHA512 (pycurl-7.43.0.2.tar.gz) = 8635fb33107c9351b7527036b8ab16d76aad72c2170643928034641770d07ab1507a8b2adc8b1a1dcfff29272f55cb00fee65abfcc0c639db14fdc20fc3a0fd0