diff options
| author | Lancelot SIX <lancelot@lancelotsix.com> | 2015-12-20 18:36:31 +0100 |
|---|---|---|
| committer | Lancelot SIX <lancelot@lancelotsix.com> | 2015-12-20 18:50:19 +0100 |
| commit | e3e2273382dfd1a8411aa8b0b3ef0c4b31c0c016 (patch) | |
| tree | 56a7dbfa62b9559b0ecb96d4a3bb4b274c97ec46 | |
| parent | 5ff1c586066501a4aa1083fb43838340cf1233c0 (diff) | |
| download | nixlib-e3e2273382dfd1a8411aa8b0b3ef0c4b31c0c016.tar nixlib-e3e2273382dfd1a8411aa8b0b3ef0c4b31c0c016.tar.gz nixlib-e3e2273382dfd1a8411aa8b0b3ef0c4b31c0c016.tar.bz2 nixlib-e3e2273382dfd1a8411aa8b0b3ef0c4b31c0c016.tar.lz nixlib-e3e2273382dfd1a8411aa8b0b3ef0c4b31c0c016.tar.xz nixlib-e3e2273382dfd1a8411aa8b0b3ef0c4b31c0c016.tar.zst nixlib-e3e2273382dfd1a8411aa8b0b3ef0c4b31c0c016.zip | |
pkgs.gnupg1: 1.4.19 -> 1.4.20
| -rw-r--r-- | pkgs/tools/security/gnupg/1.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/security/gnupg/remove-debug-message.patch | 22 |
2 files changed, 2 insertions, 26 deletions
diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index d5045806e0c9..8593fe69733a 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -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; diff --git a/pkgs/tools/security/gnupg/remove-debug-message.patch b/pkgs/tools/security/gnupg/remove-debug-message.patch deleted file mode 100644 index 92fc6f2cfcac..000000000000 --- a/pkgs/tools/security/gnupg/remove-debug-message.patch +++ /dev/null @@ -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; |