gnu: NSS: Update to 3.55 [security fixes].
This release fixes CVE-2020-6829, CVE-2020-12400, CVE-2020-12401, and CVE-2020-12403. * gnu/packages/patches/nss-pkgconfig.patch: Adjust patch context. * gnu/packages/nss.scm (nss): Update to 3.55. [arguments]: Add "all" to #:make-flags. Remove obsolete deletions. * gnu/packages/certs.scm (nss-certs): Update to 3.55.master
parent
8b3c0df1a9
commit
4c19be1485
|
@ -76,7 +76,7 @@
|
||||||
(define-public nss-certs
|
(define-public nss-certs
|
||||||
(package
|
(package
|
||||||
(name "nss-certs")
|
(name "nss-certs")
|
||||||
(version "3.52.1")
|
(version "3.55")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (let ((version-with-underscores
|
(uri (let ((version-with-underscores
|
||||||
|
@ -87,7 +87,7 @@
|
||||||
"nss-" version ".tar.gz")))
|
"nss-" version ".tar.gz")))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0y4jb9095f7bbgw7d7kvzm4c3g4p5i6y68fwhb8wlkpb7b1imj5w"))))
|
"0100hm7n1xrp144xy665z46s0wf1jpkqkncc6bk2w22snhyjwsgw"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(outputs '("out"))
|
(outputs '("out"))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
|
|
|
@ -72,7 +72,7 @@ in the Mozilla clients.")
|
||||||
(define-public nss
|
(define-public nss
|
||||||
(package
|
(package
|
||||||
(name "nss")
|
(name "nss")
|
||||||
(version "3.52.1")
|
(version "3.55")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (let ((version-with-underscores
|
(uri (let ((version-with-underscores
|
||||||
|
@ -83,7 +83,7 @@ in the Mozilla clients.")
|
||||||
"nss-" version ".tar.gz")))
|
"nss-" version ".tar.gz")))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0y4jb9095f7bbgw7d7kvzm4c3g4p5i6y68fwhb8wlkpb7b1imj5w"))
|
"0100hm7n1xrp144xy665z46s0wf1jpkqkncc6bk2w22snhyjwsgw"))
|
||||||
;; Create nss.pc and nss-config.
|
;; Create nss.pc and nss-config.
|
||||||
(patches (search-patches "nss-pkgconfig.patch"
|
(patches (search-patches "nss-pkgconfig.patch"
|
||||||
"nss-increase-test-timeout.patch"))
|
"nss-increase-test-timeout.patch"))
|
||||||
|
@ -108,7 +108,8 @@ in the Mozilla clients.")
|
||||||
(string-append "NSPR_INCLUDE_DIR=" nspr "/include/nspr")
|
(string-append "NSPR_INCLUDE_DIR=" nspr "/include/nspr")
|
||||||
;; Add $out/lib/nss to RPATH.
|
;; Add $out/lib/nss to RPATH.
|
||||||
(string-append "RPATH=" rpath)
|
(string-append "RPATH=" rpath)
|
||||||
(string-append "LDFLAGS=" rpath)))
|
(string-append "LDFLAGS=" rpath)
|
||||||
|
"all"))
|
||||||
#:modules ((guix build gnu-build-system)
|
#:modules ((guix build gnu-build-system)
|
||||||
(guix build utils)
|
(guix build utils)
|
||||||
(ice-9 ftw)
|
(ice-9 ftw)
|
||||||
|
@ -138,7 +139,7 @@ in the Mozilla clients.")
|
||||||
;; leading to test failures:
|
;; leading to test failures:
|
||||||
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. To
|
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. To
|
||||||
;; work around that, set the time to roughly the release date.
|
;; work around that, set the time to roughly the release date.
|
||||||
(invoke "faketime" "2020-02-01" "./nss/tests/all.sh")))
|
(invoke "faketime" "2020-07-01" "./nss/tests/all.sh")))
|
||||||
(replace 'install
|
(replace 'install
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(let* ((out (assoc-ref outputs "out"))
|
(let* ((out (assoc-ref outputs "out"))
|
||||||
|
@ -160,15 +161,6 @@ in the Mozilla clients.")
|
||||||
(copy-recursively "dist/public/nss" inc)
|
(copy-recursively "dist/public/nss" inc)
|
||||||
(copy-recursively (string-append obj "/bin") bin)
|
(copy-recursively (string-append obj "/bin") bin)
|
||||||
(copy-recursively (string-append obj "/lib") lib)
|
(copy-recursively (string-append obj "/lib") lib)
|
||||||
|
|
||||||
;; FIXME: libgtest1.so is installed in the above step, and it's
|
|
||||||
;; (unnecessarily) linked with several NSS libraries, but
|
|
||||||
;; without the needed rpaths, causing the 'validate-runpath'
|
|
||||||
;; phase to fail. Here we simply delete libgtest1.so, since it
|
|
||||||
;; seems to be used only during the tests.
|
|
||||||
(delete-file (string-append lib "/libgtest1.so"))
|
|
||||||
(delete-file (string-append lib "/libgtestutil.so"))
|
|
||||||
|
|
||||||
#t))))))
|
#t))))))
|
||||||
(inputs
|
(inputs
|
||||||
`(("sqlite" ,sqlite)
|
`(("sqlite" ,sqlite)
|
||||||
|
|
|
@ -217,9 +217,12 @@ Later adapted to apply cleanly to nss-3.21.
|
||||||
+
|
+
|
||||||
--- nss-3.21/nss/manifest.mn
|
--- nss-3.21/nss/manifest.mn
|
||||||
+++ nss-3.21/nss/manifest.mn
|
+++ nss-3.21/nss/manifest.mn
|
||||||
@@ -10,4 +10,4 @@
|
@@ -10,7 +10,7 @@
|
||||||
|
|
||||||
RELEASE = nss
|
RELEASE = nss
|
||||||
|
|
||||||
-DIRS = coreconf lib cmd cpputil gtests
|
-DIRS = coreconf lib cmd cpputil gtests
|
||||||
+DIRS = coreconf lib cmd cpputil gtests config
|
+DIRS = coreconf lib cmd cpputil gtests config
|
||||||
|
|
||||||
|
lib: coreconf
|
||||||
|
cmd: lib
|
||||||
|
|
Reference in New Issue