diff --git a/mutt-1.5.23-cariage-return.path b/mutt-1.5.23-carriage-return.path similarity index 89% rename from mutt-1.5.23-cariage-return.path rename to mutt-1.5.23-carriage-return.path index a4f91f4..fe6ee13 100644 --- a/mutt-1.5.23-cariage-return.path +++ b/mutt-1.5.23-carriage-return.path @@ -1,10 +1,22 @@ --- - lib.c | 12 ++++++++++++ - lib.h | 1 + - pager.c | 2 +- - pgp.c | 24 ++++++++++++------------ - 4 files changed, 26 insertions(+), 13 deletions(-) + crypt-gpgme.c | 2 +- + lib.c | 12 ++++++++++++ + lib.h | 1 + + pager.c | 2 +- + pgp.c | 24 ++++++++++++------------ + 5 files changed, 27 insertions(+), 14 deletions(-) +--- crypt-gpgme.c ++++ crypt-gpgme.c 2016-11-23 10:06:56.163851435 +0000 +@@ -2313,7 +2313,7 @@ static void copy_clearsigned (gpgme_data + + if (armor_header) + { +- if (buf[0] == '\n') ++ if (buf[0] == '\n' || (buf[0] == '\r' && buf[1] == '\n')) + armor_header = 0; + continue; + } --- lib.c +++ lib.c 2013-05-29 09:31:53.000000000 +0000 @@ -880,6 +880,18 @@ int mutt_strcmp(const char *a, const cha diff --git a/mutt.changes b/mutt.changes index d20e3fa..07f7d1f 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Nov 23 10:13:49 UTC 2016 - werner@suse.de + +- Rename patch mutt-1.5.23-cariage-return.path to + mutt-1.5.23-carriage-return.path +- Extend patch mutt-1.5.23-carriage-return.path + Be sure that also signed messages from Android can be verified + by gpgme interface of mutt + ------------------------------------------------------------------- Tue Sep 13 10:05:16 UTC 2016 - werner@suse.de diff --git a/mutt.spec b/mutt.spec index cf6b1ea..2283c5f 100644 --- a/mutt.spec +++ b/mutt.spec @@ -102,7 +102,7 @@ Patch12: patch-1.5.24.vk.pgp_verbose_mime # PATCH-FIX-OPENSUSE: bnc#813498 - mutt crashes in fgetwc in text_enriched_handler Patch15: widechar.sidebar.dif # PATCH-FIX-OPENSUSE: Be able to read signed/encrypted messsages even with CRLF -Patch16: mutt-1.5.23-cariage-return.path +Patch16: mutt-1.5.23-carriage-return.path # PATCH-FIX-OPENSUSE bnc#899712 - fallback mailcap for e.g text/html Patch18: mutt-1.5.21-mailcap.diff # PATCH-FIX-SUSE: bsc#907453 - CVE-2014-9116: mutt: heap-based buffer overflow in mutt_substrdup()