summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarmen Stoppels <harmenstoppels@gmail.com>2023-02-06 15:06:16 +0100
committerGitHub <noreply@github.com>2023-02-06 15:06:16 +0100
commit31959b72b0f8dc72d18b91046319d9170795509f (patch)
tree30fb0e593ecd5229a9a0dc3d22c99b8b02b0ad72
parent8109877424954ec6544a9d2db366d3b5200f51b8 (diff)
downloadspack-31959b72b0f8dc72d18b91046319d9170795509f.tar.gz
spack-31959b72b0f8dc72d18b91046319d9170795509f.tar.bz2
spack-31959b72b0f8dc72d18b91046319d9170795509f.tar.xz
spack-31959b72b0f8dc72d18b91046319d9170795509f.zip
bump: nss + dep (#35294)
-rw-r--r--var/spack/repos/builtin/packages/nspr/package.py1
-rw-r--r--var/spack/repos/builtin/packages/nss/package.py19
2 files changed, 12 insertions, 8 deletions
diff --git a/var/spack/repos/builtin/packages/nspr/package.py b/var/spack/repos/builtin/packages/nspr/package.py
index 3af6e2710e..de7b37aabc 100644
--- a/var/spack/repos/builtin/packages/nspr/package.py
+++ b/var/spack/repos/builtin/packages/nspr/package.py
@@ -15,6 +15,7 @@ class Nspr(AutotoolsPackage):
)
url = "https://ftp.mozilla.org/pub/nspr/releases/v4.13.1/src/nspr-4.13.1.tar.gz"
+ version("4.35", sha256="7ea3297ea5969b5d25a5dd8d47f2443cda88e9ee746301f6e1e1426f8a6abc8f")
version("4.32", sha256="bb6bf4f534b9559cf123dcdc6f9cd8167de950314a90a88b2a329c16836e7f6c")
version("4.31", sha256="5729da87d5fbf1584b72840751e0c6f329b5d541850cacd1b61652c95015abc8")
version("4.13.1", sha256="5e4c1751339a76e7c772c0c04747488d7f8c98980b434dc846977e43117833ab")
diff --git a/var/spack/repos/builtin/packages/nss/package.py b/var/spack/repos/builtin/packages/nss/package.py
index 8d9e6ce4e9..ffa4357773 100644
--- a/var/spack/repos/builtin/packages/nss/package.py
+++ b/var/spack/repos/builtin/packages/nss/package.py
@@ -16,6 +16,7 @@ class Nss(MakefilePackage):
homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
url = "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_67_RTM/src/nss-3.67.tar.gz"
+ version("3.87", sha256="68a1894496d3d158babc75f8a5dda3f55b7c1560573936e3b101a10fa4ac152d")
version("3.75", sha256="fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582")
version("3.73", sha256="566d3a68da9b10d7da9ef84eb4fe182f8f04e20d85c55d1bf360bb2c0096d8e5")
# Everything before 3.73 is vulnerable (CVE-2021-43527)
@@ -43,18 +44,20 @@ class Nss(MakefilePackage):
# We cannot use nss_build_all because this will try to build nspr.
targets = ["all", "latest"]
- targets.append("CCC={}".format(spack_cxx))
- targets.append("USE_64=1")
- targets.append("BUILD_OPT=1")
+ targets.extend(
+ [
+ "CCC={}".format(spack_cxx),
+ "USE_64=1",
+ "BUILD_OPT=1",
+ "NSS_USE_SYSTEM_SQLITE=1",
+ "NSS_ENABLE_WERROR=0",
+ "NSS_DISABLE_GTESTS=1",
+ ]
+ )
for var in ("DIST", "SOURCE_PREFIX", "SOURCE_MD_DIR"):
targets.append("{0}={1}".format(var, join_path(self.stage.source_path, "dist")))
- targets.append("NSS_USE_SYSTEM_SQLITE=1")
-
- if self.spec.satisfies("%gcc@10:"):
- targets.append("NSS_ENABLE_WERROR=0")
-
return targets
def install(self, spec, prefix):