diff options
| author | Marius Bakke <marius@gnu.org> | 2020-06-13 22:52:25 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-06-13 22:52:25 +0200 |
| commit | 8ab70bae52f8d4b6356ec3b8a88cebf9debe8520 (patch) | |
| tree | 6e13e1de3c9addac9dad5d9f194c229baa3b59ab /gnu/packages/nss.scm | |
| parent | 9bc516bada71e1437d73971584bff5e72e053dbe (diff) | |
| parent | 8ea91d05b0fd16a8dd42a53efee9b16991d581b9 (diff) | |
Merge branch 'staging'
Diffstat (limited to 'gnu/packages/nss.scm')
| -rw-r--r-- | gnu/packages/nss.scm | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 887860157d..b19ad7e1e9 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -72,8 +72,7 @@ in the Mozilla clients.") (define-public nss (package (name "nss") - (version "3.50") - (replacement nss/fixed) + (version "3.52.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -84,7 +83,7 @@ in the Mozilla clients.") "nss-" version ".tar.gz"))) (sha256 (base32 - "19rv0vp9nmvn6dy29qsv8f4v7wn5kizrpm59vbszahsjfwcz6p8q")) + "0y4jb9095f7bbgw7d7kvzm4c3g4p5i6y68fwhb8wlkpb7b1imj5w")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-increase-test-timeout.patch")) @@ -192,11 +191,3 @@ applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards.") (license license:mpl2.0))) - -(define nss/fixed - (package - (inherit nss) - (source (origin - (inherit (package-source nss)) - (patches (append (search-patches "nss-CVE-2020-12399.patch") - (origin-patches (package-source nss)))))))) |