01/01: gnu: GnuPG 1.4: Update to 1.4.23.

[Leo Famulari]

lfam pushed a commit to branch master
in repository guix.

commit b6c675c693d21345f4b0589563f914c79f957846
Author: Leo Famulari <address@hidden>
Date:   Thu Jun 14 15:34:47 2018 -0400

    gnu: GnuPG 1.4: Update to 1.4.23.
    
    * gnu/packages/gnupg.scm (gnupg-1): Update to 1.4.23.
    [source]: Remove patch.
    * gnu/packages/patches/gnupg-1.4-CVE-2018-12020.patch: Delete file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/gnupg.scm                             |  5 +--
 .../patches/gnupg-1.4-CVE-2018-12020.patch         | 50 ----------------------
 3 files changed, 2 insertions(+), 54 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index bfe8a9e..01e0718 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -744,7 +744,6 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/gnome-todo-libical-compat.patch         \
   %D%/packages/patches/gnome-tweak-tool-search-paths.patch     \
   %D%/packages/patches/gnucash-price-quotes-perl.patch         \
-  %D%/packages/patches/gnupg-1.4-CVE-2018-12020.patch          \
   %D%/packages/patches/gnutls-skip-trust-store-test.patch      \
   %D%/packages/patches/gnutls-skip-pkgconfig-test.patch                \
   %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 6a0defb..da0c335 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -363,15 +363,14 @@ libskba (working with X.509 certificates and CMS data).")
 
 (define-public gnupg-1
   (package (inherit gnupg)
-    (version "1.4.22")
+    (version "1.4.23")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
                                   ".tar.bz2"))
-              (patches (search-patches "gnupg-1.4-CVE-2018-12020.patch"))
               (sha256
                (base32
-                "1d1hz4szh1kvwhsw7w2zxa6q5ndrk3qy6hj289l1b8k3xi5s554m"))))
+                "1fkq4sqldvf6a25mm2qz95swv1qjg464736091w51djiwqbjyin9"))))
     (native-inputs '())
     (inputs
      `(("zlib" ,zlib)
diff --git a/gnu/packages/patches/gnupg-1.4-CVE-2018-12020.patch 
b/gnu/packages/patches/gnupg-1.4-CVE-2018-12020.patch
deleted file mode 100644
index 306d4d3..0000000
--- a/gnu/packages/patches/gnupg-1.4-CVE-2018-12020.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Fix CVE-2018-12020:
-
-https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-12020
-https://lists.gnupg.org/pipermail/gnupg-announce/2018q2/000425.html
-
-Patch copied from upstream source repository:
-
-https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=2326851c60793653069494379b16d84e4c10a0ac
-
-From 2326851c60793653069494379b16d84e4c10a0ac Mon Sep 17 00:00:00 2001
-From: Werner Koch <address@hidden>
-Date: Fri, 8 Jun 2018 10:45:21 +0200
-Subject: [PATCH] gpg: Sanitize diagnostic with the original file name.
-
-* g10/mainproc.c (proc_plaintext): Sanitize verbose output.
---
-
-This fixes a forgotten sanitation of user supplied data in a verbose
-mode diagnostic.  The mention CVE is about using this to inject
-status-fd lines into the stderr output.  Other harm good as well be
-done.  Note that GPGME based applications are not affected because
-GPGME does not fold status output into stderr.
-
-CVE-id: CVE-2018-12020
-GnuPG-bug-id: 4012
-(cherry picked from commit 13f135c7a252cc46cff96e75968d92b6dc8dce1b)
----
- g10/mainproc.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/g10/mainproc.c b/g10/mainproc.c
-index 33a654b34..ffa7ef6d8 100644
---- a/g10/mainproc.c
-+++ b/g10/mainproc.c
-@@ -638,7 +638,11 @@ proc_plaintext( CTX c, PACKET *pkt )
-     if( pt->namelen == 8 && !memcmp( pt->name, "_CONSOLE", 8 ) )
-       log_info(_("NOTE: sender requested \"for-your-eyes-only\"\n"));
-     else if( opt.verbose )
--      log_info(_("original file name='%.*s'\n"), pt->namelen, pt->name);
-+      {
-+        char *tmp = make_printable_string (pt->name, pt->namelen, 0);
-+        log_info (_("original file name='%.*s'\n"), (int)strlen (tmp), tmp);
-+        xfree (tmp);
-+      }
-     free_md_filter_context( &c->mfx );
-     c->mfx.md = md_open( 0, 0);
-     /* fixme: we may need to push the textfilter if we have sigclass 1
--- 
-2.17.1
-