diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-02-09 15:14:59 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-02-09 15:14:59 +0100 |
| commit | 50a93adc05b611836e740c4b55571890f4c6770a (patch) | |
| tree | db8dfcb8f1d07405a0b546672af116bf1b47a1ee /gnu/packages/patches/fbreader-curl-7.62.patch | |
| parent | 722ac64cd7dc1f09fb77e2ae780427fa13c03110 (diff) | |
| parent | 69fb26d4f51e9d22111cb1360e2941192afee5b9 (diff) | |
| download | guix-50a93adc05b611836e740c4b55571890f4c6770a.tar.gz | |
Merge branch 'staging'
Diffstat (limited to 'gnu/packages/patches/fbreader-curl-7.62.patch')
| -rw-r--r-- | gnu/packages/patches/fbreader-curl-7.62.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/gnu/packages/patches/fbreader-curl-7.62.patch b/gnu/packages/patches/fbreader-curl-7.62.patch new file mode 100644 index 0000000000..e42a3375f0 --- /dev/null +++ b/gnu/packages/patches/fbreader-curl-7.62.patch @@ -0,0 +1,30 @@ +https://github.com/geometer/FBReader/commit/b7c78e965d06f78043a57e230c866c3af3f5a1eb.patch +https://github.com/geometer/FBReader/issues/310 +https://github.com/geometer/FBReader/pull/311/commits + +From b7c78e965d06f78043a57e230c866c3af3f5a1eb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com> +Date: Sun, 9 Dec 2018 10:18:03 +0100 +Subject: [PATCH] fix compatibility with curl-7.62 + +https://github.com/curl/curl/commit/3f3b26d6fe +--- + zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp b/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp +index 54cc37f6c..03e2a5721 100644 +--- a/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp ++++ b/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp +@@ -285,9 +285,11 @@ std::string ZLCurlNetworkManager::perform(const ZLExecutionData::Vector &dataLis + #endif + errors.insert(ZLStringUtil::printf(errorResource["peerFailedVerificationMessage"].value(), ZLNetworkUtil::hostFromUrl(url))); + break; ++#if LIBCURL_VERSION_NUM < 0x073e00 + case CURLE_SSL_CACERT: + errors.insert(ZLStringUtil::printf(errorResource["sslCertificateAuthorityMessage"].value(), ZLNetworkUtil::hostFromUrl(url))); + break; ++#endif + case CURLE_SSL_CACERT_BADFILE: + errors.insert(ZLStringUtil::printf(errorResource["sslBadCertificateFileMessage"].value(), request.sslCertificate().Path)); + break; |