diff --git a/0002-python-pycurl-7.43.0-tls-backend.patch b/0002-python-pycurl-7.43.0-tls-backend.patch index 1d6da04..3543bb7 100644 --- a/0002-python-pycurl-7.43.0-tls-backend.patch +++ b/0002-python-pycurl-7.43.0-tls-backend.patch @@ -10,12 +10,11 @@ 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 -@@ -322,7 +322,7 @@ initpycurl(void) + +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; @@ -24,7 +23,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,28 +345,6 @@ goto error; } @@ -34,10 +33,14 @@ index a7108a0..af79875 100644 - } 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"; - } @@ -49,6 +52,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/pycurl-7.43.0.2.tar.gz b/pycurl-7.43.0.2.tar.gz deleted file mode 100644 index a699163..0000000 Binary files a/pycurl-7.43.0.2.tar.gz and /dev/null differ diff --git a/pycurl-7.43.0.5.tar.gz b/pycurl-7.43.0.5.tar.gz new file mode 100644 index 0000000..f530f09 Binary files /dev/null and b/pycurl-7.43.0.5.tar.gz differ diff --git a/python-pycurl.spec b/python-pycurl.spec index 55fded7..49a404e 100644 --- a/python-pycurl.spec +++ b/python-pycurl.spec @@ -5,8 +5,8 @@ %global libcurl_ver %(sed %{libcurl_sed} %{curlver_h} 2>/dev/null || echo 0) Name: python-pycurl -Version: 7.43.0.2 -Release: 6 +Version: 7.43.0.5 +Release: 1 Summary: A Python interface to libcurl License: LGPLv2+ or MIT URL: http://pycurl.sourceforge.net/ @@ -22,6 +22,7 @@ objects identified by a URL from a Python program, similar to the urllib Python module. PycURL is mature, very fast, and supports a lot of features. + %package devel Summary: Development files for %{name} Requires: %{name} = %{version}-%{release} @@ -31,23 +32,6 @@ This package contains development files for %{name} %package_help -%if 0%{?with_python2} -%package -n python2-pycurl -Summary: Python interface to libcurl for Python 2 -%{?python_provide:%python_provide python2-pycurl} -BuildRequires: python2-devel python2-bottle python2-nose -Requires: libcurl >= %{libcurl_ver} - -Provides: pycurl = %{version}-%{release} - -%description -n python2-pycurl -PycURL is a Python interface to libcurl. PycURL can be used to fetch -objects identified by a URL from a Python program, similar to the -urllib Python module. PycURL is mature, very fast, and supports a lot -of features. -This package if for Python2. -%endif - %package -n python3-pycurl Summary: Python interface to libcurl for Python 3 %{?python_provide:%python_provide python3-pycurl} @@ -63,7 +47,8 @@ This package is for Python3. %prep %autosetup -n pycurl-%{version} -p1 - +rm -f winbuild.py +sed -e 's| winbuild.py||' -i Makefile # remove binaries packaged by upstream rm -f tests/fake-curl/libcurl/*.so # remove a failed test-case that relies on sftp://web.sourceforge.net being available @@ -78,17 +63,10 @@ sed -e 's/ --show-skipped//' \ -i tests/run.sh %build -%if 0%{?with_python2} -%py2_build -- --with-openssl -%endif - %py3_build -- --with-openssl %install export PYCURL_SSL_LIBRARY=openssl -%if 0%{?with_python2} -%py2_install -%endif %py3_install rm -rf %{buildroot}%{_datadir}/doc/pycurl @@ -107,15 +85,6 @@ rm -fv tests/fake-curl/libcurl/*.so %defattr(-,root,root) %doc ChangeLog README.rst doc -%if 0%{?with_python2} -%files -n python2-pycurl -%defattr(-,root,root) -%license COPYING-LGPL COPYING-MIT -%{python2_sitearch}/curl/ -%{python2_sitearch}/pycurl.so -%{python2_sitearch}/pycurl-%{version}-*.egg-info -%endif - %files -n python3-pycurl %defattr(-,root,root) %license COPYING-LGPL COPYING-MIT @@ -124,6 +93,9 @@ rm -fv tests/fake-curl/libcurl/*.so %{python3_sitearch}/pycurl-%{version}-*.egg-info %changelog +* Thu Aug 4 2020 shixuantong - 7.43.0.5-1 +- update to 7.43.0.5 + * Fri Oct 25 2019 openEuler Buildteam - 7.43.0.2-6 - optimize spec file.