Compare commits
No commits in common. "b619504d399a85106dad01ddf1885bd15e064a8c" and "b0683fdd9386e4046e42049fa9d89920a83ebfaf" have entirely different histories.
b619504d39
...
b0683fdd93
54
0002-python-pycurl-7.43.0-tls-backend.patch
Normal file
54
0002-python-pycurl-7.43.0-tls-backend.patch
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
From 36dcccb94bef72a7c4cf6acf7479f18568e545bb Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
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 | 20 +-------------------
|
||||||
|
1 file changed, 1 insertion(+), 19 deletions(-)
|
||||||
|
|
||||||
|
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;
|
||||||
|
- 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;
|
||||||
|
@@ -345,28 +345,6 @@
|
||||||
|
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) ||
|
||||||
|
- !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";
|
||||||
|
- }
|
||||||
|
- 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;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
/* 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;
|
||||||
BIN
pycurl-7.43.0.5.tar.gz
Normal file
BIN
pycurl-7.43.0.5.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
@ -3,21 +3,19 @@
|
|||||||
%global libcurl_sed '/^#define LIBCURL_VERSION "/!d;s/"[^"]*$//;s/.*"//;q'
|
%global libcurl_sed '/^#define LIBCURL_VERSION "/!d;s/"[^"]*$//;s/.*"//;q'
|
||||||
%global curlver_h /usr/include/curl/curlver.h
|
%global curlver_h /usr/include/curl/curlver.h
|
||||||
%global libcurl_ver %(sed %{libcurl_sed} %{curlver_h} 2>/dev/null || echo 0)
|
%global libcurl_ver %(sed %{libcurl_sed} %{curlver_h} 2>/dev/null || echo 0)
|
||||||
%global srcname pycurl
|
|
||||||
|
|
||||||
Name: python-%{srcname}
|
Name: python-pycurl
|
||||||
Version: 7.44.1
|
Version: 7.43.0.5
|
||||||
Release: 3
|
Release: 2
|
||||||
Summary: A Python interface to libcurl
|
Summary: A Python interface to libcurl
|
||||||
License: LGPLv2+ or MIT
|
License: LGPLv2+ or MIT
|
||||||
URL: http://pycurl.sourceforge.net/
|
URL: http://pycurl.sourceforge.net/
|
||||||
Source0: %{pypi_source}
|
Source0: https://dl.bintray.com/pycurl/pycurl/pycurl-%{version}.tar.gz
|
||||||
# drop link-time vs. run-time TLS backend check (#1446850)
|
# drop link-time vs. run-time TLS backend check (#1446850)
|
||||||
|
Patch0: 0002-python-pycurl-7.43.0-tls-backend.patch
|
||||||
|
|
||||||
|
|
||||||
BuildRequires: gcc libcurl-devel openssl-devel vsftpd
|
BuildRequires: gcc libcurl-devel openssl-devel vsftpd
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
PycURL is a Python interface to libcurl. PycURL can be used to fetch
|
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
|
objects identified by a URL from a Python program, similar to the
|
||||||
@ -37,7 +35,7 @@ This package contains development files for %{name}
|
|||||||
%package -n python3-pycurl
|
%package -n python3-pycurl
|
||||||
Summary: Python interface to libcurl for Python 3
|
Summary: Python interface to libcurl for Python 3
|
||||||
%{?python_provide:%python_provide python3-pycurl}
|
%{?python_provide:%python_provide python3-pycurl}
|
||||||
BuildRequires: python3-devel python3-bottle python3-pyflakes python3-pytest
|
BuildRequires: python3-devel python3-bottle python3-nose python3-pyflakes
|
||||||
Requires: libcurl >= %{libcurl_ver}
|
Requires: libcurl >= %{libcurl_ver}
|
||||||
|
|
||||||
%description -n python3-pycurl
|
%description -n python3-pycurl
|
||||||
@ -73,14 +71,9 @@ export PYCURL_SSL_LIBRARY=openssl
|
|||||||
rm -rf %{buildroot}%{_datadir}/doc/pycurl
|
rm -rf %{buildroot}%{_datadir}/doc/pycurl
|
||||||
|
|
||||||
%check
|
%check
|
||||||
# relax crypto policy for the test-suite to make it pass again (#1863711)
|
|
||||||
export OPENSSL_SYSTEM_CIPHERS_OVERRIDE=XXX
|
|
||||||
export OPENSSL_CONF=
|
|
||||||
|
|
||||||
export PYTHONPATH=%{buildroot}%{python3_sitearch}
|
export PYTHONPATH=%{buildroot}%{python3_sitearch}
|
||||||
export PYCURL_SSL_LIBRARY=openssl
|
export PYCURL_SSL_LIBRARY=openssl
|
||||||
export PYCURL_VSFTPD_PATH=vsftpd
|
export PYCURL_VSFTPD_PATH=vsftpd
|
||||||
export PYTEST_ADDOPTS="--ignore examples -m 'not online'"
|
|
||||||
make test PYTHON=%{__python3} NOSETESTS="nosetests-%{python3_version} -v" PYFLAKES=true
|
make test PYTHON=%{__python3} NOSETESTS="nosetests-%{python3_version} -v" PYFLAKES=true
|
||||||
rm -fv tests/fake-curl/libcurl/*.so
|
rm -fv tests/fake-curl/libcurl/*.so
|
||||||
|
|
||||||
@ -100,25 +93,13 @@ rm -fv tests/fake-curl/libcurl/*.so
|
|||||||
%{python3_sitearch}/pycurl-%{version}-*.egg-info
|
%{python3_sitearch}/pycurl-%{version}-*.egg-info
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Oct 26 2022 zhangruifang <zhangruifang1@h-partners.com> - 7.44.1-3
|
|
||||||
- Rebuild for next release
|
|
||||||
|
|
||||||
* Wed Dec 29 2021 guozhaorui <guozhaorui1@huawei.com> - 7.44.1-1
|
|
||||||
- update version to 7.44.1
|
|
||||||
|
|
||||||
* Sat Jul 24 2021 shixuantong <shixuantong@huawei.com> - 7.43.0.6-2
|
|
||||||
- fix test fail for test_sslversion_options, test_failonerror and test_failonerror_status_line_invalid_utf8_python3
|
|
||||||
|
|
||||||
* Tue Feb 2 2021 shangyibin <shangyibin1@huawei.com> - 7.43.0.6-1
|
|
||||||
- Upgrade to version 7.43.0.6
|
|
||||||
|
|
||||||
* Mon Nov 9 2020 wangjie<wangjie294@huawei.com> -7.43.0.5-2
|
* Mon Nov 9 2020 wangjie<wangjie294@huawei.com> -7.43.0.5-2
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
- SUG:NA
|
- SUG:NA
|
||||||
- DESC:fix compile error
|
- DESC:fix compile error
|
||||||
|
|
||||||
* Tue Aug 4 2020 shixuantong <shixuantong@huawei.com> - 7.43.0.5-1
|
* Thu Aug 4 2020 shixuantong <shixuantong@huawei.com> - 7.43.0.5-1
|
||||||
- update to 7.43.0.5
|
- update to 7.43.0.5
|
||||||
|
|
||||||
* Fri Oct 25 2019 openEuler Buildteam <buildteam@openeuler.org> - 7.43.0.2-6
|
* Fri Oct 25 2019 openEuler Buildteam <buildteam@openeuler.org> - 7.43.0.2-6
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user