1
0
forked from pool/mutt

Accepting request 510046 from server:mail

1

OBS-URL: https://build.opensuse.org/request/show/510046
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutt?expand=0&rev=77
This commit is contained in:
Yuchen Lin 2017-08-08 09:58:31 +00:00 committed by Git OBS Bridge
commit 6c3ac33f54
17 changed files with 398 additions and 305 deletions

View File

@ -1,22 +1,14 @@
ask when sending list message replies to author only - Armin Wolfermann (aw)
---
PATCHES | 1 +
init.h | 7 +++++++
mutt.h | 1 +
send.c | 18 ++++++++++++++++++
4 files changed, 27 insertions(+)
init.h | 7 +++++++
mutt.h | 1 +
send.c | 18 ++++++++++++++++++
3 files changed, 26 insertions(+)
--- PATCHES
+++ PATCHES 2017-04-28 13:20:07.709043569 +0000
@@ -1,3 +1,4 @@
+patch-1.5.9.aw.listreply.1
patch-attach-headers-color-neomutt
patch-compose-to-sender-neomutt
patch-compress-neomutt
--- init.h
+++ init.h 2017-04-28 13:20:58.292077398 +0000
@@ -1581,6 +1581,13 @@ struct option_t MuttVars[] = {
+++ init.h 2017-06-13 08:07:08.641344928 +0000
@@ -1631,6 +1631,13 @@ struct Option MuttVars[] = {
** ``$$keywords_standard'' are \fCfalse\fP, mutt will save keywords
** to legacy headers to ensure that it does not lose your labels.
*/
@ -31,8 +23,8 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
/*
** .pp
--- mutt.h
+++ mutt.h 2017-04-28 13:21:29.103488852 +0000
@@ -299,6 +299,7 @@ enum
+++ mutt.h 2017-06-13 08:07:08.641344928 +0000
@@ -249,6 +249,7 @@ enum
#endif
OPT_SUBJECT,
OPT_VERIFYSIG, /* verify PGP signatures */
@ -41,16 +33,16 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
OPT_TOMODERATED,
OPT_CATCHUP,
--- send.c
+++ send.c 2017-04-28 13:22:41.410113734 +0000
@@ -498,6 +498,7 @@ static int include_reply(CONTEXT *ctx, H
static int default_to(ADDRESS **to, ENVELOPE *env, int flags, int hmfupto)
+++ send.c 2017-06-13 08:08:46.631548101 +0000
@@ -512,6 +512,7 @@ static int include_reply(struct Context
static int default_to(struct Address **to, struct Envelope *env, int flags, int hmfupto)
{
char prompt[STRING];
+ ADDRESS *tmp;
+ struct Address *tmp;
if (flags && env->mail_followup_to && hmfupto == MUTT_YES)
{
@@ -511,6 +512,23 @@ static int default_to(ADDRESS **to, ENVE
@@ -525,6 +526,23 @@ static int default_to(struct Address **t
if (flags & SENDLISTREPLY)
return 0;

View File

@ -17,8 +17,8 @@ Index: mutt/lib.c
1 file changed, 3 insertions(+)
--- lib.c
+++ lib.c 2017-04-28 13:46:19.479130332 +0000
@@ -825,6 +825,9 @@ char *mutt_substrdup(const char *begin,
+++ lib.c 2017-06-13 08:18:01.113325096 +0000
@@ -820,6 +820,9 @@ char *mutt_substrdup(const char *begin,
size_t len;
char *p = NULL;

View File

@ -1,23 +1,23 @@
---
crypt_gpgme.c | 2 +-
mh.c | 6 +++---
mutt.h | 2 +-
body.h | 2 +-
mh.c | 6 +++---
ncrypt/crypt_gpgme.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
--- crypt_gpgme.c
+++ crypt_gpgme.c 2017-04-28 13:17:28.120091455 +0000
@@ -485,7 +485,7 @@ static gpgme_data_t body_to_data_object(
/* Create a GPGME data object from the stream FP but limit the object
to LENGTH bytes starting at OFFSET bytes from the beginning of the
file. */
-static gpgme_data_t file_to_data_object(FILE *fp, long offset, long length)
+static gpgme_data_t file_to_data_object(FILE *fp, LOFF_T offset, long length)
{
int err = 0;
gpgme_data_t data;
--- body.h
+++ body.h 2017-06-13 08:06:05.550501689 +0000
@@ -29,7 +29,7 @@ struct Body
struct Parameter *parameter; /* parameters of the content-type */
char *description; /* content-description */
char *form_name; /* Content-Disposition form-data name param */
- long hdr_offset; /* offset in stream where the headers begin.
+ LOFF_T hdr_offset; /* offset in stream where the headers begin.
* this info is used when invoking metamail,
* where we need to send the headers of the
* attachment
--- mh.c
+++ mh.c 2017-04-28 13:18:03.683412304 +0000
@@ -1735,9 +1735,9 @@ static int mh_rewrite_message(CONTEXT *c
+++ mh.c 2017-06-13 08:04:35.572151258 +0000
@@ -1732,9 +1732,9 @@ static int mh_rewrite_message(struct Con
char newpath[_POSIX_PATH_MAX];
char partpath[_POSIX_PATH_MAX];
@ -30,14 +30,14 @@
if ((dest = mx_open_new_message(ctx, h, 0)) == NULL)
return -1;
--- mutt.h
+++ mutt.h 2017-04-28 13:18:35.438805848 +0000
@@ -738,7 +738,7 @@ typedef struct body
PARAMETER *parameter; /* parameters of the content-type */
char *description; /* content-description */
char *form_name; /* Content-Disposition form-data name param */
- long hdr_offset; /* offset in stream where the headers begin.
+ LOFF_T hdr_offset; /* offset in stream where the headers begin.
* this info is used when invoking metamail,
* where we need to send the headers of the
* attachment
--- ncrypt/crypt_gpgme.c
+++ ncrypt/crypt_gpgme.c 2017-06-13 08:04:35.572151258 +0000
@@ -493,7 +493,7 @@ static gpgme_data_t body_to_data_object(
/* Create a GPGME data object from the stream FP but limit the object
to LENGTH bytes starting at OFFSET bytes from the beginning of the
file. */
-static gpgme_data_t file_to_data_object(FILE *fp, long offset, long length)
+static gpgme_data_t file_to_data_object(FILE *fp, LOFF_T offset, long length)
{
int err = 0;
gpgme_data_t data;

View File

@ -1,3 +0,0 @@
#!/bin/bash
unset CFLAGS
/usr/lib/mit/bin/krb5-config ${1+"$@"} | sed -e 's/-Wl[^[:blank:]]+//g'

View File

@ -5,8 +5,8 @@ Index: init.h
1 file changed, 2 insertions(+), 1 deletion(-)
--- init.h
+++ init.h 2017-04-28 12:56:30.912131384 +0000
@@ -4224,7 +4224,8 @@ struct option_t MuttVars[] = {
+++ init.h 2017-06-13 07:52:39.605269357 +0000
@@ -4297,7 +4297,8 @@ struct Option MuttVars[] = {
** When \fIset\fP, mutt will weed headers when displaying, forwarding,
** printing, or replying to messages.
*/

View File

@ -1,12 +1,12 @@
---
init.h | 7 +++++++
mutt.h | 1 +
send.c | 12 ++++++++++--
init.h | 7 +++++++
options.h | 1 +
send.c | 12 ++++++++++--
3 files changed, 18 insertions(+), 2 deletions(-)
--- init.h
+++ init.h 2017-04-28 12:50:23.915168252 +0000
@@ -3011,6 +3011,13 @@ struct option_t MuttVars[] = {
+++ init.h 2017-06-13 07:47:41.578725458 +0000
@@ -3078,6 +3078,13 @@ struct Option MuttVars[] = {
** .pp
** Also see the $$force_name variable.
*/
@ -20,9 +20,9 @@
{ "score", DT_BOOL, R_NONE, OPTSCORE, 1 },
/*
** .pp
--- mutt.h
+++ mutt.h 2017-04-28 12:47:19.222709344 +0000
@@ -474,6 +474,7 @@ enum
--- options.h
+++ options.h 2017-06-13 07:51:23.062670919 +0000
@@ -151,6 +151,7 @@ enum
OPTSAVEADDRESS,
OPTSAVEEMPTY,
OPTSAVENAME,
@ -31,8 +31,8 @@
#ifdef USE_SIDEBAR
OPTSIDEBAR,
--- send.c
+++ send.c 2017-04-28 12:55:18.981510643 +0000
@@ -603,8 +603,16 @@ int mutt_fetch_recips(ENVELOPE *out, ENV
+++ send.c 2017-06-13 07:47:41.578725458 +0000
@@ -617,8 +617,16 @@ int mutt_fetch_recips(struct Envelope *o
if ((flags & SENDGROUPREPLY) && (!in->mail_followup_to || hmfupto != MUTT_YES))
{
/* if(!mutt_addr_is_user(in->to)) */

View File

@ -8,8 +8,8 @@ Index: mutt-1.5.21/init.c
1 file changed, 2 insertions(+), 1 deletion(-)
--- init.c
+++ init.c 2017-04-28 13:44:54.680745977 +0000
@@ -3935,7 +3935,8 @@ void mutt_init(int skip_sys_rc, LIST *co
+++ init.c 2017-06-13 08:17:31.217879191 +0000
@@ -4088,7 +4088,8 @@ void mutt_init(int skip_sys_rc, struct L
/* Default search path from RFC1524 */
MailcapPath = safe_strdup(
"~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR

View File

@ -1,25 +1,14 @@
---
crypt_gpgme.c | 2 +-
lib.c | 12 ++++++++++++
lib.h | 1 +
pager.c | 2 +-
pgp.c | 24 ++++++++++++------------
lib.c | 12 ++++++++++++
lib.h | 1 +
ncrypt/crypt_gpgme.c | 2 +-
ncrypt/pgp.c | 24 ++++++++++++------------
pager.c | 2 +-
5 files changed, 27 insertions(+), 14 deletions(-)
--- crypt_gpgme.c
+++ crypt_gpgme.c 2017-04-28 13:37:50.216829516 +0000
@@ -2301,7 +2301,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 2017-04-28 13:36:40.198162342 +0000
@@ -880,6 +880,18 @@ int mutt_strcmp(const char *a, const cha
+++ lib.c 2017-06-13 08:15:45.319842066 +0000
@@ -875,6 +875,18 @@ int mutt_strcmp(const char *a, const cha
return strcmp(NONULL(a), NONULL(b));
}
@ -39,29 +28,29 @@
{
return strcasecmp(NONULL(a), NONULL(b));
--- lib.h
+++ lib.h 2017-04-28 13:38:18.944282628 +0000
@@ -168,6 +168,7 @@ int mutt_copy_bytes(FILE *, FILE *, size
int mutt_rx_sanitize_string(char *, size_t, const char *);
int mutt_strcasecmp(const char *, const char *);
int mutt_strcmp(const char *, const char *);
+++ lib.h 2017-06-13 08:16:23.791128961 +0000
@@ -158,6 +158,7 @@ int mutt_copy_bytes(FILE *in, FILE *out,
int mutt_rx_sanitize_string(char *dest, size_t destlen, const char *src);
int mutt_strcasecmp(const char *a, const char *b);
int mutt_strcmp(const char *a, const char *b);
+int mutt_strxcmp(const char *, const char *);
int mutt_strncasecmp(const char *, const char *, size_t);
int mutt_strncmp(const char *, const char *, size_t);
int mutt_strcoll(const char *, const char *);
--- pager.c
+++ pager.c 2017-04-28 13:39:16.319190287 +0000
@@ -773,7 +773,7 @@ static void resolve_types(char *buf, cha
lineInfo[n].type = MT_COLOR_NORMAL;
else if (check_attachment_marker((char *) raw) == 0)
lineInfo[n].type = MT_COLOR_ATTACHMENT;
- else if ((mutt_strcmp("-- \n", buf) == 0) || (mutt_strcmp("-- \r\n", buf) == 0))
+ else if (mutt_strxcmp("-- \n", buf) == 0)
{
i = n + 1;
int mutt_strncasecmp(const char *a, const char *b, size_t l);
int mutt_strncmp(const char *a, const char *b, size_t l);
int mutt_strcoll(const char *a, const char *b);
--- ncrypt/crypt_gpgme.c
+++ ncrypt/crypt_gpgme.c 2017-06-13 08:15:45.319842066 +0000
@@ -2294,7 +2294,7 @@ static void copy_clearsigned(gpgme_data_
--- pgp.c
+++ pgp.c 2017-04-28 13:40:43.301534032 +0000
@@ -282,7 +282,7 @@ static void pgp_copy_clearsigned(FILE *f
if (armor_header)
{
- if (buf[0] == '\n')
+ if (buf[0] == '\n' || (buf[0] == '\r' && buf[1] == '\n'))
armor_header = 0;
continue;
}
--- ncrypt/pgp.c
+++ ncrypt/pgp.c 2017-06-13 08:15:45.323841992 +0000
@@ -288,7 +288,7 @@ static void pgp_copy_clearsigned(FILE *f
continue;
}
@ -70,7 +59,7 @@
break;
if (armor_header)
@@ -347,14 +347,14 @@ int pgp_application_pgp_handler(BODY *m,
@@ -352,14 +352,14 @@ int pgp_application_pgp_handler(struct B
{
clearsign = 0;
@ -88,7 +77,7 @@
{
needpass = 0;
pgp_keyblock = 1;
@@ -388,9 +388,9 @@ int pgp_application_pgp_handler(BODY *m,
@@ -393,9 +393,9 @@ int pgp_application_pgp_handler(struct B
fputs(buf, tmpfp);
@ -101,7 +90,7 @@
break;
/* remember optional Charset: armor header as defined by RfC4880 */
if (mutt_strncmp("Charset: ", buf, 9) == 0)
@@ -631,11 +631,11 @@ static int pgp_check_traditional_one_bod
@@ -636,11 +636,11 @@ static int pgp_check_traditional_one_bod
{
if (mutt_strncmp("-----BEGIN PGP ", buf, 15) == 0)
{
@ -116,7 +105,7 @@
key = 1;
}
}
@@ -1120,9 +1120,9 @@ BODY *pgp_sign_message(BODY *a)
@@ -1122,9 +1122,9 @@ struct Body *pgp_sign_message(struct Bod
*/
while (fgets(buffer, sizeof(buffer) - 1, pgpout) != NULL)
{
@ -128,3 +117,14 @@
fputs("-----END PGP SIGNATURE-----\n", fp);
else
fputs(buffer, fp);
--- pager.c
+++ pager.c 2017-06-13 08:15:45.323841992 +0000
@@ -803,7 +803,7 @@ static void resolve_types(char *buf, cha
lineInfo[n].type = MT_COLOR_NORMAL;
else if (check_attachment_marker((char *) raw) == 0)
lineInfo[n].type = MT_COLOR_ATTACHMENT;
- else if ((mutt_strcmp("-- \n", buf) == 0) || (mutt_strcmp("-- \r\n", buf) == 0))
+ else if (mutt_strxcmp("-- \n", buf) == 0)
{
i = n + 1;

View File

@ -3,42 +3,42 @@
lib.c | 7 ++-
mbox.c | 5 ++
mh.c | 9 +++-
mutt.h | 5 +-
mutt.h | 3 +
opennfs.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
sendlib.c | 4 +
7 files changed, 151 insertions(+), 5 deletions(-)
7 files changed, 150 insertions(+), 4 deletions(-)
--- Makefile.am
+++ Makefile.am 2017-04-28 13:01:24.850494937 +0000
@@ -43,7 +43,7 @@ mutt_SOURCES = addrbook.c alias.c ascii.
date.c edit.c editmsg.c enter.c filter.c flags.c from.c getdomain.c \
group.c handler.c hash.c hdrline.c headers.c help.c history.c hook.c \
init.c keymap.c lib.c main.c mbox.c mbyte.c menu.c mh.c muttlib.c \
- mutt_idna.c mutt_sasl_plain.c mx.c pager.c parse.c pattern.c \
+ mutt_idna.c mutt_sasl_plain.c mx.c opennfs.c pager.c parse.c pattern.c \
postpone.c query.c recvattach.c recvcmd.c rfc1524.c rfc2047.c \
rfc2231.c rfc3676.c rfc822.c safe_asprintf.c score.c send.c sendlib.c \
signal.c sort.c status.c system.c thread.c url.c version.c
@@ -99,7 +99,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c
+++ Makefile.am 2017-06-13 08:34:27.043052733 +0000
@@ -44,7 +44,7 @@ mutt_SOURCES = account.c addrbook.c addr
handler.c hash.c hdrline.c header.h headers.c help.c history.c hook.c \
init.c keymap.c lib.c list.h main.c mbox.c mbyte.c mbyte_table.h md5.c \
menu.c mh.c muttlib.c mutt_idna.c mutt_sasl_plain.c mutt_socket.c \
- mutt_tunnel.c mx.c newsrc.c nntp.c options.h pager.c parameter.h \
+ mutt_tunnel.c mx.c newsrc.c nntp.c opennfs.c options.h pager.c parameter.h \
parse.c pattern.c pattern.h pop.c pop_auth.c pop_lib.c postpone.c \
query.c recvattach.c recvcmd.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
rfc822.c safe_asprintf.c score.c send.c sendlib.c sidebar.c signal.c \
@@ -91,7 +91,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c
mutt_dotlock_LDADD = $(LIBOBJS)
mutt_dotlock_DEPENDENCIES = $(LIBOBJS)
-pgpring_SOURCES = ascii.c extlib.c lib.c md5.c pgplib.c pgppacket.c \
+pgpring_SOURCES = ascii.c extlib.c lib.c opennfs.c md5.c pgplib.c pgppacket.c \
pgppubring.c sha1.c
pgpring_LDADD = $(LIBOBJS) $(INTLLIBS)
pgpring_DEPENDENCIES = $(LIBOBJS) $(INTLDEPS)
-pgpring_SOURCES = ascii.c extlib.c lib.c md5.c pgppubring.c sha1.c
+pgpring_SOURCES = ascii.c extlib.c lib.c md5.c opennfs.c pgppubring.c sha1.c
pgpring_LDADD = $(LIBOBJS) $(NCRYPT_LIBS) $(INTLLIBS)
pgpring_DEPENDENCIES = $(LIBOBJS) $(NCRYPT_DEPS) $(INTLDEPS)
--- lib.c
+++ lib.c 2017-04-28 13:06:30.924636428 +0000
@@ -34,6 +34,7 @@
#include <sys/types.h>
#include <sys/wait.h>
+++ lib.c 2017-06-13 08:34:27.043052733 +0000
@@ -37,6 +37,7 @@
#include <time.h>
#include <unistd.h>
+#include "mutt.h"
#include "lib.h"
+#include "mutt.h"
#ifdef HAVE_SYSEXITS_H
@@ -640,6 +641,10 @@ int safe_open(const char *path, int flag
#include <sysexits.h>
@@ -635,6 +636,10 @@ int safe_open(const char *path, int flag
struct stat osb, nsb;
int fd;
@ -49,7 +49,7 @@
if (flags & O_EXCL)
{
char safe_file[_POSIX_PATH_MAX];
@@ -662,7 +667,7 @@ int safe_open(const char *path, int flag
@@ -657,7 +662,7 @@ int safe_open(const char *path, int flag
if ((fd = open(path, flags & ~O_EXCL, 0600)) < 0)
return fd;
@ -59,8 +59,8 @@
if (lstat(path, &osb) < 0 || fstat(fd, &nsb) < 0 || !compare_stat(&osb, &nsb))
{
--- mbox.c
+++ mbox.c 2017-04-28 13:09:43.360964197 +0000
@@ -1055,8 +1055,13 @@ static int mbox_sync_mailbox(CONTEXT *ct
+++ mbox.c 2017-06-13 08:34:27.043052733 +0000
@@ -1069,8 +1069,13 @@ static int mbox_sync_mailbox(struct Cont
/* Create a temporary file to write the new version of the mailbox in. */
mutt_mktemp(tempfile, sizeof(tempfile));
@ -75,8 +75,8 @@
if (-1 != i)
{
--- mh.c
+++ mh.c 2017-04-28 13:11:02.323457092 +0000
@@ -353,7 +353,11 @@ static int mh_mkstemp(CONTEXT *dest, FIL
+++ mh.c 2017-06-13 08:34:27.047052659 +0000
@@ -357,7 +357,11 @@ static int mh_mkstemp(struct Context *de
{
snprintf(path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%" PRIu64, dest->path,
NONULL(Hostname), (int) getpid(), mutt_rand64());
@ -88,7 +88,7 @@
{
if (errno != EEXIST)
{
@@ -1492,8 +1496,11 @@ static int maildir_open_new_message(MESS
@@ -1488,8 +1492,11 @@ static int maildir_open_new_message(stru
subdir, (long long) time(NULL), mutt_rand64(), NONULL(Hostname), suffix);
mutt_debug(2, "maildir_open_new_message (): Trying %s.\n", path);
@ -102,18 +102,17 @@
if (errno != EEXIST)
{
--- mutt.h
+++ mutt.h 2017-04-28 13:13:38.944467312 +0000
@@ -1150,4 +1150,7 @@ typedef struct
#include "lib.h"
#include "protos.h"
+++ mutt.h 2017-06-13 08:34:27.047052659 +0000
@@ -348,4 +348,7 @@ struct AttachMatch
#define MUTT_PARTS_TOPLEVEL (1 << 0) /* is the top-level part */
-#endif /* _MUTT_H */
+#if defined(__linux__)
+extern int opennfs(const char *, int, int);
+#endif
+#endif /* _MUTT_H */
#endif /* _MUTT_H */
--- opennfs.c
+++ opennfs.c 2017-04-28 12:56:59.243588127 +0000
+++ opennfs.c 2017-06-13 08:36:39.904588552 +0000
@@ -0,0 +1,122 @@
+#include <errno.h>
+#include <fcntl.h>
@ -238,8 +237,8 @@
+ return open(path, flags, mode);
+}
--- sendlib.c
+++ sendlib.c 2017-04-28 13:13:54.220175677 +0000
@@ -2230,7 +2230,11 @@ static int send_msg(const char *path, ch
+++ sendlib.c 2017-06-13 08:34:27.047052659 +0000
@@ -2255,7 +2255,11 @@ static int send_msg(const char *path, ch
if (SendmailWait >= 0 && tempfile && *tempfile)
{
/* *tempfile will be opened as stdout */

View File

@ -1,40 +0,0 @@
From 67061b07d357086d1a0526a3c53adfa32f72929f Mon Sep 17 00:00:00 2001
From: Werner Fink <werner@suse.de>
Subject: Fix crash if no from is set or found
On multi folder mailbox setup and without a set
'From:' line in ~/.muttrc the mutt crash with SIGSEGV
on a NULL pointer at msg->env->from
Signed-off-by: Werner Fink <werner@suse.de>
---
crypt.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
--- a/crypt.c
+++ b/crypt.c 2017-05-10 09:02:42.654128156 +0000
@@ -179,12 +179,22 @@ int mutt_protect(HEADER *msg, char *keyl
if (option(OPTCRYPTUSEPKA) && (msg->security & SIGN))
{
+ const char *mailbox;
+ ADDRESS *from = msg->env->from;
+
+ if (!from)
+ from = mutt_default_from();
+
+ mailbox = from->mailbox;
+ if (!mailbox && EnvFrom)
+ mailbox = EnvFrom->mailbox;
+
/* Set sender (necessary for e.g. PKA). */
if ((WithCrypto & APPLICATION_SMIME) && (msg->security & APPLICATION_SMIME))
- crypt_smime_set_sender(msg->env->from->mailbox);
+ crypt_smime_set_sender(mailbox);
else if ((WithCrypto & APPLICATION_PGP) && (msg->security & APPLICATION_PGP))
- crypt_pgp_set_sender(msg->env->from->mailbox);
+ crypt_pgp_set_sender(mailbox);
}
if (msg->security & SIGN)

View File

@ -7,8 +7,8 @@
5 files changed, 36 insertions(+), 2 deletions(-)
--- configure.ac
+++ configure.ac 2017-04-28 12:37:53.765552498 +0000
@@ -393,7 +393,7 @@ main ()
+++ configure.ac 2017-06-13 07:46:56.047558768 +0000
@@ -318,7 +318,7 @@ main ()
mutt_cv_slang=$withval
if test -d $withval/include/slang; then
CPPFLAGS="$CPPFLAGS -I${withval}/include/slang"
@ -17,22 +17,22 @@
CPPFLAGS="$CPPFLAGS -I${withval}/include"
fi
LDFLAGS="$LDFLAGS -L${withval}/lib"
@@ -744,8 +744,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with-
AC_MSG_WARN([SSL support is only useful with POP, IMAP or SMTP support])
else
if test "$with_ssl" != "yes"; then
+ case $withval in /usr|/usr/local) ;;
+ *)
LDFLAGS="$LDFLAGS -L$withval/lib"
CPPFLAGS="$CPPFLAGS -I$withval/include"
+ ;;
+ esac
fi
saved_LIBS="$LIBS"
@@ -825,8 +829,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with
@@ -509,8 +509,12 @@ dnl -- end imap dependencies --
AC_ARG_WITH(ssl, AS_HELP_STRING([--with-ssl@<:@=PFX@:>@],[Enable TLS support using OpenSSL]),
[ if test "$with_ssl" != "no"; then
if test "$with_ssl" != "yes"; then
+ case $withval in /usr|/usr/local) ;;
+ *)
LDFLAGS="$LDFLAGS -L$withval/lib"
CPPFLAGS="$CPPFLAGS -I$withval/include"
+ ;;
+ esac
fi
saved_LIBS="$LIBS"
@@ -579,8 +583,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with
[
if test "$with_sasl" != "no"; then
if test "$with_sasl" != "yes"; then
+ case $with_sasl in /usr|/usr/local) ;;
+ *)
@ -44,7 +44,7 @@
saved_LIBS="$LIBS"
--- doc/Muttrc.head
+++ doc/Muttrc.head 2017-04-28 12:25:19.528026960 +0000
+++ doc/Muttrc.head 2017-06-13 07:42:27.684468937 +0000
@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
"call urlview to extract URLs out of a message"
@ -55,8 +55,8 @@
# show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
--- imap/auth.c
+++ imap/auth.c 2017-04-28 12:30:38.789900091 +0000
@@ -68,6 +68,23 @@ int imap_authenticate(IMAP_DATA *idata)
+++ imap/auth.c 2017-06-13 07:42:27.684468937 +0000
@@ -72,6 +72,23 @@ int imap_authenticate(struct ImapData *i
mutt_debug(2, "imap_authenticate: Trying method %s\n", method);
authenticator = imap_authenticators;
@ -80,7 +80,7 @@
while (authenticator->authenticate)
{
if (!authenticator->method || (ascii_strcasecmp(authenticator->method, method) == 0))
@@ -79,6 +96,9 @@ int imap_authenticate(IMAP_DATA *idata)
@@ -83,6 +100,9 @@ int imap_authenticate(struct ImapData *i
authenticator++;
}
@ -91,8 +91,8 @@
FREE(&methods);
--- init.h
+++ init.h 2017-04-28 12:33:39.178438277 +0000
@@ -3735,6 +3735,9 @@ struct option_t MuttVars[] = {
+++ init.h 2017-06-13 07:42:27.684468937 +0000
@@ -3808,6 +3808,9 @@ struct Option MuttVars[] = {
** the default from the GNUTLS library.
*/
# endif /* USE_SSL_GNUTLS */
@ -103,8 +103,8 @@
/*
** .pp
--- mx.c
+++ mx.c 2017-04-28 12:25:20.772003088 +0000
@@ -1444,6 +1444,9 @@ void mx_update_context(CONTEXT *ctx, int
+++ mx.c 2017-06-13 07:42:27.684468937 +0000
@@ -1454,6 +1454,9 @@ void mx_update_context(struct Context *c
{
h = ctx->hdrs[msgno];

View File

@ -1,3 +1,167 @@
-------------------------------------------------------------------
Thu Jul 13 10:38:57 UTC 2017 - olaf@aepfle.de
- If built with gnutls, set ssl_ca_certificates_file to avoid
warning about "server cert signed using an insecure algorithm"
-------------------------------------------------------------------
Wed Jul 12 09:26:50 UTC 2017 - olaf@aepfle.de
- Add buildconditional for openssl/gnutls
Disable gnutls, there can be only one of them and openssl was used
- Use pkgconfig to refer to openssl/gnutls
- Remove uneeded builddeps and recommends for smtp_daemon by
specifying the path to sendmail
- Remove uneeded builddep for ispell by specifying the path to it
- Update doc builddeps: add opensp, libxslt-tools, w3m
drop docbook_4,libxml2,libxslt,lynx,sgml-skel,xli
- Remove unneeded builddeps: fdupes,glibc-i18ndata,libassuan,
libcom_err,libgcrypt,libgpg-error
- Wrap desktop files handing in suse_version
- Remove included krb5-config, the copy in the devel pkg is good enough
- Use configure macro for ordinary autoconf result
- Build manual.txt with w3m to properly dump tables
- Move Requires perl-Expect to doc pkg, make it a Recommends
- Consistent suse_version for shared-mime-info usage
- Unconditional libgpgme usage
- Unconditional autoreconf
-------------------------------------------------------------------
Tue Jun 13 08:21:30 UTC 2017 - werner@suse.de
- Update to neomutt 20170609 which updates to mutt 1.8.3
+ Warn on bindkey aliasing
+ Drop PATCHES, tidy 'mutt -v' output
+ Add %z format strings to index_format
+ Add debug_level/debug_file options
+ Fix nntp group selection
+ Fix status color
+ Tidy up S/MIME contrib
+ Do not try to create Maildir if it is an NNTP URI
+ Fix missing NONULL for mutt.set() in Lua
+ Fix German PGP shortkeys
+ Remove feature muttrc files
+ Merge README.notmuch into manual
+ Remove unneded scripts
+ Remove README.SECURITY
+ Remove BEWARE and devel-notes.txt
+ Update Makefiles
+ Delete TODO files
+ Remove legacy files
+ Don't generate vim-neomutt syntax file
+ Remove LaTeX/pdf manual generation
+ Add missing docs for expandos
+ Fix sidebar howto examples
+ Remove some upstream references
+ Drop refs to patches
+ Improve PR template and CONTRIBUTING.md
+ Fix list items in newbie-tutorial's Mailing List Guidelines
+ Remove configure options that no longer exist
+ fix newbie tutorial
+ document signing tags / releases
+ config: drop unused paginate command
+ script: split tests up into several
+ convert credits page to markdown
+ simpify 404 page
+ improve newbie tutorial
+ remove help.html and integrate its content elsewhere
+ make: "graphviz" program is needed for generating diagram
+ improve getting started guide // include legacy files
+ dev: add list of architectures/operating systems
+ numerous small fixes
+ Remove typedefs and rename ~130 structs
+ Add separate hcache dir
+ Move crypto files to ncrypt dir
+ Split up mutt.h, protos.h
+ Always build: sidebar, imap, pop, smtp, compressed, nntp
+ Remove --enable-mailtool configure option
+ Make dotlock optional
+ Change gpgme requirement back to 1.1.0
+ Remove check_sec.sh
+ Fix safe_calloc args
+ Remove unused macros
+ Remove unused option: SmimeSignOpaqueCommand
+ Move configure-generated files
+ Update distcheck build flags
+ Drop obsolete iconv check
+ Unused prototypes - unsupported systems
+ Drop many configure tests for things defined in POSIX:2001
+ Kill useless crypthash.h file
+ Run clang-format on the code
+ Fail early if ncursesw cannot be found
+ Add names prototype arguments
+ Abbreviate pointer tests against NULL
+ Initialise pointers to NULL
+ Reduce the scope of for loop variables
+ Coverity: fix defects
+ Convert all exec calls to use mutt_envlist(), remove setenv function
+ Note that mbox-hooks are dependent on $move
+ Refresh header color when updating label
+ Remove glibc-specific execvpe() call in sendlib.c
+ Add color commands for the compose menu headers and security status
+ Fix sidebar count updates when closing mailbox
+ Don't modify LastFolder/CurrentFolder upon aborting a change folder operation
+ Change message modifying operations to additively set redraw flags
+ Improve maildir and mh to report flag changes in mx_check_mailbox()
+ Add $header_color_partial to allow partial coloring of headers
+ Rename REDRAW_SIGWINCH to REDRAW_FLOW
+ Create R_PAGER_FLOW config variable flag
+ Turn IMAP_EXPUNGE_EXPECTED back off when syncing
+ Add $history_remove_dups option to remove dups from history ring
+ Also remove duplicates from the history file
+ Don't filter new entries when compacting history save file
+ Move the IMAP msn field to IMAP_HEADER_DATA
+ Fix imap expunge to match msn and fix index
+ Fix cmd_parse_fetch() to match against MSN
+ Start fixing imap_read_headers() to account for MSN gaps
+ Add msn_index and max_msn to find and check boundaries by MSN
+ Properly adjust fetch ranges when handling new mail
+ Small imap fetch fixes
+ Don't abort header cache evaluation when there is a hole
+ Fix mfc overflow check and uninitialized variable
+ Fix potential segv if mx_open_mailbox is passed an empty string
+ Don't clean up idata when closing an open-append mailbox
+ Don't clean up msn idata when closing an open-append mailbox
+ Fix memory leak when closing mailbox and using the sidebar
+ Change imap body cache cleanup to use the uid_hash
+ Convert classic s/mime to space delimit findKeys output
+ Add self-encrypt options for PGP and S/MIME
+ Change $postpone_encrypt to use self-encrypt variables first
+ Automatic post-release commit for mutt-1.8.3
+ Add note about message scoring and thread patterns
+ unbind mappings before overwriting in vim-keys
+ latest coverity issues (#624)
+ don't pass colour-codes to filters
+ Don't set a colour unless it's been defined.
+ crash if no from is set or founds
+ ifdef command
+ fix translations
+ fix some remaining translation problems
+ explain binding warnings
+ don't document unsupported arches
+ fix make git_ver.h
+ allow xsltproc and w3m calls to fail
+ fix make dist
+ Add a mutt_endwin() before invoking $sendmail
+ Restore setenv function
+ Fix tag-prefix to not abort on $timeout
+ Change km_dokey() to return -2 on a timeout/sigwinch
+ Enable TEXTDOMAINDIR override to make translation testing easier
+ Fix "format string is not a string literal" warnings
- Modifyed and ported patches
* aw.listreply.diff
* bsc907453-CVE-2014-9116-jessie.patch
* bug-676388-largefile.patch
* mutt-1.5.15-wrapcolumn.diff
* mutt-1.5.20-sendgroupreplyto.diff
* mutt-1.5.21-mailcap.diff
* mutt-1.5.23-carriage-return.path
* mutt-1.6.1-opennfs.dif
* patch-1.5.24.vk.pgp_verbose_mime
* widechar.sidebar.dif
- Delete patch mutt-1.8.2-from4crypt.diff now upstream
- Renamed patch mutt-1.8.2.dif which becomes mutt-1.8.3.dif
-------------------------------------------------------------------
Wed May 10 08:55:37 UTC 2017 - werner@suse.de

113
mutt.spec
View File

@ -16,55 +16,43 @@
#
%bcond_without mutt_openssl
%bcond_with mutt_gnutls
Name: mutt
#!BuildIgnore: sendmail
%if %{with mutt_openssl}
BuildRequires: pkgconfig(openssl)
%endif
%if %{with mutt_gnutls}
BuildRequires: pkgconfig(gnutls)
%endif
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: cyrus-sasl-devel
BuildRequires: cyrus-sasl-gssapi
BuildRequires: docbook-xsl-stylesheets
BuildRequires: docbook_4
BuildRequires: fdupes
BuildRequires: gdbm-devel
BuildRequires: glibc-i18ndata
BuildRequires: ispell
BuildRequires: krb5-devel
BuildRequires: libcom_err
%if 0%{?suse_version} <= 1230
BuildRequires: libgcrypt
%else
BuildRequires: libgcrypt-devel
%endif
BuildRequires: libgnutls-devel
BuildRequires: libgpg-error-devel
BuildRequires: libidn-devel
BuildRequires: libkyotocabinet-devel
BuildRequires: libopenssl-devel
BuildRequires: libxml2
BuildRequires: libxslt
BuildRequires: lua-devel
BuildRequires: lynx
BuildRequires: ncurses-devel
%if 0%{?is_opensuse}
BuildRequires: notmuch-devel
%endif
BuildRequires: postfix
BuildRequires: sgml-skel
BuildRequires: docbook-xsl-stylesheets
BuildRequires: libxslt-tools
BuildRequires: opensp
%if 0%{?suse_version}
BuildRequires: update-desktop-files
BuildRequires: xli
#if
%if 0%{?suse_version} > 1130
BuildRequires: libassuan-devel
BuildRequires: libgpgme-devel
%else
BuildRequires: gpgme-devel
%endif
BuildRequires: w3m
#if
BuildRequires: libgpgme-devel
Url: http://www.mutt.org
Provides: muttssl
Obsoletes: muttssl
Recommends: mutt-doc
Recommends: mutt-lang
Recommends: smtp_daemon
Recommends: urlscan
Recommends: urlview
Recommends: w3m
@ -72,28 +60,23 @@ Recommends: w3m
Requires(post): shared-mime-info
Requires(postun): shared-mime-info
%endif
Requires: perl(Expect)
# NOTE: We don't want this dependency and desktop-data-SuSE is in all
# desktop selections.
#Requires: desktop-data-SuSE
%global neo 20170421
Version: 1.8.2
%global neo 20170609
Version: 1.8.3
Release: 0
Summary: Mail Program
License: GPL-2.0+
Group: Productivity/Networking/Email/Clients
# ftp://ftp.mutt.org/mutt/devel/
# Source0: https://bitbucket.org/mutt/mutt/downloads/%%name-%%version.tar.gz
# Switch over to neomutt tar ball which is based on original mutt
# http://www.neomutt.org/
### https://github.com/neomutt/neomutt/archive/neomutt-20170421.tar.gz
License: GPL-2.0+
Group: Productivity/Networking/Email/Clients
Source0: neomutt-%neo.tar.gz
Source1: Signature_conversion
Source2: README.alternates
Source3: mutt.png
Source4: mutt.desktop
Source5: skel.muttrc
Source6: krb5-config
Source9: mutt.mailcap
Patch: %name-%version.dif
# http://www.spinnaker.de/mutt/compressed/
@ -113,8 +96,6 @@ Patch16: mutt-1.5.23-carriage-return.path
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-SUSE: Fix crash in crypt routines if no from is set or found
Patch20: mutt-1.8.2-from4crypt.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir %{_sysconfdir}
@ -127,6 +108,7 @@ however.
Summary: Additional Documentation about Mutt
Group: Documentation/Other
Requires: %{name} = %{version}
Recommends: perl(Expect)
Provides: %{name}:%{_docdir}/%name/COPYRIGHT
BuildArch: noarch
@ -139,7 +121,6 @@ Summary: Languages for Mutt
Group: System/Localization
Provides: mutt:/usr/share/locale/en_GB/LC_MESSAGES/mutt.mo
Requires: %{name} = %{version}
Provides: %{name}:%{_docdir}/%name/COPYRIGHT
BuildArch: noarch
%description lang
@ -160,16 +141,16 @@ ln -sf neomutt-neomutt-%neo mutt-%version
%patch16 -p0 -b .crlf
%patch18 -p0 -b .mailcap
%patch19 -p0 -b .cvw2014.9116
%patch20 -p1 -b .from4crypt
rm -vf README*.orig
rm -vf PATCHES*.orig
cp %{S:2} .
%build
%if 0%{?suse_version} > 1100
autoreconf -fi
%if %{with mutt_gnutls}
echo 'set ssl_ca_certificates_file="/etc/ssl/ca-bundle.pem"' >> doc/Muttrc.head
%endif
autoreconf -fi
cflags ()
{
local flag=$1; shift
@ -205,21 +186,28 @@ cflags -Wl,--as-needed LDFLAGS
cflags -Wl,-O2 LDFLAGS
cflags -Wl,--hash-size=8599 LDFLAGS
cflags -pie LDFLAGS
KRB5CFGPATH=%{S:6}
export CC CFLAGS LDFLAGS KRB5CFGPATH
chmod 755 $KRB5CFGPATH
./configure $RPM_ARCH-suse-linux \
--prefix=%{_prefix} \
--datadir=%{_datadir} \
--sysconfdir=%{_sysconfdir} \
--mandir=%{_mandir} \
export CC CFLAGS LDFLAGS
export SENDMAIL=/usr/sbin/sendmail
export ISPELL=/usr/bin/ispell
export PATH="/usr/lib/mit/bin:$PATH"
export KRB5CFGPATH="$(type -p krb5-config)"
$KRB5CFGPATH --cflags gssapi
$KRB5CFGPATH --libs gssapi
$KRB5CFGPATH --version
%configure \
--with-docdir=%{_docdir}/%name \
--without-ssl \
--without-gnutls \
%if %{with mutt_openssl}
--with-ssl=%{_prefix} \
%endif
%if %{with mutt_gnutls}
--with-gnutls=%{_prefix} \
%endif
--enable-imap \
--enable-pop \
--enable-pgp \
%if 0%{?suse_version} >= 1100
--enable-gpgme \
%endif
--enable-nfs-fix \
--enable-mailtool \
--enable-compressed \
@ -230,10 +218,8 @@ chmod 755 $KRB5CFGPATH
--disable-external-dotlock \
--with-gdbm \
--with-kyotocabinet \
--with-ssl=%{_prefix} \
--with-sasl=%{_prefix} \
--with-gss=%{_prefix} \
--with-gnutls=%{_prefix} \
--with-curses=%{_prefix} \
--enable-smtp \
--enable-lua \
@ -274,10 +260,11 @@ install -D -m 644 %{SOURCE9} %{buildroot}%{_datadir}/%name/mailcap
rm -vf %{buildroot}%{_docdir}/%name/manual.txt
install -D -m 644 doc/manual.txt.gz %{buildroot}%{_docdir}/%name/
chmod a-x %{buildroot}%{_docdir}/%name/keybase/*.sh
%if 0%{?suse_version}
%suse_update_desktop_file mutt
%endif
%if 0%{?suse_version} >= 1140
%if 0%{?suse_version} > 1130
%post
%mime_database_post
@ -311,8 +298,6 @@ chmod a-x %{buildroot}%{_docdir}/%name/keybase/*.sh
%defattr(-,root,root)
%doc %{_docdir}/%name/COPYRIGHT
%doc %{_docdir}/%name/README*
%doc %{_docdir}/%name/NEWS
%doc %{_docdir}/%name/TODO
%doc %{_docdir}/%name/ChangeLog
%doc %{_docdir}/%name/ChangeLog.neomutt
%doc %{_docdir}/%name/LICENSE.md
@ -320,19 +305,23 @@ chmod a-x %{buildroot}%{_docdir}/%name/keybase/*.sh
%doc %{_docdir}/%name/*.txt
%dir %doc %{_docdir}/%name/keybase/
%doc %{_docdir}/%name/keybase/*
%doc %{_docdir}/%name/muttrc.*
%doc %{_docdir}/%name/neomutt-syntax.vim
%dir %doc %{_docdir}/%name/samples/
%doc %{_docdir}/%name/samples/*.rc
%doc %{_docdir}/%name/samples/ca-bundle.crt
%doc %{_docdir}/%name/samples/colors.*
%dir %doc %{_docdir}/%name/samples/iconv/
%doc %{_docdir}/%name/samples/iconv/*.rc
%doc %{_docdir}/%name/samples/mutt_xtitle
%doc %{_docdir}/%name/samples/sample.*
%doc %{_docdir}/%name/samples/smime_keys_test.pl
%dir %doc %{_docdir}/%name/vim-keys/
%doc %{_docdir}/%name/vim-keys/*
%dir %doc %{_docdir}/%name/hcache-bench/
%doc %{_docdir}/%name/hcache-bench/README.md
%doc %{_docdir}/%name/hcache-bench/muttrc
%doc %{_docdir}/%name/hcache-bench/neomutt-hcache-bench.sh
%dir %doc %{_docdir}/%name/lua/
%doc %{_docdir}/%name/lua/test_lua-api_runner.muttrc
%doc %{_docdir}/%name/lua/test_lua-api_spec.lua
%files lang -f %name.lang
%defattr(-,root,root)

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c2033ab18f2b05b45e22475ee98a5decdb2b19934d41803a02b66dd0d452c125
size 2733547

3
neomutt-20170609.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:feaaf7ac230cbf397f028fac5498e38b5d662078083e0cf3329ba04d1bb4b0cd
size 2637349

View File

@ -1,20 +1,12 @@
---
PATCHES | 1 +
globals.h | 2 ++
init.h | 12 ++++++++++++
pgp.c | 3 ++-
4 files changed, 17 insertions(+), 1 deletion(-)
globals.h | 2 ++
init.h | 12 ++++++++++++
ncrypt/pgp.c | 3 ++-
3 files changed, 16 insertions(+), 1 deletion(-)
--- PATCHES
+++ PATCHES 2017-04-28 13:24:26.336119973 +0000
@@ -1,3 +1,4 @@
+patch-1.5.3.vk.pgp_verbose_mime
patch-1.5.9.aw.listreply.1
patch-attach-headers-color-neomutt
patch-compose-to-sender-neomutt
--- globals.h
+++ globals.h 2017-04-28 13:23:52.912755124 +0000
@@ -280,6 +280,8 @@ WHERE REGEXP PgpDecryptionOkay;
+++ globals.h 2017-06-13 08:12:32.139412148 +0000
@@ -291,6 +291,8 @@ WHERE struct Regex PgpDecryptionOkay;
WHERE char *PgpSignAs;
WHERE short PgpTimeout;
WHERE char *PgpEntryFormat;
@ -24,8 +16,8 @@
WHERE char *PgpDecodeCommand;
WHERE char *PgpVerifyCommand;
--- init.h
+++ init.h 2017-04-28 13:25:47.026586390 +0000
@@ -3342,6 +3342,18 @@ struct option_t MuttVars[] = {
+++ init.h 2017-06-13 08:12:32.139412148 +0000
@@ -3409,6 +3409,18 @@ struct Option MuttVars[] = {
** a line quoted text if it also matches $$smileys. This mostly
** happens at the beginning of a line.
*/
@ -44,9 +36,9 @@
{ "smime_ask_cert_label", DT_BOOL, R_NONE, OPTASKCERTLABEL, 1 },
/*
** .pp
--- pgp.c
+++ pgp.c 2017-04-28 13:27:03.109140122 +0000
@@ -1184,7 +1184,8 @@ BODY *pgp_sign_message(BODY *a)
--- ncrypt/pgp.c
+++ ncrypt/pgp.c 2017-06-13 08:12:32.139412148 +0000
@@ -1186,7 +1186,8 @@ struct Body *pgp_sign_message(struct Bod
t->disposition = DISPNONE;
t->encoding = ENC7BIT;
t->unlink = true; /* ok to remove this file after sending. */

View File

@ -3,8 +3,8 @@
1 file changed, 6 insertions(+), 4 deletions(-)
--- handler.c
+++ handler.c 2017-04-28 13:34:40.080448389 +0000
@@ -816,6 +816,7 @@ static int text_enriched_handler(BODY *a
+++ handler.c 2017-06-13 08:14:25.529321141 +0000
@@ -831,6 +831,7 @@ static int text_enriched_handler(struct
enum
{
TEXT,
@ -12,7 +12,7 @@
LANGLE,
TAG,
BOGUS_TAG,
@@ -853,7 +854,7 @@ static int text_enriched_handler(BODY *a
@@ -868,7 +869,7 @@ static int text_enriched_handler(struct
{
if (state != ST_EOF)
{
@ -21,7 +21,7 @@
state = ST_EOF;
else
bytes--;
@@ -861,6 +862,8 @@ static int text_enriched_handler(BODY *a
@@ -876,6 +877,8 @@ static int text_enriched_handler(struct
switch (state)
{
@ -30,7 +30,7 @@
case TEXT:
switch (wc)
{
@@ -921,9 +924,8 @@ static int text_enriched_handler(BODY *a
@@ -936,9 +939,8 @@ static int text_enriched_handler(struct
enriched_flush(&stte, 1);
else
{
@ -41,12 +41,12 @@
}
break;
@@ -1638,7 +1640,7 @@ void mutt_decode_attachment(BODY *b, STA
@@ -1653,7 +1655,7 @@ void mutt_decode_attachment(struct Body
* strip all trailing spaces to improve interoperability;
* if $text_flowed is unset, simply verbatim copy input
*/
-static int text_plain_handler(BODY *b, STATE *s)
+static int text_plain_handler(BODY *b __attribute__((unused)), STATE *s)
-static int text_plain_handler(struct Body *b, struct State *s)
+static int text_plain_handler(struct Body *b __attribute__((unused)), struct State *s)
{
char *buf = NULL;
size_t l = 0, sz = 0;