From 7f51a7654582fcf9d37445544b22c77339bd8cfa Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Apr 27 2017 08:52:11 +0000 Subject: Related: #1445153 - make pycurl compile against libcurl-openssl --- diff --git a/0001-python-pycurl-7.43.0-openssl-srp.patch b/0001-python-pycurl-7.43.0-openssl-srp.patch new file mode 100644 index 0000000..360f07f --- /dev/null +++ b/0001-python-pycurl-7.43.0-openssl-srp.patch @@ -0,0 +1,26 @@ +From 39f89cacbe7c6b88e9c79d2a20b396c5bcbe2e2e Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Tue, 18 Apr 2017 17:40:00 +0200 +Subject: [PATCH] tests/option_constants_test.py: disable TLS-SRP test + +... because the build of OpenSSL in Fedora does not support it +--- + tests/option_constants_test.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/option_constants_test.py b/tests/option_constants_test.py +index 8f3ce82..0aa648a 100644 +--- a/tests/option_constants_test.py ++++ b/tests/option_constants_test.py +@@ -421,7 +421,7 @@ class OptionConstantsSettingTest(unittest.TestCase): + assert self.curl.PROTO_SMBS is not None + + @util.min_libcurl(7, 21, 4) +- @util.only_ssl_backends('openssl', 'gnutls') ++ @util.only_ssl_backends('openssl-with-srp', 'gnutls') + def test_tlsauth(self): + self.curl.setopt(self.curl.TLSAUTH_TYPE, "SRP") + self.curl.setopt(self.curl.TLSAUTH_USERNAME, "test") +-- +2.9.3 + diff --git a/python-pycurl.spec b/python-pycurl.spec index 119dff5..ec3f1dc 100644 --- a/python-pycurl.spec +++ b/python-pycurl.spec @@ -2,14 +2,16 @@ Name: python-%{modname} Version: 7.43.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A Python interface to libcurl License: LGPLv2+ or MIT URL: http://pycurl.sourceforge.net/ Source0: https://dl.bintray.com/pycurl/pycurl/pycurl-%{version}.tar.gz -BuildRequires: curl-devel >= 7.21.5 +Patch1: 0001-python-pycurl-7.43.0-openssl-srp.patch + +BuildRequires: libcurl-devel BuildRequires: openssl-devel BuildRequires: vsftpd @@ -65,7 +67,7 @@ of features. Python 3 version. %prep -%autosetup -n %{modname}-%{version} +%autosetup -n %{modname}-%{version} -p1 # remove binaries packaged by upstream rm -f tests/fake-curl/libcurl/*.so @@ -82,8 +84,8 @@ sed -e 's/ --show-skipped//' \ -i tests/run.sh %build -%py2_build -- --with-nss -%py3_build -- --with-nss +%py2_build -- --with-openssl +%py3_build -- --with-openssl %install %py2_install @@ -114,6 +116,9 @@ rm -fv tests/fake-curl/libcurl/*.so %{python3_sitearch}/%{modname}-%{version}-*.egg-info %changelog +* Thu Apr 27 2017 Kamil Dudka - 7.43.0-8 +- make pycurl compile against libcurl-openssl (#1445153) + * Sat Feb 11 2017 Fedora Release Engineering - 7.43.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild