alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

pkgs.gnupg1: 1.4.19 -> 1.4.20

Browse source
This commit is contained in:
Lancelot SIX 2015-12-20 18:36:31 +01:00
parent 5ff1c58606
commit e3e2273382
2 changed files with 2 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/tools/security/gnupg/1.nix
View file

@ -1,15 +1,13 @@
{ stdenv, fetchurl, readline, bzip2 }:
stdenv.mkDerivation rec {
name = "gnupg-1.4.19";
name = "gnupg-1.4.20";
src = fetchurl {
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
sha256 = "7f09319d044b0f6ee71fe3587bb873be701723ac0952cff5069046a78de8fd86";
sha256 = "1k7d6zi0zznqsmcjic0yrgfhqklqz3qgd3yac7wxsa7s6088p604";
};
patches = [ ./remove-debug-message.patch ];
buildInputs = [ readline bzip2 ];
doCheck = true;

22
pkgs/tools/security/gnupg/remove-debug-message.patch
View file

@ -1,22 +0,0 @@
commit 936416690e6c889505d84fe96983a66983beae5e
Author: Werner Koch <wk@gnupg.org>
Date: Thu Feb 26 09:38:58 2015 +0100
gpg: Remove left-over debug message.
* g10/armor.c (check_input): Remove log_debug.
diff --git a/g10/armor.c b/g10/armor.c
index 6c0013d..de1726d 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -534,9 +534,6 @@ check_input( armor_filter_context_t *afx, IOBUF a )
/* This is probably input from a keyserver helper and we
have not yet seen an error line. */
afx->key_failed_code = parse_key_failed_line (line+4, len-4);
- log_debug ("armor-keys-failed (%.*s) ->%d\n",
- (int)len, line,
- afx->key_failed_code);
}
if( i >= 0 && !(afx->only_keyblocks && i != 1 && i != 5 && i != 6 )) {
hdr_line = i;