Hello community, here is the log from the commit of package python-pycurl for openSUSE:Factory checked in at 2018-08-31 09:51:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pycurl (Old) and /work/SRC/openSUSE:Factory/.python-pycurl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pycurl" Fri Aug 31 09:51:56 2018 rev:23 rq:632305 version:7.43.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pycurl/python-pycurl.changes 2018-08-17 23:57:31.229898371 +0200 +++ /work/SRC/openSUSE:Factory/.python-pycurl.new/python-pycurl.changes 2018-08-31 09:51:57.665610307 +0200 @@ -1,0 +2,11 @@ +Thu Aug 30 12:36:12 UTC 2018 - Tomáš Chvátal <[email protected]> + +- Add patch to match up Fedora on how we detect tls backend on runtime + * python-pycurl-7.43.0-tls-backend.patch + +------------------------------------------------------------------- +Wed Aug 29 08:33:02 UTC 2018 - [email protected] + +- Make sure we build on Leap 42.3 + +------------------------------------------------------------------- New: ---- python-pycurl-7.43.0-tls-backend.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pycurl.spec ++++++ --- /var/tmp/diff_new_pack.sFKIXs/_old 2018-08-31 09:51:58.089611375 +0200 +++ /var/tmp/diff_new_pack.sFKIXs/_new 2018-08-31 09:51:58.093611385 +0200 @@ -30,6 +30,8 @@ Patch0: increase_test_timeout.diff # PATCH-FIX-UPSTREAM handle difference between libssh and libssh2 Patch1: pycurl-libssh.patch +# PATCH-FIX-OPENSUSE python-pycurl-7.43.0-tls-backend.patch -- do not run runtime tests to compare linked libs +Patch2: python-pycurl-7.43.0-tls-backend.patch BuildRequires: %{python_module bottle} BuildRequires: %{python_module devel} BuildRequires: %{python_module flaky} @@ -61,8 +63,7 @@ %prep %setup -q -n pycurl-%{version} -%patch0 -p1 -%patch1 -p1 +%autopatch -p1 %build export CFLAGS="%{optflags} -fno-strict-aliasing" @@ -72,7 +73,9 @@ %install export PYCURL_SSL_LIBRARY=openssl %python_install --with-openssl + rm -rf %{buildroot}%{_datadir}/doc # Remove wrongly installed junk + %python_expand %fdupes %{buildroot}%{$python_sitelib} %check @@ -92,7 +95,7 @@ test_flags="$test_flags,\!ssh" fi %{python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} \ -nosetests-%$python_bin_suffix -v --with-flaky -a "$test_flags" -e test_writefunction_collection +nosetests-%$python_bin_suffix -v --with-flaky -a "$test_flags" } %files %{python_files} ++++++ python-pycurl-7.43.0-tls-backend.patch ++++++ >From 36dcccb94bef72a7c4cf6acf7479f18568e545bb Mon Sep 17 00:00:00 2001 From: Kamil Dudka <[email protected]> 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 --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) { 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,24 +345,6 @@ initpycurl(void) 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, "GnuTLS/", 7)) { - runtime_ssl_lib = "gnutls"; - } else if (!strncmp(vi->ssl_version, "NSS/", 4)) { - runtime_ssl_lib = "nss"; - } 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; -- 2.10.2
