ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: nss: Update to 3.21 [fixes CVE-2015-7575].

Browse source 
* gnu/packages/gnuzilla.scm (nss): Update to 3.21.
  [arguments]: In configure phase, setenv CC=gcc.
* gnu/packages/patches/nss-pkgconfig.patch: Adapt to NSS 3.21.
This commit is contained in:
Mark H Weaver 2016-01-08 13:30:52 -05:00
parent 17ad0a2714
commit bea25ae83c
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gnu/packages/gnuzilla.scm
View file

@ -167,7 +167,7 @@ (define-public nspr
(define-public nss (define-public nss
(package (package
(name "nss") (name "nss")
(version "3.20.2") (version "3.21")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (let ((version-with-underscores (uri (let ((version-with-underscores
@ -178,7 +178,7 @@ (define-public nss
"nss-" version ".tar.gz"))) "nss-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"11pjjcp0mvcyx0ildyz20s9jlqzxsb6a9jlvcq5x1g3zsmckl6hl")) "0fbjx3xsdm4gjc1gyzy2z315cvyw7yilsm7p9w75rpbwgl15nyiz"))
;; Create nss.pc and nss-config. ;; Create nss.pc and nss-config.
(patches (list (search-patch "nss-pkgconfig.patch"))))) (patches (list (search-patch "nss-pkgconfig.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -205,6 +205,7 @@ (define-public nss
(alist-replace (alist-replace
'configure 'configure
(lambda* (#:key system inputs #:allow-other-keys) (lambda* (#:key system inputs #:allow-other-keys)
(setenv "CC" "gcc")
;; Tells NSS to build for the 64-bit ABI if we are 64-bit system. ;; Tells NSS to build for the 64-bit ABI if we are 64-bit system.
(when (string-prefix? "x86_64" system) (when (string-prefix? "x86_64" system)
(setenv "USE_64" "1")) (setenv "USE_64" "1"))

27
gnu/packages/patches/nss-pkgconfig.patch
View file

@ -7,8 +7,10 @@ Modifications:
Remove optional patching in nss/Makefile. Remove optional patching in nss/Makefile.
Include -L$libdir in output from "nss-config --libs". Include -L$libdir in output from "nss-config --libs".
--- nss-3.17.1/nss/config/Makefile Later adapted to apply cleanly to nss-3.21.
+++ nss-3.17.1/nss/config/Makefile
--- nss-3.21/nss/config/Makefile
+++ nss-3.21/nss/config/Makefile
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+CORE_DEPTH = .. +CORE_DEPTH = ..
+DEPTH = .. +DEPTH = ..
@ -50,8 +52,8 @@ Modifications:
+ +
+dummy: all export libs +dummy: all export libs
+ +
--- nss-3.17.1/nss/config/nss-config.in --- nss-3.21/nss/config/nss-config.in
+++ nss-3.17.1/nss/config/nss-config.in +++ nss-3.21/nss/config/nss-config.in
@@ -0,0 +1,145 @@ @@ -0,0 +1,145 @@
+#!/bin/sh +#!/bin/sh
+ +
@ -198,8 +200,8 @@ Modifications:
+ echo $libdirs + echo $libdirs
+fi +fi
+ +
--- nss-3.17.1/nss/config/nss.pc.in --- nss-3.21/nss/config/nss.pc.in
+++ nss-3.17.1/nss/config/nss.pc.in +++ nss-3.21/nss/config/nss.pc.in
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
+prefix=@prefix@ +prefix=@prefix@
+exec_prefix=@exec_prefix@ +exec_prefix=@exec_prefix@
@ -213,14 +215,11 @@ Modifications:
+Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3 +Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3
+Cflags: -I${includedir} +Cflags: -I${includedir}
+ +
--- nss-3.17.1/nss/manifest.mn --- nss-3.21/nss/manifest.mn
+++ nss-3.17.1/nss/manifest.mn +++ nss-3.21/nss/manifest.mn
@@ -10,7 +10,7 @@ @@ -10,4 +10,4 @@
RELEASE = nss RELEASE = nss
-DIRS = coreconf lib cmd -DIRS = coreconf lib cmd external_tests
+DIRS = coreconf lib cmd config +DIRS = coreconf lib cmd external_tests config
ifdef NSS_BUILD_GTESTS
DIRS += external_tests