From 7e4db700dc40d065ec2d594ecca90dc50d2a8c73 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 14 May 2016 08:25:36 +0200
Subject: [PATCH 1/2] libksba: 1.3.3 -> 1.3.4

Contains a fix for https://access.redhat.com/security/cve/CVE-2016-4574
---
 pkgs/development/libraries/libksba/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix
index 26aa974a7ee..9171471882c 100644
--- a/pkgs/development/libraries/libksba/default.nix
+++ b/pkgs/development/libraries/libksba/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, libgpgerror }:
 
 stdenv.mkDerivation rec {
-  name = "libksba-1.3.3";
+  name = "libksba-1.3.4";
 
   src = fetchurl {
     url = "mirror://gnupg/libksba/${name}.tar.bz2";
-    sha256 = "11kp3h9l3b8ikydkcdkwgx45r662zi30m26ra5llyhfh6kz5yzqc";
+    sha256 = "0kxdb02z41cwm1xbwfwj9nbc0dzjhwyq8c475mlhhmpcxcy8ihpn";
   };
 
   propagatedBuildInputs = [ libgpgerror ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnupg.org;
-    description = "CMS and X.509 access library under development";
+    homepage = https://www.gnupg.org;
+    description = "CMS and X.509 access library";
     platforms = platforms.all;
     license = licenses.lgpl3;
     maintainers = with maintainers; [ wkennington ];

From 201f6600cbe3068144f3dd8ebcefa7192ed5513c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 14 May 2016 08:45:19 +0200
Subject: [PATCH 2/2] dirmngr: 1.0.3 -> 1.1.1

Fixes the build.

This package is probably ripe for removal by now, as dirmngr was incorporated
into gnupg a couple of years ago:
https://lists.gnupg.org/pipermail/gnupg-announce/2014q4/000358.html
---
 pkgs/tools/security/dirmngr/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/dirmngr/default.nix b/pkgs/tools/security/dirmngr/default.nix
index be6d184a4f2..50eb6750a45 100644
--- a/pkgs/tools/security/dirmngr/default.nix
+++ b/pkgs/tools/security/dirmngr/default.nix
@@ -1,11 +1,10 @@
-{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, openldap }:
+{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, pth, openldap }:
 
 stdenv.mkDerivation rec {
-  name = "dirmngr-1.0.3";
+  name = "dirmngr-1.1.1";
   src = fetchurl {
-    url = "mirror://gnupg/${name}.tar.bz2";
-    sha256 = "03f54582caxgwjdv1b71azyk612a738ckgk2k05bmg466r1cw8jd";
+    url = "mirror://gnupg/dirmngr/${name}.tar.bz2";
+    sha256 = "1zz6m87ca55nq5f59hzm6qs48d37h93il881y7d0rf2d6660na6j";
   };
-
-  buildInputs = [ libgpgerror libgcrypt libassuan libksba openldap ];
+  buildInputs = [ libgpgerror libgcrypt libassuan libksba pth openldap ];
 }