zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openssh: add 9.7p1 and 9.6p1; update workaround for clang (#40857)

Browse Source 
Signed-off-by: Bernhard Kaindl <bernhardkaindl7@gmail.com>
This commit is contained in:
Thomas-Ulrich
2024-03-22 15:24:32 +01:00
committed by GitHub
parent 4746e8a048
commit 7b9b976f40
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
var/spack/repos/builtin/packages/openssh/package.py
View File

@@ -25,6 +25,8 @@ class Openssh(AutotoolsPackage):
license("SSH-OpenSSH") license("SSH-OpenSSH")
version("9.7p1", sha256="490426f766d82a2763fcacd8d83ea3d70798750c7bd2aff2e57dc5660f773ffd")
version("9.6p1", sha256="910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c")
version("9.5p1", sha256="f026e7b79ba7fb540f75182af96dc8a8f1db395f922bbc9f6ca603672686086b") version("9.5p1", sha256="f026e7b79ba7fb540f75182af96dc8a8f1db395f922bbc9f6ca603672686086b")
version("9.4p1", sha256="3608fd9088db2163ceb3e600c85ab79d0de3d221e59192ea1923e23263866a85") version("9.4p1", sha256="3608fd9088db2163ceb3e600c85ab79d0de3d221e59192ea1923e23263866a85")
version("9.3p1", sha256="e9baba7701a76a51f3d85a62c383a3c9dcd97fa900b859bc7db114c1868af8a8") version("9.3p1", sha256="e9baba7701a76a51f3d85a62c383a3c9dcd97fa900b859bc7db114c1868af8a8")
@@ -106,9 +108,13 @@ def patch(self):
# #39599: fix configure to parse zlib 1.3's version number to prevent build fail # #39599: fix configure to parse zlib 1.3's version number to prevent build fail
filter_file(r"if \(n != 3 && n != 4\)", "if (n < 2)", "configure") filter_file(r"if \(n != 3 && n != 4\)", "if (n < 2)", "configure")
# https://github.com/Homebrew/homebrew-core/blob/7aabdeb30506be9b01708793ae553502c115dfc8/Formula/o/openssh.rb#L71-L77 # Clang-based compilers (known at least 14-17) may randomly mis-compile
if self.spec.target.family == "x86_64" and self.spec.platform == "darwin": # openssh according to this thread even when -fzero-call-used-regs=used:
filter_file(r"-fzero-call-used-regs=all", "-fzero-call-used-regs=used", "configure") # https://www.mail-archive.com/openssh-bugs@mindrot.org/msg17461.html
# Therefore, remove -fzero-call-used-regs=all for these compilers:
spec = self.spec
if spec.version < Version("9.6p1") and self.compiler.name.endswith(("clang", "oneapi")):
filter_file("-fzero-call-used-regs=all", "", "configure")
def configure_args(self): def configure_args(self):
# OpenSSH's privilege separation path defaults to /var/empty. At # OpenSSH's privilege separation path defaults to /var/empty. At