Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a277 and
12964df69a respectively.
4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it
cannot currently be tested.
Conflicts:
gnu/local.mk
gnu/packages/aidc.scm
gnu/packages/boost.scm
gnu/packages/curl.scm
gnu/packages/nettle.scm
gnu/packages/networking.scm
gnu/packages/python-xyz.scm
gnu/packages/tls.scm
Fixes <https://bugs.gnu.org/49035>.
* gnu/packages/patches/curl-7.77-tls-priority-string.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/curl.scm (curl-7.77.0)[source]: Use it.
Fixes CVE-2021-22876 and CVE-2021-22890.
* gnu/packages/curl.scm (curl/fixed): New variable.
(curl)[replacement]: New field.
* gnu/packages/patches/curl-7.76-use-ssl-cert-env.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/curl.scm (guile-curl): Update to 0.7.
[#:modules, #:imported-modules]: Load guile-build-system for
target-guile-effective-version.
[#:configure-flags]: Use target-guile-effective-version.
[#:phases]: Add 'patch-undefined-references.
Use target-guile-effective-version.
[inputs]: Use guile-3.0.
When OpenLDAP is missing, cURL will fall back to an internal LDAP
client implementation, so there is no loss of functionality. This simplifies
bootstrapping and reduces the closure size by 6.1 MiB.
* gnu/packages/curl.scm (curl)[inputs]: Remove OPENLDAP.
This is a follow-up to commits 6ab31af7c7 and
e21b70accc.
* gnu/packages/curl.scm: Do not import (gnu packages groff).
* gnu/packages/linux.scm: Do not import (gnu packages attr).
This is necessary to avoid a circular dependency in the next commit.
* gnu/packages/curl.scm (curl-minimal): New public variable.
* gnu/packages/cmake.scm (cmake-minimal-bootstrap): New public variable.
* gnu/packages/image.scm (libjpeg-turbo)[arguments]: Add #:cmake.
* gnu/packages/patches/curl-use-ssl-cert-env.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/curl.scm (curl)[source]: Use the patch.
[native-search-paths]: Add the new variables.
Signed-off-by: Marius Bakke <mbakke@fastmail.com>
raingloom
Ludovic Courtès
Maxim Cournoyer
Sarah Morgensen
Felix Gruber
Marius Bakke
Jean-Baptiste Volatier
Leo Famulari
Efraim Flashner
Léo Le Bouter
Xinglu Chen
Leo Prikler
Ricardo Wurmus
Jan (janneke) Nieuwenhuizen
Danny Milosavljevic
Jakub Kądziołka
Dale Mellor
Marius Bakke