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

Add OpenSSL 3 (#26097)

Browse source 
* 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
This commit is contained in:
Harmen Stoppels 2021-09-28 10:36:55 +02:00 committed by GitHub
parent aa8727f6f9
commit 4ce9c839ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
var/spack/repos/builtin/packages/openssl/package.py
View file

@ -25,9 +25,11 @@ class Openssl(Package): # Uses Fake Autotools, should subclass Package
executables = ['openssl'] executables = ['openssl']
version('3.0.0', sha256='59eedfcb46c25214c9bd37ed6078297b4df01d012267fe9e9eee31f61bc70536')
# The latest stable version is the 1.1.1 series. This is also our Long Term # The latest stable version is the 1.1.1 series. This is also our Long Term
# Support (LTS) version, supported until 11th September 2023. # 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.1k', sha256='892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5', deprecated=True)
version('1.1.1j', sha256='aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf', deprecated=True) version('1.1.1j', sha256='aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf', deprecated=True)
version('1.1.1i', sha256='e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242', deprecated=True) version('1.1.1i', sha256='e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242', deprecated=True)

6
var/spack/repos/builtin/packages/ruby/package.py
View file

@ -35,10 +35,12 @@ class Ruby(AutotoolsPackage):
depends_on('libx11', when='@:2.3') depends_on('libx11', when='@:2.3')
depends_on('tcl', when='@:2.3') depends_on('tcl', when='@:2.3')
depends_on('tk', 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') 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: # Known build issues when Avira antivirus software is running:
# https://github.com/rvm/rvm/issues/4313#issuecomment-374020379 # https://github.com/rvm/rvm/issues/4313#issuecomment-374020379
# TODO: add check for this and warn user # TODO: add check for this and warn user

3
var/spack/repos/builtin/packages/rust/package.py
View file

@ -67,7 +67,8 @@ class Rust(Package):
depends_on('cmake@3.4.3:', type='build') depends_on('cmake@3.4.3:', type='build')
depends_on('ninja', when='@1.48.0:', type='build') depends_on('ninja', when='@1.48.0:', type='build')
depends_on('pkgconfig', 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('libssh2')
depends_on('libgit2') depends_on('libgit2')

2
var/spack/repos/builtin/packages/unifyfs/package.py
View file

@ -43,7 +43,7 @@ class Unifyfs(AutotoolsPackage):
depends_on('mochi-margo@0.4.3', when='@:0.9.1') depends_on('mochi-margo@0.4.3', when='@:0.9.1')
depends_on('mochi-margo', when='@0.9.2:') depends_on('mochi-margo', when='@0.9.2:')
depends_on('mpi') depends_on('mpi')
depends_on('openssl') depends_on('openssl@:1')
# Optional dependencies # Optional dependencies
depends_on('hdf5', when='+hdf5') depends_on('hdf5', when='+hdf5')