aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-04-26 15:51:44 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-04-29 20:10:43 +0200
commit05e1534ee81a21b1d8046ac2e21d5da4ec107fb9 (patch)
tree445ac99448d1ff3d61e86c42faf2de358665e548 /gnu/packages/patches
parent06c86f166dee4baaece362fbcf3d4c72c669dd0d (diff)
downloadgnu-guix-05e1534ee81a21b1d8046ac2e21d5da4ec107fb9.tar
gnu-guix-05e1534ee81a21b1d8046ac2e21d5da4ec107fb9.tar.gz
gnu: kodi: Update to 18.2.
* gnu/packages/kodi.scm (kodi): Update to 18.2. * gnu/packages/patches/kodi-set-libcurl-ssl-parameters.patch: Adjust for upstream changes.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/kodi-set-libcurl-ssl-parameters.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/patches/kodi-set-libcurl-ssl-parameters.patch b/gnu/packages/patches/kodi-set-libcurl-ssl-parameters.patch
index f977c6dd98..2f60737e30 100644
--- a/gnu/packages/patches/kodi-set-libcurl-ssl-parameters.patch
+++ b/gnu/packages/patches/kodi-set-libcurl-ssl-parameters.patch
@@ -4,13 +4,14 @@ connections work we can set them based on SSL_CERT_DIR and SSL_CERT_FILE.
--- a/xbmc/filesystem/CurlFile.cpp
+++ b/xbmc/filesystem/CurlFile.cpp
@@ -626,5 +626,9 @@
- // Setup allowed TLS/SSL ciphers. New versions of cURL may deprecate things that are still in use.
if (!m_cipherlist.empty())
g_curlInterface.easy_setopt(h, CURLOPT_SSL_CIPHER_LIST, m_cipherlist.c_str());
-+
+
+ // Load certificate data from environment paths
+ g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_CAPATH, getenv("SSL_CERT_DIR"));
+ g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_CAINFO, getenv("SSL_CERT_FILE"));
++
+ // enable HTTP2 support. default: CURL_HTTP_VERSION_1_1. Curl >= 7.62.0 defaults to CURL_HTTP_VERSION_2TLS
+ g_curlInterface.easy_setopt(h, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_0);
+-
}
-
- void CCurlFile::SetRequestHeaders(CReadState* state) \ No newline at end of file