diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2021-09-28 10:36:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-28 10:36:55 +0200 |
| commit | 4ce9c839ac217cf74960baf3b7b3fbf821485d02 (patch) | |
| tree | 2f569564986bc402f027c517db91606b58bbcbeb /var | |
| parent | aa8727f6f944cc76025c5a9b73d435a8546a3892 (diff) | |
| download | spack-4ce9c839ac217cf74960baf3b7b3fbf821485d02.tar.gz spack-4ce9c839ac217cf74960baf3b7b3fbf821485d02.tar.bz2 spack-4ce9c839ac217cf74960baf3b7b3fbf821485d02.tar.xz spack-4ce9c839ac217cf74960baf3b7b3fbf821485d02.zip | |
Add OpenSSL 3 (#26097)
* OpenSSL 3.0.0
* Remove openssl constraint in e4s to test 3.0.0
* Restrict openssl
* Restrict openssl to @:1 in unifyfs
* Revert "Remove openssl constraint in e4s to test 3.0.0"
This reverts commit 0f0355609771764280ab1b6a523c80843a4f85d6.
* Prefer 1.x
Diffstat (limited to 'var')
4 files changed, 10 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py index 5c434ef32d..ef8055f453 100644 --- a/var/spack/repos/builtin/packages/openssl/package.py +++ b/var/spack/repos/builtin/packages/openssl/package.py @@ -25,9 +25,11 @@ class Openssl(Package): # Uses Fake Autotools, should subclass Package executables = ['openssl'] + version('3.0.0', sha256='59eedfcb46c25214c9bd37ed6078297b4df01d012267fe9e9eee31f61bc70536') + # The latest stable version is the 1.1.1 series. This is also our Long Term # Support (LTS) version, supported until 11th September 2023. - version('1.1.1l', sha256='0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1') + version('1.1.1l', sha256='0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1', preferred=True) version('1.1.1k', sha256='892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5', deprecated=True) version('1.1.1j', sha256='aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf', deprecated=True) version('1.1.1i', sha256='e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242', deprecated=True) diff --git a/var/spack/repos/builtin/packages/ruby/package.py b/var/spack/repos/builtin/packages/ruby/package.py index 8d8243b497..f37017b8d0 100644 --- a/var/spack/repos/builtin/packages/ruby/package.py +++ b/var/spack/repos/builtin/packages/ruby/package.py @@ -35,10 +35,12 @@ class Ruby(AutotoolsPackage): depends_on('libx11', when='@:2.3') depends_on('tcl', when='@:2.3') depends_on('tk', when='@:2.3') - depends_on('openssl@:1.0', when='@:2.3+openssl') - depends_on('openssl', when='+openssl') depends_on('readline', when='+readline') + with when('+openssl'): + depends_on('openssl@:1') + depends_on('openssl@:1.0', when='@:2.3') + # Known build issues when Avira antivirus software is running: # https://github.com/rvm/rvm/issues/4313#issuecomment-374020379 # TODO: add check for this and warn user diff --git a/var/spack/repos/builtin/packages/rust/package.py b/var/spack/repos/builtin/packages/rust/package.py index ca3f6f3394..c12c7cefaf 100644 --- a/var/spack/repos/builtin/packages/rust/package.py +++ b/var/spack/repos/builtin/packages/rust/package.py @@ -67,7 +67,8 @@ class Rust(Package): depends_on('cmake@3.4.3:', type='build') depends_on('ninja', when='@1.48.0:', type='build') depends_on('pkgconfig', type='build') - depends_on('openssl') + # TODO: openssl@3.x should be supported in later versions + depends_on('openssl@:1') depends_on('libssh2') depends_on('libgit2') diff --git a/var/spack/repos/builtin/packages/unifyfs/package.py b/var/spack/repos/builtin/packages/unifyfs/package.py index 4fd7e192d8..fd6eb4ae7b 100644 --- a/var/spack/repos/builtin/packages/unifyfs/package.py +++ b/var/spack/repos/builtin/packages/unifyfs/package.py @@ -43,7 +43,7 @@ class Unifyfs(AutotoolsPackage): depends_on('mochi-margo@0.4.3', when='@:0.9.1') depends_on('mochi-margo', when='@0.9.2:') depends_on('mpi') - depends_on('openssl') + depends_on('openssl@:1') # Optional dependencies depends_on('hdf5', when='+hdf5') |