diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/nettle.scm | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/nettle.scm')
| -rw-r--r-- | gnu/packages/nettle.scm | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gnu/packages/nettle.scm b/gnu/packages/nettle.scm index 753e2d6e7e..7f85f54fbf 100644 --- a/gnu/packages/nettle.scm +++ b/gnu/packages/nettle.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2016 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2016, 2021 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; @@ -25,6 +25,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (gnu packages) #:use-module (gnu packages multiprecision) #:use-module (gnu packages m4)) @@ -77,6 +78,7 @@ themselves.") ;; cannot use it yet. So keep it separate. (package (inherit nettle-2) (version "3.5.1") + (replacement nettle-3.5/fixed) (source (origin (method url-fetch) (uri (string-append "mirror://gnu/nettle/nettle-" @@ -91,16 +93,23 @@ themselves.") ;; at run time based on CPU features (starting from 3.1.) `(cons "--enable-fat" ,flags)))))) +(define nettle-3.5/fixed + (package-with-extra-patches + nettle-3.5 + (search-patches "nettle-3.5-check-_pkcs1_sec_decrypt-msg-len.patch" + "nettle-3.5-CVE-2021-3580-pt1.patch" + "nettle-3.5-CVE-2021-3580-pt2.patch"))) + (define-public nettle-3.7 (package (inherit nettle-3.5) - (version "3.7.2") + (version "3.7.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/nettle/nettle-" version ".tar.gz")) (sha256 (base32 - "0qpi1qp3bcvqdsaxy2pzg530db95x8qjahkynxgwvr6dy5760ald")))))) + "1w5wwc3q0r97d2ifhx77cw7y8s20bm8x52is9j93p2h47yq5w7v6")))))) ;;; Upgrading Nettle on master would cause 10000+ packages to be rebuilt. (define-public nettle nettle-3.5) |