diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/kodi.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/patches/kodi-set-libcurl-ssl-parameters.patch | 18 |
3 files changed, 2 insertions, 22 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index c37a2cea7ac..afbd09ce2c0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk | |||
| @@ -1755,7 +1755,6 @@ dist_patch_DATA = \ | |||
| 1755 | %D%/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch \ | 1755 | %D%/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch \ |
| 1756 | %D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch \ | 1756 | %D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch \ |
| 1757 | %D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch \ | 1757 | %D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch \ |
| 1758 | %D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \ | ||
| 1759 | %D%/packages/patches/krita-bump-sip-abi-version-to-12.8.patch \ | 1758 | %D%/packages/patches/krita-bump-sip-abi-version-to-12.8.patch \ |
| 1760 | %D%/packages/patches/kvantum-1.1.5-xdg-dirs-support.patch \ | 1759 | %D%/packages/patches/kvantum-1.1.5-xdg-dirs-support.patch \ |
| 1761 | %D%/packages/patches/kwayland-5-fix-build.patch \ | 1760 | %D%/packages/patches/kwayland-5-fix-build.patch \ |
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index d6553254b40..67b0df55bea 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm | |||
| @@ -265,7 +265,7 @@ secondary errors.") | |||
| 265 | (define-public kodi | 265 | (define-public kodi |
| 266 | (package | 266 | (package |
| 267 | (name "kodi") | 267 | (name "kodi") |
| 268 | (version "21.2") | 268 | (version "21.3") |
| 269 | (source (origin | 269 | (source (origin |
| 270 | (method git-fetch) | 270 | (method git-fetch) |
| 271 | (uri (git-reference | 271 | (uri (git-reference |
| @@ -274,8 +274,7 @@ secondary errors.") | |||
| 274 | (file-name (git-file-name name version)) | 274 | (file-name (git-file-name name version)) |
| 275 | (sha256 | 275 | (sha256 |
| 276 | (base32 | 276 | (base32 |
| 277 | "1kq35hn7fl8fhsv5xvqb7snsh9lbzix56pafqz8flgc5mrrckm25")) | 277 | "0acwg8d4ixv0a09ybaixd3na9z6w6hw82wnxw9cj8344l4103b6z")) |
| 278 | (patches (search-patches "kodi-set-libcurl-ssl-parameters.patch")) | ||
| 279 | (modules '((guix build utils))) | 278 | (modules '((guix build utils))) |
| 280 | (snippet | 279 | (snippet |
| 281 | '(begin | 280 | '(begin |
diff --git a/gnu/packages/patches/kodi-set-libcurl-ssl-parameters.patch b/gnu/packages/patches/kodi-set-libcurl-ssl-parameters.patch deleted file mode 100644 index 99d8a45de6f..00000000000 --- a/gnu/packages/patches/kodi-set-libcurl-ssl-parameters.patch +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | Kodi doesn't set the CAPATH and CAINFO parameters for libcurl. To make HTTPS | ||
| 2 | connections work we can set them based on SSL_CERT_DIR and SSL_CERT_FILE. | ||
| 3 | |||
| 4 | --- a/xbmc/filesystem/CurlFile.cpp | ||
| 5 | +++ b/xbmc/filesystem/CurlFile.cpp | ||
| 6 | @@ -626,8 +626,12 @@ | ||
| 7 | if (!m_cipherlist.empty()) | ||
| 8 | g_curlInterface.easy_setopt(h, CURLOPT_SSL_CIPHER_LIST, m_cipherlist.c_str()); | ||
| 9 | |||
| 10 | + // Load certificate data from environment paths | ||
| 11 | + g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_CAPATH, getenv("SSL_CERT_DIR")); | ||
| 12 | + g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_CAINFO, getenv("SSL_CERT_FILE")); | ||
| 13 | + | ||
| 14 | if (CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_curlDisableHTTP2) | ||
| 15 | g_curlInterface.easy_setopt(h, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | ||
| 16 | else | ||
| 17 | // enable HTTP2 support. default: CURL_HTTP_VERSION_1_1. Curl >= 7.62.0 defaults to CURL_HTTP_VERSION_2TLS | ||
| 18 | g_curlInterface.easy_setopt(h, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2TLS); | ||
