about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--modules/user/aszlig/programs/gajim/default.nix2
-rw-r--r--modules/user/aszlig/programs/gajim/gnupg-2.1.13.patch12
2 files changed, 13 insertions, 1 deletions
diff --git a/modules/user/aszlig/programs/gajim/default.nix b/modules/user/aszlig/programs/gajim/default.nix
index 4c8a4304..d1218445 100644
--- a/modules/user/aszlig/programs/gajim/default.nix
+++ b/modules/user/aszlig/programs/gajim/default.nix
@@ -41,7 +41,7 @@ let
     patches = (o.patches or []) ++ singleton (pkgs.substituteAll {
       src = ./config.patch;
       nix_config = pkgs.writeText "gajim.config" (import ./config.nix lib);
-    });
+    }) ++ singleton ./gnupg-2.1.13.patch;
     postPatch = (o.postPatch or "") + ''
       sed -i -e '/^export/i export GTK2_RC_FILES="${gtkTheme}"' \
         scripts/gajim.in
diff --git a/modules/user/aszlig/programs/gajim/gnupg-2.1.13.patch b/modules/user/aszlig/programs/gajim/gnupg-2.1.13.patch
new file mode 100644
index 00000000..c2898cab
--- /dev/null
+++ b/modules/user/aszlig/programs/gajim/gnupg-2.1.13.patch
@@ -0,0 +1,12 @@
+--- a/src/common/gnupg.py	1970-01-01 01:00:01.000000000 +0100
++++ b/src/common/gnupg.py	2016-07-04 12:23:04.660012839 +0200
+@@ -229,7 +229,8 @@
+                      "DECRYPTION_OKAY", "INV_SGNR", "FILE_START", "FILE_ERROR",
+                      "FILE_DONE", "PKA_TRUST_GOOD", "PKA_TRUST_BAD", "BADMDC",
+                      "GOODMDC", "NO_SGNR", "NOTATION_NAME", "NOTATION_DATA",
+-                     "PROGRESS", "PINENTRY_LAUNCHED", "NEWSIG"):
++                     "PROGRESS", "PINENTRY_LAUNCHED", "NEWSIG",
++                     "KEY_CONSIDERED"):
+             pass
+         elif key == "BADSIG":
+             self.valid = False