[Nix-dev] [PATCH] gnupg1orig: Remove left-over debug message.

Petar Bogdanovic petar at smokva.net
Fri Mar 27 22:48:27 CET 2015


---
 pkgs/tools/security/gnupg/1.nix                    |  2 ++
 .../security/gnupg/remove-debug-message.patch      | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/security/gnupg/remove-debug-message.patch

diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix
index c5d2ca1..d504580 100644
--- a/pkgs/tools/security/gnupg/1.nix
+++ b/pkgs/tools/security/gnupg/1.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "7f09319d044b0f6ee71fe3587bb873be701723ac0952cff5069046a78de8fd86";
   };
 
+  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
new file mode 100644
index 0000000..5127262
--- /dev/null
+++ b/pkgs/tools/security/gnupg/remove-debug-message.patch
@@ -0,0 +1,22 @@
+commit 936416690e6c889505d84fe96983a66983beae5e
+Author: Werner Koch <wk at 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;
-- 
2.3.2

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
Url : http://lists.science.uu.nl/pipermail/nix-dev/attachments/20150327/fb467162/attachment.bin 


More information about the nix-dev mailing list