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

Accepting request 441558 from server:mail

Browse Source 
- Add patch mutt-1.6.2-gpgme_set_sender.patch
  that is avoid name space clash with gpgme_set_sender() from gpgme

- 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

OBS-URL: https://build.opensuse.org/request/show/441558
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutt?expand=0&rev=74
This commit is contained in:
Dominique Leuenberger 2016-11-28 14:04:58 +00:00 committed by Git OBS Bridge
commit 00ff4ddbdf
4 changed files with 74 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 ++++++++++++
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

38
mutt-1.6.2-gpgme_set_sender.patch Normal file
View File

@ -0,0 +1,38 @@
---
crypt-gpgme.c | 2 +-
crypt-gpgme.h | 2 +-
crypt-mod-pgp-gpgme.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--- crypt-gpgme.c
+++ crypt-gpgme.c 2016-11-23 10:35:10.336974209 +0000
@@ -4946,7 +4946,7 @@ int smime_gpgme_verify_sender (HEADER *h
return verify_sender (h, GPGME_PROTOCOL_CMS);
}
-void gpgme_set_sender (const char *sender)
+void mutt_gpgme_set_sender (const char *sender)
{
mutt_error ("[setting sender] mailbox: %s\n", sender);
FREE (&current_sender);
--- crypt-gpgme.h
+++ crypt-gpgme.h 2016-11-23 10:34:54.745294760 +0000
@@ -53,6 +53,6 @@ int smime_gpgme_send_menu (HEADER *msg,
int smime_gpgme_verify_sender (HEADER *h);
-void gpgme_set_sender (const char *sender);
+void mutt_gpgme_set_sender (const char *sender);
#endif
--- crypt-mod-pgp-gpgme.c
+++ crypt-mod-pgp-gpgme.c 2016-11-23 10:35:45.700247187 +0000
@@ -104,7 +104,7 @@ static BODY *crypt_mod_pgp_make_key_atta
static void crypt_mod_pgp_set_sender (const char *sender)
{
- gpgme_set_sender (sender);
+ mutt_gpgme_set_sender (sender);
}
struct crypt_module_specs crypt_mod_pgp_gpgme =

15
mutt.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Nov 23 10:39:04 UTC 2016 - werner@suse.de
- Add patch mutt-1.6.2-gpgme_set_sender.patch
that is avoid name space clash with gpgme_set_sender() from gpgme
-------------------------------------------------------------------
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

5
mutt.spec
View File

@ -102,13 +102,15 @@ 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()
Patch19: bsc907453-CVE-2014-9116-jessie.patch
# PATCH-FIX-OPENSUSE boo#980830 ... remove if fixed upstream
Patch20: COLS-workaround.dif
# PATCH-FIX-OPENSUSE avoid name space trouble with latest libgppme
Patch21: mutt-1.6.2-gpgme_set_sender.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir %{_sysconfdir}
@ -148,6 +150,7 @@ done
%patch18 -p0 -b .mailcap
%patch19 -p0 -b .cvw2014.9116
%patch20 -p0 -b .cols
%patch21 -p0 -b .ssend
rm -vf README*.orig
rm -vf PATCHES*.orig