diff options
author | Marius Bakke <marius@gnu.org> | 2022-08-11 22:15:22 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2022-08-11 22:15:22 +0200 |
commit | b50eaa67642ebc25e9c896f2e700c08610e0a5da (patch) | |
tree | e3358208e17a836c2e3cdb3125f815a2ab35c2b8 /gnu/packages/gnupg.scm | |
parent | 7b69cd07408bf64fff026e4597920a90259e3205 (diff) | |
parent | 99b73f60415b282f2be39134f385cbda4840c336 (diff) |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/gnupg.scm')
-rw-r--r-- | gnu/packages/gnupg.scm | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 08fa1570d6..90215a6877 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -285,6 +285,7 @@ compatible to GNU Pth.") ;; Note2: 2.2.33 currently suffers from regressions, so do not update to it ;; (see: https://dev.gnupg.org/T5742). (version "2.2.32") + (replacement gnupg/fixed) (source (origin (method url-fetch) (uri (string-append "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-" version @@ -352,6 +353,15 @@ libskba (working with X.509 certificates and CMS data).") (properties '((ftp-server . "ftp.gnupg.org") (ftp-directory . "/gcrypt/gnupg"))))) +(define gnupg/fixed + (package + (inherit gnupg) + (source (origin + (inherit (package-source gnupg)) + (patches + (append (origin-patches (package-source gnupg)) + (search-patches "gnupg-CVE-2022-34903.patch"))))))) + (define-public gnupg-1 (package (inherit gnupg) (version "1.4.23") |