Mass GnuPG upgrade

gnupg tests fail. Will try to fix later.

svn path=/nixpkgs/trunk/; revision=21884

6 files changed, 33 insertions, 14 deletions

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index f98201fd4f8..3ca0e974ff1 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth}:
 
-stdenv.mkDerivation {
-  name = "gpgme-1.1.4";
+stdenv.mkDerivation rec {
+  name = "gpgme-1.3.0";
   src = fetchurl {
-    url = ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.1.4.tar.bz2;
-    sha256 = "0ncrv7p33rjq1avkxpp9x0gz6wna9y3b3dmw6nv366n5mgvxmpg8";
+    url = "ftp://ftp.gnupg.org/gcrypt/gpgme/${name}.tar.bz2";
+    sha256 = "18g6wgiacnbj437yfsczbjxaf041ljia48dnv2qgcqb0sky41q3l";
   };
   buildInputs = [libgpgerror gnupg pkgconfig glib pth];
 }
diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix
index 9a161ec170f..90ee45865ed 100644
--- a/pkgs/development/libraries/libassuan/default.nix
+++ b/pkgs/development/libraries/libassuan/default.nix
@@ -1,14 +1,14 @@
-{ fetchurl, stdenv, pth }:
+{ fetchurl, stdenv, pth, libgpgerror }:
 
 stdenv.mkDerivation rec {
-  name = "libassuan-1.0.5";
+  name = "libassuan-2.0.0";
 
   src = fetchurl {
     url = "mirror://gnupg/libassuan/${name}.tar.bz2";
-    sha256 = "1xar8i5jmah75wa9my4x7vkc5b6nmzd2p6k9kmpdg9hsv04292y5";
+    sha256 = "13vzs4jxscnlskwzd3wpqwnfb5f0hwqc75rbi8j9f42bs6q08apx";
   };
 
-  propagatedBuildInputs = [ pth ];
+  propagatedBuildInputs = [ pth libgpgerror ];
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix
index 513afc474ea..ec2468aca1d 100644
--- a/pkgs/development/libraries/libksba/default.nix
+++ b/pkgs/development/libraries/libksba/default.nix
@@ -1,11 +1,11 @@
-args: with args;
+{ stdenv, fetchurl, libgpgerror }:
 
 stdenv.mkDerivation rec {
-  name = "libksba-1.0.2";
+  name = "libksba-1.0.7";
 
   src = fetchurl {
-    url = "ftp://ftp.gnupg.org/gcrypt/libksba/${name}.tar.bz2";
-    sha256 = "1jkjh1daaykkrfq0s4vv8ddf0w8agdvspg9qm0ghjidlrfnsfiwh";
+    url = "mirror://gnupg/libksba/${name}.tar.bz2";
+    sha256 = "1biabl4ijaf0jyl4zf3qrhcs0iaq9pypjibp8wgnim3n3kg0bdda";
   };
 
   propagatedBuildInputs = [libgpgerror];
diff --git a/pkgs/tools/security/dirmngr/default.nix b/pkgs/tools/security/dirmngr/default.nix
new file mode 100644
index 00000000000..be6d184a4f2
--- /dev/null
+++ b/pkgs/tools/security/dirmngr/default.nix
@@ -0,0 +1,11 @@
+{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, openldap }:
+
+stdenv.mkDerivation rec {
+  name = "dirmngr-1.0.3";
+  src = fetchurl {
+    url = "mirror://gnupg/${name}.tar.bz2";
+    sha256 = "03f54582caxgwjdv1b71azyk612a738ckgk2k05bmg466r1cw8jd";
+  };
+
+  buildInputs = [ libgpgerror libgcrypt libassuan libksba openldap ];
+}
diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix
index 2312d3ff06d..32632358c25 100644
--- a/pkgs/tools/security/gnupg/default.nix
+++ b/pkgs/tools/security/gnupg/default.nix
@@ -25,7 +25,11 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional useUsb libusb
     ++ stdenv.lib.optional useCurl curl;
 
-  patchPhase = "sed -e 's@/bin/pwd@pwd@g' -i tests/pkits/*";
+  patchPhase = ''
+    find tests -type f | xargs sed -e 's@/bin/pwd@${stdenv.coreutils}&@g' -i
+  '';
+
+  checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check";
 
   postInstall = ''
     ln -s gpg2 $out/bin/gpg
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e7684554cd..d3f50d6b5f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -628,6 +628,10 @@ let
       inherit fetchurl stdenv coreutils;
     });
 
+  dirmngr = import ../tools/security/dirmngr {
+    inherit stdenv fetchurl libgpgerror libgcrypt libassuan libksba openldap;
+  };
+
   docbook2x = import ../tools/typesetting/docbook2x {
     inherit fetchurl stdenv texinfo perl
             gnused groff libxml2 libxslt makeWrapper;
@@ -4301,7 +4305,7 @@ let
   };
 
   libassuan = import ../development/libraries/libassuan {
-    inherit fetchurl stdenv pth;
+    inherit fetchurl stdenv pth libgpgerror;
   };
 
   libavc1394 = import ../development/libraries/libavc1394 {