From 61b2e0c368fd4d8f6d6963ca3ba8109f0260f2c4f93c6380a7ebef2b465af50c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Tue, 3 Mar 2020 13:10:06 +0000 Subject: [PATCH] - update to 7.43.0.5 - refresh python-pycurl-7.43.0-tls-backend.patch * added python 3.8 support * officialy ended support for python 2 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pycurl?expand=0&rev=68 --- pycurl-7.43.0.3.tar.gz | 3 --- pycurl-7.43.0.5.tar.gz | 3 +++ python-pycurl-7.43.0-tls-backend.patch | 13 +++++++------ python-pycurl.changes | 8 ++++++++ python-pycurl.spec | 6 ++---- 5 files changed, 20 insertions(+), 13 deletions(-) delete mode 100644 pycurl-7.43.0.3.tar.gz create mode 100644 pycurl-7.43.0.5.tar.gz diff --git a/pycurl-7.43.0.3.tar.gz b/pycurl-7.43.0.3.tar.gz deleted file mode 100644 index 23c4986..0000000 --- a/pycurl-7.43.0.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f08330c5cf79fa8ef68b9912b9901db7ffd34b63e225dce74db56bb21deda8e -size 215003 diff --git a/pycurl-7.43.0.5.tar.gz b/pycurl-7.43.0.5.tar.gz new file mode 100644 index 0000000..c0b2a37 --- /dev/null +++ b/pycurl-7.43.0.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec7dd291545842295b7b56c12c90ffad2976cc7070c98d7b1517b7b6cd5994b3 +size 216877 diff --git a/python-pycurl-7.43.0-tls-backend.patch b/python-pycurl-7.43.0-tls-backend.patch index cb3fb3f..b4c2d04 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(-) -Index: pycurl-7.43.0.3/src/module.c +Index: pycurl-7.43.0.5/src/module.c =================================================================== ---- pycurl-7.43.0.3.orig/src/module.c -+++ pycurl-7.43.0.3/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; @@ -24,7 +24,7 @@ Index: pycurl-7.43.0.3/src/module.c size_t libcurl_version_len, pycurl_version_len; PyObject *xio_module = NULL; PyObject *collections_module = NULL; -@@ -345,26 +345,6 @@ initpycurl(void) +@@ -345,27 +345,6 @@ initpycurl(void) goto error; } @@ -34,6 +34,8 @@ Index: pycurl-7.43.0.3/src/module.c - } 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)) { @@ -47,7 +49,6 @@ Index: pycurl-7.43.0.3/src/module.c - 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++. */ - p_Curl_Type = &Curl_Type; diff --git a/python-pycurl.changes b/python-pycurl.changes index a181d30..899ebb4 100644 --- a/python-pycurl.changes +++ b/python-pycurl.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 3 12:01:13 UTC 2020 - Ondřej Súkup + +- update to 7.43.0.5 +- refresh python-pycurl-7.43.0-tls-backend.patch + * added python 3.8 support + * officialy ended support for python 2 + ------------------------------------------------------------------- Mon Nov 18 10:52:42 UTC 2019 - Tomáš Chvátal diff --git a/python-pycurl.spec b/python-pycurl.spec index 62e70f2..85f52de 100644 --- a/python-pycurl.spec +++ b/python-pycurl.spec @@ -1,7 +1,7 @@ # # spec file for package python-pycurl # -# Copyright (c) 2019 SUSE LLC. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,11 +27,10 @@ %bcond_with test %endif Name: python-pycurl%{psuffix} -Version: 7.43.0.3 +Version: 7.43.0.5 Release: 0 Summary: PycURL -- cURL library module License: LGPL-2.1-or-later AND MIT -Group: Development/Languages/Python URL: http://pycurl.io/ Source: https://files.pythonhosted.org/packages/source/p/pycurl/pycurl-%{version}.tar.gz # PATCH-FIX-OPENSUSE increase_test_timeout.diff -- Increase the timeout in a test so it doesn't fail when obs is overloaded @@ -64,7 +63,6 @@ This module provides bindings for the cURL library. %package -n %{name}-doc Summary: Documentation for python-curl -Group: Development/Libraries/Python Requires: %{name} = %{version} Provides: %{python_module pycurl-doc = %{version}} BuildArch: noarch