Merge remote-tracking branch 'origin/master'

1 files changed, 61 insertions, 0 deletions

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..062d173f
--- /dev/null
+++ b/modules/user/aszlig/programs/gajim/gnupg-2.1.13.patch
@@ -0,0 +1,61 @@
+diff --git a/src/common/gnupg.py b/src/common/gnupg.py
+index 2743f7a..44d494f 100644
+--- a/src/common/gnupg.py
++++ b/src/common/gnupg.py
+@@ -229,7 +229,8 @@ class Verify(object):
+                      "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
+@@ -330,7 +331,7 @@ class ImportResult(object):
+     }
+ 
+     def handle_status(self, key, value):
+-        if key == "IMPORTED":
++        if key in ("IMPORTED", "KEY_CONSIDERED"):
+             # this duplicates info we already see in import_ok & import_problem
+             pass
+         elif key == "NODATA":
+@@ -510,7 +511,7 @@ class Crypt(Verify, TextHandler):
+         if key in ("ENC_TO", "USERID_HINT", "GOODMDC", "END_DECRYPTION",
+                    "BEGIN_SIGNING", "NO_SECKEY", "ERROR", "NODATA", "PROGRESS",
+                    "CARDCTRL", "BADMDC", "SC_OP_FAILURE", "SC_OP_SUCCESS",
+-                   "PINENTRY_LAUNCHED"):
++                   "PINENTRY_LAUNCHED", "KEY_CONSIDERED"):
+             # in the case of ERROR, this is because a more specific error
+             # message will have come first
+             pass
+@@ -559,7 +560,7 @@ class GenKey(object):
+ 
+     def handle_status(self, key, value):
+         if key in ("PROGRESS", "GOOD_PASSPHRASE", "NODATA", "KEY_NOT_CREATED",
+-                   "PINENTRY_LAUNCHED"):
++                   "PINENTRY_LAUNCHED", "KEY_CONSIDERED"):
+             pass
+         elif key == "KEY_CREATED":
+             (self.type,self.fingerprint) = value.split()
+@@ -582,7 +583,9 @@ class DeleteResult(object):
+     }
+ 
+     def handle_status(self, key, value):
+-        if key == "DELETE_PROBLEM":
++        if key == "KEY_CONSIDERED":
++            pass
++        elif key == "DELETE_PROBLEM":
+             self.status = self.problem_reason.get(value,
+                                                   "Unknown error: %r" % value)
+         else:
+@@ -613,7 +616,7 @@ class Sign(TextHandler):
+                    "GOOD_PASSPHRASE", "BEGIN_SIGNING", "CARDCTRL", "INV_SGNR",
+                    "NO_SGNR", "MISSING_PASSPHRASE", "NEED_PASSPHRASE_PIN",
+                    "SC_OP_FAILURE", "SC_OP_SUCCESS", "PROGRESS",
+-                   "PINENTRY_LAUNCHED"):
++                   "PINENTRY_LAUNCHED", "KEY_CONSIDERED"):
+             pass
+         elif key in ("KEYEXPIRED", "SIGEXPIRED"):
+             self.status = 'key expired'