hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

curl: fix mbedtls versions and certs config (#26877)

Browse source 
Co-authored-by: Harmen Stoppels <harmenstoppels@gmail.com>
This commit is contained in:
Thomas Madlener 2021-10-29 16:55:48 +02:00 committed by GitHub
parent 962d06441e
commit 874f06e29c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
var/spack/repos/builtin/packages/curl/package.py
View file

@ -87,7 +87,8 @@ class Curl(AutotoolsPackage):
conflicts('tls=mbedtls', when='@:7.45') conflicts('tls=mbedtls', when='@:7.45')
depends_on('gnutls', when='tls=gnutls') depends_on('gnutls', when='tls=gnutls')
depends_on('mbedtls', when='tls=mbedtls') depends_on('mbedtls@3:', when='@7.79: tls=mbedtls')
depends_on('mbedtls@:2', when='@:7.78 tls=mbedtls')
depends_on('nss', when='tls=nss') depends_on('nss', when='tls=nss')
depends_on('openssl', when='tls=openssl') depends_on('openssl', when='tls=openssl')
depends_on('libidn2', when='+libidn2') depends_on('libidn2', when='+libidn2')
@ -111,10 +112,16 @@ def configure_args(self):
'--without-libgsasl', '--without-libgsasl',
'--without-libpsl', '--without-libpsl',
'--without-zstd', '--without-zstd',
]
# Make gnutls / openssl decide what certs are trusted.
# TODO: certs for other tls options.
if spec.satisfies('tls=gnutls') or spec.satisfies('tls=openssl'):
args.extend([
'--without-ca-bundle', '--without-ca-bundle',
'--without-ca-path', '--without-ca-path',
'--with-ca-fallback', '--with-ca-fallback',
] ])
# https://daniel.haxx.se/blog/2021/06/07/bye-bye-metalink-in-curl/ # https://daniel.haxx.se/blog/2021/06/07/bye-bye-metalink-in-curl/
# We always disable it explicitly, but the flag is gone in newer # We always disable it explicitly, but the flag is gone in newer
@ -134,6 +141,7 @@ def configure_args(self):
args += self.with_or_without('libssh2') args += self.with_or_without('libssh2')
args += self.with_or_without('libssh') args += self.with_or_without('libssh')
args += self.enable_or_disable('ldap') args += self.enable_or_disable('ldap')
return args return args
def with_or_without_gnutls(self, activated): def with_or_without_gnutls(self, activated):