[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: nss: Ungraft.
From: |
guix-commits |
Subject: |
02/02: gnu: nss: Ungraft. |
Date: |
Wed, 11 Dec 2019 21:16:08 -0500 (EST) |
efraim pushed a commit to branch core-updates
in repository guix.
commit 2c267e630086caaa141957ddd9cdf14205b2759c
Author: Efraim Flashner <address@hidden>
Date: Thu Dec 12 04:14:40 2019 +0200
gnu: nss: Ungraft.
* gnu/packages/nss.scm (nss)[replacement]: Remove field.
[source]: Add patch.
(nss/fixed): Remove variable.
---
gnu/packages/nss.scm | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index 4f421f6..6ed197b 100644
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
<address@hidden>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver
<address@hidden>
-;;; Copyright © 2016, 2017, 2018 Efraim Flashner <address@hidden>
+;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <address@hidden>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
;;;
;;; This file is part of GNU Guix.
@@ -71,7 +71,6 @@ in the Mozilla clients.")
(package
(name "nss")
(version "3.46.1")
- (replacement nss/fixed)
(source (origin
(method url-fetch)
(uri (let ((version-with-underscores
@@ -84,7 +83,8 @@ in the Mozilla clients.")
(base32
"0l9ns44rlkp1bpblplspfbqmyhb8rhvc89y56kqh725rgpny1xrv"))
;; Create nss.pc and nss-config.
- (patches (search-patches "nss-pkgconfig.patch"
+ (patches (search-patches "nss-CVE-2019-11745.patch"
+ "nss-pkgconfig.patch"
"nss-freebl-stubs.patch"
"nss-increase-test-timeout.patch"))))
(build-system gnu-build-system)
@@ -184,11 +184,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-2019-11745.patch")
- (origin-patches (package-source nss))))))))