rpm/mutt
1
0
Fork 1
forked from pool/mutt
Code Pull Requests Activity

Be able to use gpgme even for carriage return found in messages from Android

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=145
This commit is contained in:
Dr. Werner Fink 2016-11-23 10:17:15 +00:00 committed by Git OBS Bridge
parent f1d42dbdb8
commit 4f23e35b27
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mutt-1.5.23-cariage-return.path → mutt-1.5.23-carriage-return.path
View File

@ -1,10 +1,22 @@
--- ---
lib.c | 12 ++++++++++++ crypt-gpgme.c | 2 +-
lib.h | 1 + lib.c | 12 ++++++++++++
pager.c | 2 +- lib.h | 1 +
pgp.c | 24 ++++++++++++------------ pager.c | 2 +-
4 files changed, 26 insertions(+), 13 deletions(-) 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
+++ lib.c 2013-05-29 09:31:53.000000000 +0000 +++ lib.c 2013-05-29 09:31:53.000000000 +0000
@@ -880,6 +880,18 @@ int mutt_strcmp(const char *a, const cha @@ -880,6 +880,18 @@ int mutt_strcmp(const char *a, const cha

9
mutt.changes
View File

@ -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 Tue Sep 13 10:05:16 UTC 2016 - werner@suse.de

2
mutt.spec
View File

@ -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 # PATCH-FIX-OPENSUSE: bnc#813498 - mutt crashes in fgetwc in text_enriched_handler
Patch15: widechar.sidebar.dif Patch15: widechar.sidebar.dif
# PATCH-FIX-OPENSUSE: Be able to read signed/encrypted messsages even with CRLF # 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 # PATCH-FIX-OPENSUSE bnc#899712 - fallback mailcap for e.g text/html
Patch18: mutt-1.5.21-mailcap.diff Patch18: mutt-1.5.21-mailcap.diff
# PATCH-FIX-SUSE: bsc#907453 - CVE-2014-9116: mutt: heap-based buffer overflow in mutt_substrdup() # PATCH-FIX-SUSE: bsc#907453 - CVE-2014-9116: mutt: heap-based buffer overflow in mutt_substrdup()