From e8e1eeccb8399663572af9e5f02be0f122ba1dea Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 11 Jul 2019 19:21:58 +0200
Subject: [PATCH] Merge #64538: gnupg: 2.2.16 -> 2.2.17 (security)

(cherry picked from commit 84e33703587247f70c271c15ab074a06e16f7b7c)
CVE-2019-13050 #64658.  The other changes don't sound too intrusive:
https://lists.gnupg.org/pipermail/gnupg-announce/2019q3/000439.html
---
 pkgs/tools/security/gnupg/22.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix
index c802f44aa976c..d11f3c2a110ec 100644
--- a/pkgs/tools/security/gnupg/22.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null;
 stdenv.mkDerivation rec {
   name = "gnupg-${version}";
 
-  version = "2.2.16";
+  version = "2.2.17";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "1jqlzp9b3kpfp1dkjqskm67jjrhvf9nh3lzf45321p7m9d2qvgkc";
+    sha256 = "056mgy09lvsi03531a437qj58la1j2x1y1scvfi53diris3658mg";
   };
 
   nativeBuildInputs = [ pkgconfig ];