diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-07-04 13:18:11 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-07-04 13:18:11 +0200 |
| commit | 0fdabe7ab999ab12b06af6bb2f7aea5d3df81dc3 (patch) | |
| tree | c589a9d727306f469c21f4c085e369d563190418 /modules/user/aszlig/programs | |
| parent | 5b1fef1e9dba778bed0586534744133c17215bca (diff) | |
gajim: Provide more complete fix for GnuPG 2.1.13
The previous attempts only fixed the KEY_CONSIDERED status line for a few specific GnuPG functions, but after looking up the GnuPG source code the status line can happen on virtually *any* function that looks up one or more keys. So this time, we're going to add handling of KEY_CONSIDERED to every single status line handler. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules/user/aszlig/programs')
| -rw-r--r-- | modules/user/aszlig/programs/gajim/gnupg-2.1.13.patch | 56 |
1 files changed, 53 insertions, 3 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 index a67188af..062d173f 100644 --- a/modules/user/aszlig/programs/gajim/gnupg-2.1.13.patch +++ b/modules/user/aszlig/programs/gajim/gnupg-2.1.13.patch @@ -1,6 +1,56 @@ ---- a/src/common/gnupg.py 1970-01-01 01:00:01.000000000 +0100 -+++ b/src/common/gnupg.py 2016-07-04 12:44:42.680621101 +0200 -@@ -613,7 +613,7 @@ +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", |