diff --git a/0001-python-pycurl-7.45.1-tls-backend.patch b/0001-python-pycurl-7.45.1-tls-backend.patch deleted file mode 100644 index 04eb575552fbb02bd66fd2a30dea06b63fa587c0..0000000000000000000000000000000000000000 --- a/0001-python-pycurl-7.45.1-tls-backend.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 9a5bfbe011be8d79e4bde1f8db2369beb063eb3a Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Tue, 2 May 2017 17:19:20 +0200 -Subject: [PATCH] module: drop link-time vs. run-time TLS backend check - -This effectively reverts the following commit: -8891398a31119ce7c872509ed60328926c51cdfb - -Bug: https://bugzilla.redhat.com/1446850 ---- - src/module.c | 69 ---------------------------------------------------- - 1 file changed, 69 deletions(-) - -diff --git a/src/module.c b/src/module.c -index a81391f..b87d1d5 100644 ---- a/src/module.c -+++ b/src/module.c -@@ -336,15 +336,6 @@ initpycurl(void) - PyObject *collections_module = NULL; - PyObject *named_tuple = NULL; - PyObject *arglist = NULL; --#ifdef HAVE_CURL_GLOBAL_SSLSET -- const curl_ssl_backend **ssllist = NULL; -- CURLsslset sslset; -- int i, runtime_supported_backend_found = 0; -- char backends[200]; -- size_t backends_len = 0; --#else -- const char *runtime_ssl_lib; --#endif - - assert(Curl_Type.tp_weaklistoffset > 0); - assert(CurlMulti_Type.tp_weaklistoffset > 0); -@@ -362,69 +353,6 @@ initpycurl(void) - goto error; - } - -- /* Our compiled crypto locks should correspond to runtime ssl library. */ --#ifdef HAVE_CURL_GLOBAL_SSLSET -- sslset = curl_global_sslset(-1, COMPILE_SSL_LIB, &ssllist); -- if (sslset != CURLSSLSET_OK) { -- if (sslset == CURLSSLSET_NO_BACKENDS) { -- strcpy(backends, "none"); -- } else { -- for (i = 0; ssllist[i] != NULL; i++) { -- switch (ssllist[i]->id) { -- case CURLSSLBACKEND_OPENSSL: -- case CURLSSLBACKEND_GNUTLS: -- case CURLSSLBACKEND_NSS: -- case CURLSSLBACKEND_WOLFSSL: -- case CURLSSLBACKEND_SCHANNEL: -- case CURLSSLBACKEND_MBEDTLS: --#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 64, 1) -- case CURLSSLBACKEND_SECURETRANSPORT: --#else -- case CURLSSLBACKEND_DARWINSSL: --#endif -- runtime_supported_backend_found = 1; -- break; -- default: -- break; -- } -- if (backends_len < sizeof(backends)) { -- backends_len += snprintf(backends + backends_len, sizeof(backends) - backends_len, "%s%s", (i > 0) ? ", " : "", ssllist[i]->name); -- } -- } -- } -- /* Don't error if both the curl library and pycurl itself is compiled without SSL */ -- if (runtime_supported_backend_found || COMPILE_SUPPORTED_SSL_BACKEND_FOUND) { -- PyErr_Format(PyExc_ImportError, "pycurl: libcurl link-time ssl backends (%s) do not include compile-time ssl backend (%s)", backends, COMPILE_SSL_LIB); -- goto error; -- } -- } --#else -- if (vi->ssl_version == NULL) { -- runtime_ssl_lib = "none/other"; -- } 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 if (!strncmp(vi->ssl_version, "Secure Transport", 16)) { -- runtime_ssl_lib = "secure-transport"; -- } else if (!strncmp(vi->ssl_version, "Schannel", 8)) { -- runtime_ssl_lib = "schannel"; -- } else { -- runtime_ssl_lib = "none/other"; -- } -- if (strcmp(runtime_ssl_lib, COMPILE_SSL_LIB)) { -- 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; -- } --#endif -- - /* 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.35.1 - diff --git a/0002-python-pycurl-7.45.4-disable-test_SRP.patch b/0002-python-pycurl-7.45.4-disable-test_SRP.patch deleted file mode 100644 index 6118368bfe574a18b0ed6f02802d4011aa817af0..0000000000000000000000000000000000000000 --- a/0002-python-pycurl-7.45.4-disable-test_SRP.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6c55e6822a064edb8dd6dfe1ee21080f4f30b5cf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= -Date: Tue, 7 Mar 2023 16:32:19 +0100 -Subject: [PATCH] tests: temporarily disable test_proxy_tlsauth SRP - -disable SRP ---- - tests/option_constants_test.py | 11 ---- - 1 file changed, 11 deletions(-) - -diff --git a/tests/option_constants_test.py b/tests/option_constants_test.py -index 7b94164..04dc3da 100644 ---- a/tests/option_constants_test.py -+++ b/tests/option_constants_test.py -@@ -457,15 +457,6 @@ - curl.close() - - # Apparently TLSAUTH_TYPE=SRP is an unknown option on appveyor -- @util.only_unix -- @util.min_libcurl(7, 52, 0) -- @util.only_ssl_backends('openssl', 'gnutls', 'schannel') -- def test_proxy_tlsauth(self): -- curl = pycurl.Curl() -- curl.setopt(curl.PROXY_TLSAUTH_USERNAME, "test") -- curl.setopt(curl.PROXY_TLSAUTH_PASSWORD, "test") -- curl.close() -- - @util.min_libcurl(7, 71, 0) - @util.only_ssl - def test_proxy_issuercert(self): --- -2.39.2 diff --git a/pycurl-7.45.4.tar.gz b/pycurl-7.45.4.tar.gz deleted file mode 100644 index e0f34407e55c73e31644eb07fa1c452da2e9fee8..0000000000000000000000000000000000000000 Binary files a/pycurl-7.45.4.tar.gz and /dev/null differ diff --git a/pycurl-7.45.6.tar.gz b/pycurl-7.45.6.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..66ce47c96783adb281caa441a1c35568c9b96a2c Binary files /dev/null and b/pycurl-7.45.6.tar.gz differ diff --git a/python-pycurl.spec b/python-pycurl.spec index c3c4d7998965282a5fe0f72c68fd7ddefb0eb24c..a2bde40deccb5450db6baffceecc5865ca5409d6 100644 --- a/python-pycurl.spec +++ b/python-pycurl.spec @@ -6,15 +6,12 @@ %global srcname pycurl Name: python-%{srcname} -Version: 7.45.4 +Version: 7.45.6 Release: 1 Summary: A Python interface to libcurl License: LGPL-2.0-or-later or MIT -URL: http://pycurl.sourceforge.net/ +URL: http://pycurl.io/ Source0: %{pypi_source} -# drop link-time vs. run-time TLS backend check (#1446850) -Patch1: 0001-python-pycurl-7.45.1-tls-backend.patch -Patch2: 0002-python-pycurl-7.45.4-disable-test_SRP.patch BuildRequires: gcc libcurl-devel openssl-devel vsftpd @@ -98,6 +95,10 @@ rm -fv tests/fake-curl/libcurl/*.so %{python3_sitearch}/pycurl-%{version}-*.egg-info %changelog +* Tue Sep 2 2025 Han Jinpeng - 7.45.6-1 +- update to 7.45.6 +- update URL + * Wed Jan 15 2025 Funda Wang - 7.45.4-1 - update to 7.45.4