14
0
forked from pool/python-pycurl

Accepting request 717837 from devel:languages:python

- 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/request/show/717837
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pycurl?expand=0&rev=30
This commit is contained in:
2019-07-30 11:05:33 +00:00
committed by Git OBS Bridge
5 changed files with 25 additions and 16 deletions

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0f0cdfc7a92d4f2a5c44226162434e34f7d6967d3af416a6f1448649c09a25a4
size 214212

3
pycurl-7.43.0.3.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6f08330c5cf79fa8ef68b9912b9901db7ffd34b63e225dce74db56bb21deda8e
size 215003

View File

@@ -11,10 +11,10 @@ Bug: https://bugzilla.redhat.com/1446850
src/module.c | 20 +------------------- src/module.c | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-) 1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/src/module.c b/src/module.c Index: pycurl-7.43.0.3/src/module.c
index a7108a0..af79875 100644 ===================================================================
--- a/src/module.c --- pycurl-7.43.0.3.orig/src/module.c
+++ b/src/module.c +++ pycurl-7.43.0.3/src/module.c
@@ -322,7 +322,7 @@ initpycurl(void) @@ -322,7 +322,7 @@ initpycurl(void)
{ {
PyObject *m, *d; PyObject *m, *d;
@@ -24,7 +24,7 @@ index a7108a0..af79875 100644
size_t libcurl_version_len, pycurl_version_len; size_t libcurl_version_len, pycurl_version_len;
PyObject *xio_module = NULL; PyObject *xio_module = NULL;
PyObject *collections_module = NULL; PyObject *collections_module = NULL;
@@ -345,24 +345,6 @@ initpycurl(void) @@ -345,26 +345,6 @@ initpycurl(void)
goto error; goto error;
} }
@@ -38,6 +38,8 @@ index a7108a0..af79875 100644
- runtime_ssl_lib = "gnutls"; - runtime_ssl_lib = "gnutls";
- } else if (!strncmp(vi->ssl_version, "NSS/", 4)) { - } else if (!strncmp(vi->ssl_version, "NSS/", 4)) {
- runtime_ssl_lib = "nss"; - runtime_ssl_lib = "nss";
- } else if (!strncmp(vi->ssl_version, "mbedTLS/", 8)) {
- runtime_ssl_lib = "mbedtls";
- } else { - } else {
- runtime_ssl_lib = "none/other"; - 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 /* Initialize the type of the new type objects here; doing it here
* is required for portability to Windows without requiring C++. */ * is required for portability to Windows without requiring C++. */
p_Curl_Type = &Curl_Type; p_Curl_Type = &Curl_Type;
--
2.10.2

View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Jul 23 10:20:14 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- 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 <mcepl@suse.com> Mon Apr 8 15:35:42 CEST 2019 - Matej Cepl <mcepl@suse.com>

View File

@@ -18,7 +18,6 @@
%define oldpython python %define oldpython python
%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?!python_module:%define python_module() python-%{**} python3-%{**}}
%global flavor @BUILD_FLAVOR@%{nil} %global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "test" %if "%{flavor}" == "test"
%define psuffix -test %define psuffix -test
@@ -28,7 +27,7 @@
%bcond_with test %bcond_with test
%endif %endif
Name: python-pycurl%{psuffix} Name: python-pycurl%{psuffix}
Version: 7.43.0.2 Version: 7.43.0.3
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
@@ -45,9 +44,10 @@ Patch3: disable_randomly_failing_tests.patch
BuildRequires: %{python_module devel} BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools} BuildRequires: %{python_module setuptools}
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: libcurl-devel >= 7.19.0 BuildRequires: pkgconfig
BuildRequires: openssl-devel
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
BuildRequires: pkgconfig(libcurl) >= 7.19.0
BuildRequires: pkgconfig(openssl)
%if %{with test} %if %{with test}
BuildRequires: %{python_module bottle} BuildRequires: %{python_module bottle}
BuildRequires: %{python_module flaky} BuildRequires: %{python_module flaky}
@@ -81,7 +81,7 @@ This package contains documentation and examples.
%build %build
export CFLAGS="%{optflags} -fno-strict-aliasing" export CFLAGS="%{optflags} -fno-strict-aliasing"
export PYCURL_SSL_LIBRARY=openssl export PYCURL_SSL_LIBRARY=openssl
%python_build --with-ssl %python_build --with-openssl
%install %install
export PYCURL_SSL_LIBRARY=openssl export PYCURL_SSL_LIBRARY=openssl