From d6f9e3568307583a2679b212f745691c38d12280 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 31 Mar 2016 17:16:46 +0200
Subject: [PATCH] gnupg20: 2.0.29 -> 2.0.30

See https://lists.gnupg.org/pipermail/gnupg-announce/2016q1/000385.html
---
 pkgs/tools/security/gnupg/20.nix              | 4 ++--
 pkgs/tools/security/gnupg/gpgkey2ssh-20.patch | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix
index 117fc41c1abe..65d43ec9dbee 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/pkgs/tools/security/gnupg/20.nix
@@ -12,11 +12,11 @@ with stdenv.lib;
 assert x11Support -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.0.29";
+  name = "gnupg-2.0.30";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "1jaakn0mi6pi2b3g3imxj3qzxw2zg0ifxs30baq2b157dcw6pvb8";
+    sha256 = "0wax4cy14hh0h7kg9hj0hjn9424b71z8lrrc5kbsasrn9xd7hag3";
   };
 
   buildInputs
diff --git a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch b/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch
index b536a4fe50e3..4bfdc13ef598 100644
--- a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch
+++ b/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch
@@ -2,7 +2,7 @@ diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c
 index 903fb5b..d5611dc 100644
 --- a/tools/gpgkey2ssh.c
 +++ b/tools/gpgkey2ssh.c
-@@ -266,7 +266,7 @@ main (int argc, char **argv)
+@@ -268,7 +268,7 @@ main (int argc, char **argv)
    keyid = argv[1];
  
    ret = asprintf (&command,