diff --git a/pycurl-7.43.0.1.tar.gz b/pycurl-7.43.0.1.tar.gz deleted file mode 100644 index c9f62e5..0000000 --- a/pycurl-7.43.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43231bf2bafde923a6d9bb79e2407342a5f3382c1ef0a3b2e491c6a4e50b91aa -size 195861 diff --git a/pycurl-7.43.0.2.tar.gz b/pycurl-7.43.0.2.tar.gz new file mode 100644 index 0000000..0e7a031 --- /dev/null +++ b/pycurl-7.43.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f0cdfc7a92d4f2a5c44226162434e34f7d6967d3af416a6f1448649c09a25a4 +size 214212 diff --git a/pycurl-libssh.patch b/pycurl-libssh.patch index aff9266..61cc184 100644 --- a/pycurl-libssh.patch +++ b/pycurl-libssh.patch @@ -1,8 +1,6 @@ -Index: pycurl-7.43.0.1/tests/ssh_key_cb_test.py -=================================================================== ---- pycurl-7.43.0.1.orig/tests/ssh_key_cb_test.py 2017-12-03 20:03:17.000000000 +0100 -+++ pycurl-7.43.0.1/tests/ssh_key_cb_test.py 2018-01-30 16:56:42.499858079 +0100 -@@ -30,8 +30,11 @@ class SshKeyCbTest(unittest.TestCase): +--- a/tests/ssh_key_cb_test.py ++++ b/tests/ssh_key_cb_test.py +@@ -33,8 +33,11 @@ class SshKeyCbTest(unittest.TestCase): def keyfunction(known_key, found_key, match): return pycurl.KHSTAT_FINE @@ -16,7 +14,7 @@ Index: pycurl-7.43.0.1/tests/ssh_key_cb_test.py try: self.curl.perform() -@@ -44,8 +47,11 @@ class SshKeyCbTest(unittest.TestCase): +@@ -47,8 +50,11 @@ class SshKeyCbTest(unittest.TestCase): def keyfunction(known_key, found_key, match): return pycurl.KHSTAT_REJECT @@ -30,7 +28,7 @@ Index: pycurl-7.43.0.1/tests/ssh_key_cb_test.py try: self.curl.perform() -@@ -58,8 +64,11 @@ class SshKeyCbTest(unittest.TestCase): +@@ -62,8 +68,11 @@ class SshKeyCbTest(unittest.TestCase): def keyfunction(known_key, found_key, match): return 'bogus' @@ -44,9 +42,9 @@ Index: pycurl-7.43.0.1/tests/ssh_key_cb_test.py try: self.curl.perform() -@@ -77,8 +86,14 @@ class SshKeyCbUnsetTest(unittest.TestCas - +@@ -82,9 +91,15 @@ class SshKeyCbUnsetTest(unittest.TestCas @util.min_libcurl(7, 19, 6) + @util.guard_unknown_libcurl_option def test_keyfunction_none(self): - self.curl.setopt(pycurl.SSH_KEYFUNCTION, None) + try: @@ -55,6 +53,7 @@ Index: pycurl-7.43.0.1/tests/ssh_key_cb_test.py + self.assertEqual(pycurl.E_UNKNOWN_OPTION, e.args[0]) @util.min_libcurl(7, 19, 6) + @util.guard_unknown_libcurl_option def test_keyfunction_unset(self): - self.curl.unsetopt(pycurl.SSH_KEYFUNCTION) + try: diff --git a/python-pycurl.changes b/python-pycurl.changes index 6cf50de..cfb9bb7 100644 --- a/python-pycurl.changes +++ b/python-pycurl.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Tue Jul 10 11:06:40 UTC 2018 - mcepl@suse.com + +- Update to 7.43.0.2: + * Added perform_rb and perform_rs methods to Curl objects to + return response body as byte string and string, respectively. + * Added OPT_COOKIELIST constant for consistency with other + option constants. + * PycURL is now able to report errors triggered by libcurl + via CURLOPT_FAILONERROR mechanism when the error messages are + not decodable in Python's default encoding (GitHub issue #259). + * Added getinfo_raw method to Curl objects to return byte strings + as is from libcurl without attempting to decode them + (GitHub issue #493). + * When adding a Curl easy object to CurlMulti via add_handle, + the easy objects now have their reference counts increased so that + the application is no longer required to keep references to them + to keep them from being garbage collected (GitHub issue #171). + * PycURL easy, multi and share objects can now be weak referenced. + * set_ca_certs now accepts byte strings as it should have been + all along. + * Use OpenSSL 1.1 and 1.0 specific APIs for controlling thread locks + depending on OpenSSL version (patch by Vitaly Murashev). + * Fixed a crash when closesocket callback failed (patch by + Gisle Vanem and toddrme2178). + * Added CURLOPT_PROXY_SSLCERT, CURLOPT_PROXY_SSLCERTTYPE, + CURLOPT_PROXY_SSLKEY, CURLOPT_PROXY_SSLKEYTYPE, + CURLOPT_PROXY_SSL_VERIFYPEER (libcurl 7.52.0+, + patch by Casey Miller). + * Added CURLOPT_PRE_PROXY (libcurl 7.52.0+, patch by ziggy). + * Added SOCKET_BAD constant and it is now recognized as a valid + return value from OPENSOCKET callback. + ------------------------------------------------------------------- Fri Feb 2 13:17:14 UTC 2018 - tchvatal@suse.com diff --git a/python-pycurl.spec b/python-pycurl.spec index 1f5725d..050989b 100644 --- a/python-pycurl.spec +++ b/python-pycurl.spec @@ -19,12 +19,12 @@ %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pycurl -Version: 7.43.0.1 +Version: 7.43.0.2 Release: 0 Summary: PycURL -- cURL library module -License: LGPL-2.1+ AND MIT +License: LGPL-2.1-or-later AND MIT Group: Development/Languages/Python -Url: http://pycurl.sourceforge.net/ +URL: http://pycurl.sourceforge.net/ 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 Patch0: increase_test_timeout.diff @@ -34,6 +34,7 @@ BuildRequires: %{python_module bottle} BuildRequires: %{python_module devel} BuildRequires: %{python_module flaky} BuildRequires: %{python_module nose} +BuildRequires: fdupes BuildRequires: libcurl-devel >= 7.19.0 BuildRequires: openssl-devel BuildRequires: python-rpm-macros @@ -41,8 +42,6 @@ BuildRequires: python-rpm-macros Provides: %{oldpython}-curl = %{version} Obsoletes: %{oldpython}-curl < %{version} %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build - %python_subpackages %description @@ -67,19 +66,23 @@ This package contains documentation and examples. %build export CFLAGS="%{optflags} -fno-strict-aliasing" +export PYCURL_SSL_LIBRARY=openssl %python_build --with-ssl %install -%python_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 +export PYCURL_SSL_LIBRARY=openssl %ifnarch %{arm} aarch64 # taken from "make test" because we only need to run nosetests, # not the rest of the mess in the upstream runner pushd tests/fake-curl/libcurl rm -f *.so -make +make %{?_smp_mflags} popd # exclude certain tests test_flags='!online' @@ -94,12 +97,11 @@ fi %endif %files %{python_files} -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING-LGPL COPYING-MIT README.rst +%license COPYING-LGPL COPYING-MIT +%doc AUTHORS ChangeLog README.rst %{python_sitearch}/* %files -n %{name}-doc -%defattr(-,root,root) %doc examples doc/*.rst %changelog