Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2016-05-17 17:15:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mutt" Changes: -------- --- /work/SRC/openSUSE:Factory/mutt/mutt.changes 2016-04-14 13:07:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2016-05-17 17:15:26.000000000 +0200 @@ -1,0 +2,28 @@ +Thu May 12 13:50:14 UTC 2016 - [email protected] + +- Update to mutt version 1.6.1 (2016-05-01): + ! Bug fix release. No features were modified or added. +- Add and use neomutt-patches-20160502.tar.gz from + http://www.neomutt.org/ +- Modify the 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.21-tinfo.dif + mutt-1.5.23-cariage-return.path + mutt-1.5.9i-pgpewrap.diff + patch-1.5.24.vk.pgp_verbose_mime + widechar.sidebar.dif +- Modify and rename the patches + mutt-1.6.0-opennfs.dif becomes mutt-1.6.1-opennfs.dif + mutt-1.6.0.dif becomes mutt-1.6.1.dif + patch-1.6.0.rr.compressed.bz2 becomes patch-1.6.1.rr.compressed.bz2 +- Remove the patches + patch-1.6.0.sidebar.20160411.patch + nion.sidebar-color.diff + now upstream or part of neomutt patch collection + +------------------------------------------------------------------- Old: ---- mutt-1.6.0-opennfs.dif mutt-1.6.0-patches.tar.bz2 mutt-1.6.0.dif mutt-1.6.0.tar.gz nion.sidebar-color.diff patch-1.6.0.rr.compressed.bz2 patch-1.6.0.sidebar.20160411.patch New: ---- mutt-1.6.1-opennfs.dif mutt-1.6.1-patches.tar.bz2 mutt-1.6.1.dif mutt-1.6.1.tar.gz neomutt-patches-20160502.tar.gz patch-1.6.1.rr.compressed.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mutt.spec ++++++ --- /var/tmp/diff_new_pack.z1tdOb/_old 2016-05-17 17:15:28.000000000 +0200 +++ /var/tmp/diff_new_pack.z1tdOb/_new 2016-05-17 17:15:28.000000000 +0200 @@ -68,7 +68,8 @@ # NOTE: We don't want this dependency and desktop-data-SuSE is in all # desktop selections. #Requires: desktop-data-SuSE -Version: 1.6.0 +%global neo 20160502 +Version: 1.6.1 Release: 0 Summary: Mail Program License: GPL-2.0+ @@ -84,21 +85,20 @@ Source7: mutt-1.5.21.de.po Source8: %name-%version-patches.tar.bz2 Source9: mutt.mailcap +# http://www.neomutt.org/ +Source10: neomutt-patches-%{neo}.tar.gz Patch: %name-%version.dif # http://www.spinnaker.de/mutt/compressed/ -Patch1: patch-%version.rr.compressed.bz2 +Patch1: patch-1.6.1.rr.compressed.bz2 Patch2: %name-1.5.9i-pgpewrap.diff Patch3: %name-1.5.20-sendgroupreplyto.diff Patch4: %name-1.5.15-wrapcolumn.diff -# http://www.lunar-linux.org/mutt-sidebar/ -Patch6: patch-1.6.0.sidebar.20160411.patch -Patch7: mutt-1.6.0-opennfs.dif +Patch7: mutt-1.6.1-opennfs.dif Patch9: bug-676388-largefile.patch Patch10: mutt-1.5.21-tinfo.dif # http://www.wolfermann.org/mutt.html Patch11: aw.listreply.diff Patch12: patch-1.5.24.vk.pgp_verbose_mime -Patch14: nion.sidebar-color.diff # 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 @@ -116,28 +116,29 @@ however. %prep -%setup -q -n mutt-%version -b 8 +%setup -q -n mutt-%version -b 8 -b 10 for p in ../%name-%version-patches/*; do test -e $p || break echo Patch $p patch -s -p1 < $p done +patch -s -p1 < ../neomutt-patches-%{neo}/neomutt-%{neo}.patch %patch %patch1 -p0 -b .compressed %patch2 -p0 -b .pgpewrap -%patch3 -p1 -b .sendgroupreplyto +%patch3 -p0 -b .sendgroupreplyto %patch4 -p0 -b .wrapcolumn -%patch6 -p1 -b .sidebar %patch7 -p0 -b .opennfs -%patch9 -p1 -b .largefile +%patch9 -p0 -b .largefile %patch10 -p0 -b .tinfo -%patch11 -p1 -b .listreply +%patch11 -p0 -b .listreply %patch12 -p0 -b .pgp_verbose_mtime -%patch14 -p1 -b .sidebar.color -%patch15 -p1 -b .widechar.sidebar +%patch15 -p0 -b .widechar.sidebar %patch16 -p0 -b .crlf -%patch18 -p1 -b .mailcap -%patch19 -p1 -b .cvw2014.9116 +%patch18 -p0 -b .mailcap +%patch19 -p0 -b .cvw2014.9116 +rm -vf README*.orig +rm -vf PATCHES*.orig cp doc/Muttrc Muttrc.SuSE cp %{S:2} . ++++++ aw.listreply.diff ++++++ --- /var/tmp/diff_new_pack.z1tdOb/_old 2016-05-17 17:15:28.000000000 +0200 +++ /var/tmp/diff_new_pack.z1tdOb/_new 2016-05-17 17:15:28.000000000 +0200 @@ -7,15 +7,16 @@ send.c | 18 ++++++++++++++++++ 4 files changed, 27 insertions(+) ---- mutt-1.5.23/PATCHES -+++ mutt-1.5.23/PATCHES 2015-01-26 15:34:40.133518493 +0000 -@@ -1,2 +1,3 @@ +--- PATCHES ++++ PATCHES 2015-01-26 15:34:40.133518493 +0000 +@@ -1,3 +1,4 @@ +patch-1.5.9.aw.listreply.1 - patch-1.6.0.sidebar.20160404.txt rr.compressed ---- mutt-1.5.23/init.h -+++ mutt-1.5.23/init.h 2012-06-21 09:48:22.000000000 +0000 -@@ -1340,6 +1340,13 @@ struct option_t MuttVars[] = { + patch-quasi-delete-neo-20160502 + patch-progress-neo-20160502 +--- init.h ++++ init.h 2012-06-21 09:48:22.000000000 +0000 +@@ -1396,6 +1396,13 @@ struct option_t MuttVars[] = { ** The locale used by \fCstrftime(3)\fP to format dates. Legal values are ** the strings your system accepts for the locale environment variable \fC$$$LC_TIME\fP. */ @@ -29,9 +30,9 @@ { "mail_check", DT_NUM, R_NONE, UL &BuffyTimeout, 5 }, /* ** .pp ---- mutt-1.5.23/mutt.h -+++ mutt-1.5.23/mutt.h 2012-06-21 09:48:22.000000000 +0000 -@@ -288,6 +288,7 @@ enum +--- mutt.h ++++ mutt.h 2012-06-21 09:48:22.000000000 +0000 +@@ -309,6 +309,7 @@ enum #endif OPT_SUBJECT, OPT_VERIFYSIG, /* verify PGP signatures */ @@ -39,9 +40,9 @@ /* THIS MUST BE THE LAST VALUE. */ OPT_MAX ---- mutt-1.5.23/send.c -+++ mutt-1.5.23/send.c 2012-06-21 09:48:22.000000000 +0000 -@@ -452,6 +452,7 @@ static int include_reply (CONTEXT *ctx, +--- send.c ++++ send.c 2012-06-21 09:48:22.000000000 +0000 +@@ -455,6 +455,7 @@ static int include_reply (CONTEXT *ctx, static int default_to (ADDRESS **to, ENVELOPE *env, int flags, int hmfupto) { char prompt[STRING]; @@ -49,7 +50,7 @@ if (flags && env->mail_followup_to && hmfupto == M_YES) { -@@ -465,6 +466,23 @@ static int default_to (ADDRESS **to, ENV +@@ -468,6 +469,23 @@ static int default_to (ADDRESS **to, ENV if (flags & SENDLISTREPLY) return 0; ++++++ bsc907453-CVE-2014-9116-jessie.patch ++++++ --- /var/tmp/diff_new_pack.z1tdOb/_old 2016-05-17 17:15:28.000000000 +0200 +++ /var/tmp/diff_new_pack.z1tdOb/_new 2016-05-17 17:15:28.000000000 +0200 @@ -16,9 +16,9 @@ lib.c | 3 +++ 1 file changed, 3 insertions(+) ---- mutt/lib.c -+++ mutt/lib.c 2015-01-26 00:00:00.000000000 +0000 -@@ -820,6 +820,9 @@ char *mutt_substrdup (const char *begin, +--- lib.c ++++ lib.c 2015-01-26 00:00:00.000000000 +0000 +@@ -824,6 +824,9 @@ char *mutt_substrdup (const char *begin, size_t len; char *p; ++++++ bug-676388-largefile.patch ++++++ --- /var/tmp/diff_new_pack.z1tdOb/_old 2016-05-17 17:15:28.000000000 +0200 +++ /var/tmp/diff_new_pack.z1tdOb/_new 2016-05-17 17:15:28.000000000 +0200 @@ -4,9 +4,9 @@ mutt.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---- mutt-1.5.23/crypt-gpgme.c -+++ mutt-1.5.23/crypt-gpgme.c 2011-03-02 17:18:01.000000000 +0000 -@@ -450,7 +450,7 @@ static gpgme_data_t body_to_data_object +--- crypt-gpgme.c ++++ crypt-gpgme.c 2011-03-02 17:18:01.000000000 +0000 +@@ -496,7 +496,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. */ @@ -15,9 +15,9 @@ { int err = 0; gpgme_data_t data; ---- mutt-1.5.23/mh.c -+++ mutt-1.5.23/mh.c 2011-03-02 17:48:36.000000000 +0000 -@@ -1579,9 +1579,9 @@ static int mh_rewrite_message (CONTEXT * +--- mh.c ++++ mh.c 2011-03-02 17:48:36.000000000 +0000 +@@ -1620,9 +1620,9 @@ static int mh_rewrite_message (CONTEXT * char newpath[_POSIX_PATH_MAX]; char partpath[_POSIX_PATH_MAX]; @@ -30,9 +30,9 @@ if ((dest = mx_open_new_message (ctx, h, 0)) == NULL) return -1; ---- mutt-1.5.23/mutt.h -+++ mutt-1.5.23/mutt.h 2011-03-02 16:52:03.000000000 +0000 -@@ -638,7 +638,7 @@ typedef struct body +--- mutt.h ++++ mutt.h 2011-03-02 16:52:03.000000000 +0000 +@@ -681,7 +681,7 @@ typedef struct body PARAMETER *parameter; /* parameters of the content-type */ char *description; /* content-description */ char *form_name; /* Content-Disposition form-data name param */ ++++++ mutt-1.5.15-wrapcolumn.diff ++++++ --- /var/tmp/diff_new_pack.z1tdOb/_old 2016-05-17 17:15:28.000000000 +0200 +++ /var/tmp/diff_new_pack.z1tdOb/_new 2016-05-17 17:15:28.000000000 +0200 @@ -1,8 +1,12 @@ Index: init.h =================================================================== ---- init.h.orig -+++ init.h -@@ -3308,7 +3308,8 @@ struct option_t MuttVars[] = { +--- + init.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- init.h ++++ init.h 2016-05-12 12:31:41.287171877 +0000 +@@ -3783,7 +3783,8 @@ struct option_t MuttVars[] = { ** When \fIset\fP, mutt will weed headers when displaying, forwarding, ** printing, or replying to messages. */ ++++++ mutt-1.5.20-sendgroupreplyto.diff ++++++ --- /var/tmp/diff_new_pack.z1tdOb/_old 2016-05-17 17:15:28.000000000 +0200 +++ /var/tmp/diff_new_pack.z1tdOb/_new 2016-05-17 17:15:28.000000000 +0200 @@ -1,6 +1,12 @@ ---- mutt-1.5.20/init.h -+++ mutt-1.5.20/init.h 2009-06-26 00:00:00.000000000 +0200 -@@ -2399,6 +2399,13 @@ struct option_t MuttVars[] = { +--- + init.h | 7 +++++++ + mutt.h | 1 + + send.c | 8 ++++++++ + 3 files changed, 16 insertions(+) + +--- init.h ++++ init.h 2009-06-25 22:00:00.000000000 +0000 +@@ -2645,6 +2645,13 @@ struct option_t MuttVars[] = { ** .pp ** Also see the $$force_name variable. */ @@ -14,19 +20,19 @@ { "score", DT_BOOL, R_NONE, OPTSCORE, 1 }, /* ** .pp ---- mutt-1.5.20/mutt.h -+++ mutt-1.5.20/mutt.h 2009-06-26 00:00:00.000000000 +0200 -@@ -417,6 +417,7 @@ enum +--- mutt.h ++++ mutt.h 2009-06-25 22:00:00.000000000 +0000 +@@ -457,6 +457,7 @@ enum OPTSAVEADDRESS, OPTSAVEEMPTY, OPTSAVENAME, + OPTSENDGROUPREPLYTO, OPTSCORE, - OPTSIGDASHES, - OPTSIGONTOP, ---- mutt-1.5.20/send.c -+++ mutt-1.5.20/send.c 2009-06-26 12:24:12.832816460 +0200 -@@ -558,8 +558,16 @@ int mutt_fetch_recips (ENVELOPE *out, EN + #ifdef USE_SIDEBAR + OPTSIDEBAR, +--- send.c ++++ send.c 2009-06-26 10:24:12.832816460 +0000 +@@ -563,8 +563,16 @@ int mutt_fetch_recips (ENVELOPE *out, EN if ((flags & SENDGROUPREPLY) && (!in->mail_followup_to || hmfupto != M_YES)) { /* if(!mutt_addr_is_user(in->to)) */ ++++++ mutt-1.5.21-mailcap.diff ++++++ --- /var/tmp/diff_new_pack.z1tdOb/_old 2016-05-17 17:15:28.000000000 +0200 +++ /var/tmp/diff_new_pack.z1tdOb/_new 2016-05-17 17:15:28.000000000 +0200 @@ -3,9 +3,13 @@ text/html Index: mutt-1.5.21/init.c =================================================================== ---- mutt-1.5.21.orig/init.c -+++ mutt-1.5.21/init.c -@@ -3011,8 +3011,8 @@ void mutt_init (int skip_sys_rc, LIST *c +--- + init.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- init.c ++++ init.c 2016-05-12 13:43:29.484251262 +0000 +@@ -3300,8 +3300,8 @@ void mutt_init (int skip_sys_rc, LIST *c MailcapPath = safe_strdup (p); else { ++++++ mutt-1.5.21-tinfo.dif ++++++ --- /var/tmp/diff_new_pack.z1tdOb/_old 2016-05-17 17:15:28.000000000 +0200 +++ /var/tmp/diff_new_pack.z1tdOb/_new 2016-05-17 17:15:28.000000000 +0200 @@ -1,6 +1,10 @@ +--- + configure.ac | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + --- configure.ac +++ configure.ac 2011-11-22 12:48:52.319147493 +0000 -@@ -274,9 +274,14 @@ main () +@@ -313,9 +313,14 @@ main () do AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break]) done ++++++ mutt-1.5.23-cariage-return.path ++++++ --- /var/tmp/diff_new_pack.z1tdOb/_old 2016-05-17 17:15:28.000000000 +0200 +++ /var/tmp/diff_new_pack.z1tdOb/_new 2016-05-17 17:15:28.000000000 +0200 @@ -7,7 +7,7 @@ --- lib.c +++ lib.c 2013-05-29 09:31:53.000000000 +0000 -@@ -876,6 +876,18 @@ int mutt_strcmp(const char *a, const cha +@@ -880,6 +880,18 @@ int mutt_strcmp(const char *a, const cha return strcmp(NONULL(a), NONULL(b)); } @@ -38,7 +38,7 @@ int mutt_strcoll (const char *, const char *); --- pager.c +++ pager.c 2013-05-29 09:31:53.000000000 +0000 -@@ -771,7 +771,7 @@ resolve_types (char *buf, char *raw, str +@@ -774,7 +774,7 @@ resolve_types (char *buf, char *raw, str else if (check_attachment_marker ((char *) raw) == 0) lineInfo[n].type = MT_COLOR_ATTACHMENT; #endif @@ -49,7 +49,7 @@ --- pgp.c +++ pgp.c 2015-01-26 15:48:02.361518080 +0000 -@@ -219,7 +219,7 @@ static void pgp_copy_clearsigned (FILE * +@@ -302,7 +302,7 @@ static void pgp_copy_clearsigned (FILE * continue; } @@ -58,7 +58,7 @@ break; if (armor_header) -@@ -285,14 +285,14 @@ int pgp_application_pgp_handler (BODY *m +@@ -368,14 +368,14 @@ int pgp_application_pgp_handler (BODY *m { clearsign = 0; @@ -76,7 +76,7 @@ { needpass = 0; pgp_keyblock = 1; -@@ -325,10 +325,10 @@ int pgp_application_pgp_handler (BODY *m +@@ -408,10 +408,10 @@ int pgp_application_pgp_handler (BODY *m fputs (buf, tmpfp); @@ -90,7 +90,7 @@ break; /* remember optional Charset: armor header as defined by RfC4880 */ if (mutt_strncmp ("Charset: ", buf, 9) == 0) -@@ -550,11 +550,11 @@ static int pgp_check_traditional_one_bod +@@ -645,11 +645,11 @@ static int pgp_check_traditional_one_bod { if (mutt_strncmp ("-----BEGIN PGP ", buf, 15) == 0) { @@ -105,7 +105,7 @@ key = 1; } } -@@ -1063,9 +1063,9 @@ BODY *pgp_sign_message (BODY *a) +@@ -1197,9 +1197,9 @@ BODY *pgp_sign_message (BODY *a) */ while (fgets (buffer, sizeof (buffer) - 1, pgpout) != NULL) { ++++++ mutt-1.5.9i-pgpewrap.diff ++++++ --- /var/tmp/diff_new_pack.z1tdOb/_old 2016-05-17 17:15:28.000000000 +0200 +++ /var/tmp/diff_new_pack.z1tdOb/_new 2016-05-17 17:15:28.000000000 +0200 @@ -1,6 +1,10 @@ +--- + pgpewrap.c | 4 ++++ + 1 file changed, 4 insertions(+) + --- pgpewrap.c -+++ pgpewrap.c -@@ -47,6 +47,10 @@ ++++ pgpewrap.c 2016-05-12 11:48:02.259503685 +0000 +@@ -58,6 +58,10 @@ int main(int argc, char **argv) { } *opt = NULL; ++++++ mutt-1.6.0-opennfs.dif -> mutt-1.6.1-opennfs.dif ++++++ --- /work/SRC/openSUSE:Factory/mutt/mutt-1.6.0-opennfs.dif 2016-04-14 13:07:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt-1.6.1-opennfs.dif 2016-05-17 17:15:26.000000000 +0200 @@ -19,8 +19,8 @@ + main.c mbox.c menu.c mh.c mx.c opennfs.c pager.c parse.c pattern.c \ postpone.c query.c recvattach.c recvcmd.c \ rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ - sidebar.c \ -@@ -84,7 +84,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c + score.c send.c sendlib.c signal.c sort.c \ +@@ -99,7 +99,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c mutt_dotlock_LDADD = $(LIBOBJS) mutt_dotlock_DEPENDENCIES = $(LIBOBJS) @@ -40,7 +40,7 @@ postpone.$(OBJEXT) query.$(OBJEXT) recvattach.$(OBJEXT) \ recvcmd.$(OBJEXT) rfc822.$(OBJEXT) rfc1524.$(OBJEXT) \ rfc2047.$(OBJEXT) rfc2231.$(OBJEXT) rfc3676.$(OBJEXT) \ -@@ -159,7 +159,7 @@ pgpewrap_LDADD = $(LDADD) +@@ -157,7 +157,7 @@ pgpewrap_LDADD = $(LDADD) pgpewrap_DEPENDENCIES = $(LIBOBJS) $(am__DEPENDENCIES_1) am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) \ lib.$(OBJEXT) extlib.$(OBJEXT) sha1.$(OBJEXT) md5.$(OBJEXT) \ @@ -49,7 +49,7 @@ pgpring_OBJECTS = $(am_pgpring_OBJECTS) am_txt2c_OBJECTS = txt2c.$(OBJEXT) txt2c_OBJECTS = $(am_txt2c_OBJECTS) -@@ -486,7 +486,7 @@ mutt_SOURCES = \ +@@ -484,7 +484,7 @@ mutt_SOURCES = \ edit.c enter.c flags.c init.c filter.c from.c \ getdomain.c group.c \ handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \ @@ -68,7 +68,7 @@ #include "lib.h" -@@ -633,6 +634,10 @@ int safe_open (const char *path, int fla +@@ -637,6 +638,10 @@ int safe_open (const char *path, int fla struct stat osb, nsb; int fd; @@ -79,7 +79,7 @@ if (flags & O_EXCL) { char safe_file[_POSIX_PATH_MAX]; -@@ -656,7 +661,7 @@ int safe_open (const char *path, int fla +@@ -660,7 +665,7 @@ int safe_open (const char *path, int fla if ((fd = open (path, flags & ~O_EXCL, 0600)) < 0) return fd; @@ -90,7 +90,7 @@ compare_stat(&osb, &nsb) == -1) --- mbox.c +++ mbox.c 2016-04-11 11:23:21.414301183 +0000 -@@ -781,7 +781,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int +@@ -785,7 +785,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int /* Create a temporary file to write the new version of the mailbox in. */ mutt_mktemp (tempfile, sizeof (tempfile)); @@ -100,11 +100,11 @@ { if (-1 != i) --- mh.c -+++ mh.c 2016-04-11 11:23:21.414301183 +0000 -@@ -332,7 +332,11 @@ static int mh_mkstemp (CONTEXT * dest, F ++++ mh.c 2016-05-12 12:34:49.099410561 +0000 +@@ -353,7 +353,11 @@ static int mh_mkstemp (CONTEXT * dest, F { - snprintf (path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%d", - dest->path, NONULL (Hostname), (int) getpid (), Counter++); + snprintf (path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%" PRIu64, + dest->path, NONULL (Hostname), (int) getpid (), mutt_rand64()); +#if defined(__linux__) + if ((fd = opennfs (path, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1) +#else @@ -113,7 +113,7 @@ { if (errno != EEXIST) { -@@ -1345,8 +1349,11 @@ int maildir_open_new_message (MESSAGE * +@@ -1377,8 +1381,11 @@ int maildir_open_new_message (MESSAGE * dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n", path)); @@ -128,7 +128,7 @@ { --- mutt.h +++ mutt.h 2016-04-11 11:23:21.414301183 +0000 -@@ -987,4 +987,5 @@ typedef struct +@@ -1029,4 +1029,5 @@ typedef struct #include "lib.h" #include "globals.h" @@ -261,7 +261,7 @@ +} --- sendlib.c +++ sendlib.c 2016-04-11 11:23:21.414301183 +0000 -@@ -2223,7 +2223,7 @@ send_msg (const char *path, char **args, +@@ -2217,7 +2217,7 @@ send_msg (const char *path, char **args, if (SendmailWait >= 0 && tempfile && *tempfile) { /* *tempfile will be opened as stdout */ ++++++ mutt-1.6.0-patches.tar.bz2 -> mutt-1.6.1-patches.tar.bz2 ++++++ ++++++ mutt-1.6.0-opennfs.dif -> mutt-1.6.1.dif ++++++ --- /work/SRC/openSUSE:Factory/mutt/mutt-1.6.0-opennfs.dif 2016-04-14 13:07:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt-1.6.1.dif 2016-05-17 17:15:26.000000000 +0200 @@ -1,272 +1,320 @@ --- - Makefile.am | 4 - - Makefile.in | 6 +- - lib.c | 7 ++- - mbox.c | 2 - mh.c | 9 +++- - mutt.h | 1 - opennfs.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - sendlib.c | 2 - 8 files changed, 144 insertions(+), 9 deletions(-) + configure.ac | 10 ++++- + doc/Makefile.in | 2 - + doc/Muttrc | 102 +++++++++++++++++++++++++++++++++++++++++--------------- + doc/Muttrc.head | 2 - + imap/auth.c | 20 ++++++++++ + init.h | 3 + + mx.c | 3 + + 7 files changed, 112 insertions(+), 30 deletions(-) ---- Makefile.am -+++ Makefile.am 2016-04-11 11:24:25.813117416 +0000 -@@ -29,7 +29,7 @@ mutt_SOURCES = \ - edit.c enter.c flags.c init.c filter.c from.c \ - getdomain.c group.c \ - handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \ -- main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c \ -+ main.c mbox.c menu.c mh.c mx.c opennfs.c pager.c parse.c pattern.c \ - postpone.c query.c recvattach.c recvcmd.c \ - rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ - sidebar.c \ -@@ -84,7 +84,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c - mutt_dotlock_LDADD = $(LIBOBJS) - mutt_dotlock_DEPENDENCIES = $(LIBOBJS) - --pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5.c pgppacket.c ascii.c -+pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c opennfs.c md5.c pgppacket.c ascii.c - pgpring_LDADD = $(LIBOBJS) $(INTLLIBS) - pgpring_DEPENDENCIES = $(LIBOBJS) $(INTLDEPS) - ---- Makefile.in -+++ Makefile.in 2016-04-11 11:23:21.414301183 +0000 -@@ -128,7 +128,7 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) ali - hash.$(OBJEXT) hdrline.$(OBJEXT) headers.$(OBJEXT) \ - help.$(OBJEXT) hook.$(OBJEXT) keymap.$(OBJEXT) main.$(OBJEXT) \ - mbox.$(OBJEXT) menu.$(OBJEXT) mh.$(OBJEXT) mx.$(OBJEXT) \ -- pager.$(OBJEXT) parse.$(OBJEXT) pattern.$(OBJEXT) \ -+ opennfs.$(OBJEXT) pager.$(OBJEXT) parse.$(OBJEXT) pattern.$(OBJEXT) \ - postpone.$(OBJEXT) query.$(OBJEXT) recvattach.$(OBJEXT) \ - recvcmd.$(OBJEXT) rfc822.$(OBJEXT) rfc1524.$(OBJEXT) \ - rfc2047.$(OBJEXT) rfc2231.$(OBJEXT) rfc3676.$(OBJEXT) \ -@@ -159,7 +159,7 @@ pgpewrap_LDADD = $(LDADD) - pgpewrap_DEPENDENCIES = $(LIBOBJS) $(am__DEPENDENCIES_1) - am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) \ - lib.$(OBJEXT) extlib.$(OBJEXT) sha1.$(OBJEXT) md5.$(OBJEXT) \ -- pgppacket.$(OBJEXT) ascii.$(OBJEXT) -+ pgppacket.$(OBJEXT) ascii.$(OBJEXT) opennfs.$(OBJEXT) - pgpring_OBJECTS = $(am_pgpring_OBJECTS) - am_txt2c_OBJECTS = txt2c.$(OBJEXT) - txt2c_OBJECTS = $(am_txt2c_OBJECTS) -@@ -486,7 +486,7 @@ mutt_SOURCES = \ - edit.c enter.c flags.c init.c filter.c from.c \ - getdomain.c group.c \ - handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \ -- main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c \ -+ main.c mbox.c menu.c mh.c mx.c opennfs.c pager.c parse.c pattern.c \ - postpone.c query.c recvattach.c recvcmd.c \ - rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ - score.c send.c sendlib.c signal.c sort.c \ ---- lib.c -+++ lib.c 2016-04-11 11:23:21.414301183 +0000 -@@ -50,6 +50,7 @@ - #define EX_OK 0 - #endif - -+#include "mutt.h" - #include "lib.h" - - -@@ -633,6 +634,10 @@ int safe_open (const char *path, int fla - struct stat osb, nsb; - int fd; - -+#if defined(__linux__) -+ if ((fd = opennfs (path, flags, 0600)) < 0) -+ return fd; -+#else - if (flags & O_EXCL) - { - char safe_file[_POSIX_PATH_MAX]; -@@ -656,7 +661,7 @@ int safe_open (const char *path, int fla +--- configure.ac ++++ configure.ac 2016-04-11 11:09:41.997377315 +0000 +@@ -274,7 +274,7 @@ main () + mutt_cv_slang=$withval + if test -d $withval/include/slang; then + CPPFLAGS="$CPPFLAGS -I${withval}/include/slang" +- elif test -d $withval/include; then ++ elif test -d $withval/include && test $withval != /usr ; then + CPPFLAGS="$CPPFLAGS -I${withval}/include" + fi + LDFLAGS="$LDFLAGS -L${withval}/lib" +@@ -704,8 +704,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with- + 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" + +@@ -784,8 +788,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with + + if test "$with_sasl" != "yes" + then ++ case $with_sasl in /usr|/usr/local) ;; ++ *) + CPPFLAGS="$CPPFLAGS -I$with_sasl/include" + LDFLAGS="$LDFLAGS -L$with_sasl/lib" ++ ;; ++ esac + fi - if ((fd = open (path, flags & ~O_EXCL, 0600)) < 0) - return fd; -- + saved_LIBS="$LIBS" +--- init.h ++++ init.h 2016-04-11 11:09:41.997377315 +0000 +@@ -3332,6 +3332,9 @@ struct option_t MuttVars[] = { + ** the default from the GNUTLS library. + */ + # endif /* USE_SSL_GNUTLS */ ++#if defined(USE_IMAP) && defined(SUSE_IMAP_FORCE_SSL) ++ { "imap_force_ssl", DT_SYN, R_NONE, UL "ssl_force_tls", 0 }, +#endif - /* make sure the file is not symlink */ - if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 || - compare_stat(&osb, &nsb) == -1) ---- mbox.c -+++ mbox.c 2016-04-11 11:23:21.414301183 +0000 -@@ -781,7 +781,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int - - /* Create a temporary file to write the new version of the mailbox in. */ - mutt_mktemp (tempfile, sizeof (tempfile)); -- if ((i = open (tempfile, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1 || -+ if ((i = opennfs (tempfile, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1 || - (fp = fdopen (i, "w")) == NULL) + { "ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, M_YES }, + /* + ** .pp +--- mx.c ++++ mx.c 2016-04-11 11:09:42.001377242 +0000 +@@ -1714,6 +1714,9 @@ void mx_update_context (CONTEXT *ctx, in { - if (-1 != i) ---- mh.c -+++ mh.c 2016-04-11 11:23:21.414301183 +0000 -@@ -332,7 +332,11 @@ static int mh_mkstemp (CONTEXT * dest, F - { - snprintf (path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%d", - dest->path, NONULL (Hostname), (int) getpid (), Counter++); -+#if defined(__linux__) -+ if ((fd = opennfs (path, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1) -+#else - if ((fd = open (path, O_WRONLY | O_EXCL | O_CREAT, 0666)) == -1) -+#endif + h = ctx->hdrs[msgno]; + ++ if (!h) ++ continue; ++ + if (WithCrypto) { - if (errno != EEXIST) - { -@@ -1345,8 +1349,11 @@ int maildir_open_new_message (MESSAGE * + /* NOTE: this _must_ be done before the check for mailcap! */ +--- doc/Makefile.in ++++ doc/Makefile.in 2016-04-11 11:09:41.997377315 +0000 +@@ -697,7 +697,7 @@ uninstall-local: + + check: + manual.txt: manual.html +- -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \ ++ -LC_ALL=C lynx -dont_wrap_pre -center -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \ + LC_ALL=C w3m -dump manual.html > $@ || \ + LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@ + +--- doc/Muttrc ++++ doc/Muttrc 2016-04-11 11:07:05.472260646 +0000 +@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\ + "call urlview to extract URLs out of a message" + + # Show documentation when pressing F1 +-macro generic,pager <F1> "<shell-escape> less /usr/local/share/doc/mutt/manual.txt<Enter>" "show Mutt documentation" ++macro generic,index,pager <F1> "<shell-escape> less -iM /usr/share/doc/packages/mutt/manual.txt.gz<Enter>" "show Mutt documentation" + + # 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" +@@ -364,9 +364,9 @@ attachments -I message/external-body + # unset, you must first use the <tag-prefix> function (bound to ``;'' + # by default) to make the next function apply to all tagged messages. + # +-# +-# set autoedit=no +-# ++ ++set autoedit=yes ++ + # Name: autoedit + # Type: boolean + # Default: no +@@ -482,9 +482,9 @@ attachments -I message/external-body + # Note: It should only be set in case Mutt isn't able to determine the + # character set used correctly. + # +-# +-# set check_mbox_size=no +-# ++ ++set check_mbox_size=yes ++ + # Name: check_mbox_size + # Type: boolean + # Default: no +@@ -912,11 +912,11 @@ attachments -I message/external-body + # filtered message is read from the standard output. + # + # +-# set dotlock_program="/usr/local/bin/mutt_dotlock" ++# set dotlock_program="/usr/bin/mutt_dotlock" + # + # Name: dotlock_program + # Type: path +-# Default: "/usr/local/bin/mutt_dotlock" ++# Default: "/usr/bin/mutt_dotlock" + # + # + # Contains the path of the mutt_dotlock(8) binary to be used by +@@ -2380,9 +2380,9 @@ attachments -I message/external-body + # directly from the pager, and screen resizes cause lines longer than + # the screen width to be badly formatted in the help menu. + # +-# +-# set pager_context=0 +-# ++ ++set pager_context=4 ++ + # Name: pager_context + # Type: number + # Default: 0 +@@ -2410,9 +2410,9 @@ attachments -I message/external-body + # pager. The valid sequences are listed in the $index_format + # section. + # +-# +-# set pager_index_lines=0 +-# ++ ++set pager_index_lines=10 ++ + # Name: pager_index_lines + # Type: number + # Default: 0 +@@ -2430,9 +2430,9 @@ attachments -I message/external-body + # is less than $pager_index_lines, then the index will only use as + # many lines as it needs. + # +-# +-# set pager_stop=no +-# ++ ++set pager_stop=yes ++ + # Name: pager_stop + # Type: boolean + # Default: no +@@ -3538,9 +3538,9 @@ attachments -I message/external-body + # user-defined headers, and other processing effects from being + # made multiple times to the draft file. + # +-# +-# set reverse_alias=no +-# ++ ++set reverse_alias=yes ++ + # Name: reverse_alias + # Type: boolean + # Default: no +@@ -3672,6 +3672,18 @@ attachments -I message/external-body + # Also see the $force_name variable. + # + # ++# set send_group_reply_to=no ++# ++# Name: send_group_reply_to ++# Type: boolean ++# Default: no ++# ++# ++# This variable controls how group replies are done. ++# When set, all recepients listet in "To:" are set in the ++# "To:" header again, else in the "CC", which is the default. ++# ++# + # set score=yes + # + # Name: score +@@ -4255,9 +4267,9 @@ attachments -I message/external-body + # Setting this variable overrides the value of the $sendmail + # variable. + # +-# +-# set sort=date +-# ++ ++set sort=reverse-date-sent ++ + # Name: sort + # Type: sort order + # Default: date +@@ -4741,9 +4753,9 @@ attachments -I message/external-body + # When set, mutt uses the date received rather than the date sent + # to thread messages by subject. + # +-# +-# set tilde=no +-# ++ ++set tilde=yes ++ + # Name: tilde + # Type: boolean + # Default: no +@@ -5079,6 +5091,42 @@ attachments -I message/external-body + # in this case. + # + # ++# set xterm_icon="M%?n?AIL&ail?" ++# ++# Name: xterm_icon ++# Type: string ++# Default: "M%?n?AIL&ail?" ++# ++# ++# Controls the format of the icon title, as long as xterm_set_titles ++# is enabled. This string is identical in formatting to the one used by ++# ``$status_format''. ++# ++# ++# set xterm_set_titles=no ++# ++# Name: xterm_set_titles ++# Type: boolean ++# Default: no ++# ++# ++# Controls whether mutt sets the xterm title bar and icon name ++# (as long as you're in an appropriate terminal). The default must ++# be off to force in the validity checking. ++# ++# ++# set xterm_title="Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?" ++# ++# Name: xterm_title ++# Type: string ++# Default: "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?" ++# ++# ++# Controls the format of the title bar of the xterm provided that ++# xterm_set_titles has been set. This string is identical in formatting ++# to the one used by ``$status_format''. ++# ++# + # set write_inc=10 + # + # Name: write_inc +--- doc/Muttrc.head ++++ doc/Muttrc.head 2016-04-11 11:09:41.997377315 +0000 +@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\ + "call urlview to extract URLs out of a message" - dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n", - path)); -- -+#if defined(__linux__) -+ if ((fd = opennfs (path, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1) -+#else - if ((fd = open (path, O_WRONLY | O_EXCL | O_CREAT, 0666)) == -1) + # Show documentation when pressing F1 +-macro generic,pager <F1> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation" ++macro generic,index,pager <F1> "<shell-escape> less -iM @docdir@/manual.txt<Enter>" "show Mutt documentation" + + # 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 2016-04-11 11:09:41.997377315 +0000 +@@ -72,6 +72,23 @@ int imap_authenticate (IMAP_DATA* idata) + dprint (2, (debugfile, "imap_authenticate: Trying method %s\n", method)); + authenticator = imap_authenticators; + ++#ifdef USE_SASL ++ /* "login" not supported by SASL */ ++ if (!ascii_strcasecmp ("login", method)) ++ { ++ while (authenticator->authenticate) ++ { ++ char* identify = authenticator->method; ++ if (identify && !ascii_strcasecmp(identify, method)) ++ if ((r = authenticator->authenticate(idata, method)) != IMAP_AUTH_UNAVAIL) ++ { ++ FREE(&methods); ++ return r; ++ } ++ authenticator++; ++ } ++ } else { +#endif - { - if (errno != EEXIST) + while (authenticator->authenticate) { ---- mutt.h -+++ mutt.h 2016-04-11 11:23:21.414301183 +0000 -@@ -987,4 +987,5 @@ typedef struct - #include "lib.h" - #include "globals.h" - -+extern int opennfs(const char *, int, int); - #endif /*MUTT_H*/ ---- opennfs.c -+++ opennfs.c 2016-04-11 11:23:21.414301183 +0000 -@@ -0,0 +1,122 @@ -+#include <errno.h> -+#include <fcntl.h> -+#include <libgen.h> -+#include <limits.h> -+#include <nfs/nfs.h> -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <sys/vfs.h> -+#include <unistd.h> -+ -+#ifndef NFS_SUPER_MAGIC -+# define NFS_SUPER_MAGIC 0x6969 -+#endif -+ -+int opennfs(const char *path, int flags, int mode) -+{ -+ char tmplock[NFS_MAXPATHLEN+1], sysname[256]; -+ char *slash, *ptr, *dir, *base, *clear = (char*)0; -+ struct stat ps, ts; -+ struct statfs fs; -+ ssize_t len; -+ int ret; -+ -+ if ((flags & (O_WRONLY|O_RDWR)) == 0) -+ goto safe; -+ -+ if ((flags & (O_EXCL|O_CREAT)) != (O_EXCL|O_CREAT)) -+ goto safe; -+ -+#if defined(O_NOFOLLOW) -+ flags |= O_NOFOLLOW; + if (!authenticator->method || +@@ -85,6 +102,9 @@ int imap_authenticate (IMAP_DATA* idata) + + authenticator++; + } ++#ifdef USE_SASL ++ } +#endif -+ -+ ret = -1; -+ if ((clear = strdup(path)) == (char*)0) -+ goto err; -+ dir = dirname(clear); -+ -+ if ((ret = (statfs(dir, &fs))) < 0) -+ goto err; -+ -+ if (fs.f_type != NFS_SUPER_MAGIC) -+ goto safe; -+ -+ if ((ret = gethostname(sysname, sizeof(sysname))) < 0) -+ goto err; -+ -+ ret = -1; -+ ptr = &tmplock[0]; -+ if (((len = snprintf(ptr, NFS_MAXPATHLEN, "%s/.%s-XXXXXX", dir, sysname)) < 0) || (len >= NFS_MAXPATHLEN)) -+ goto err; -+ ptr += len; -+ slash = ptr; -+ -+ free(clear); -+ clear = (char*)0; -+ -+ if (mkdtemp(tmplock) == (char*)0) -+ goto err; -+ -+ ret = -1; -+ if ((clear = strdup(path)) == (char*)0) -+ goto rmd; -+ base = basename(clear); -+ -+ ret = -1; -+ if (((len = snprintf(ptr, NFS_MAXPATHLEN - len, "/%s", base)) < 0) || (len >= (NFS_MAXPATHLEN - len))) -+ goto rmd; -+ -+ free(clear); -+ clear = (char*)0; -+ -+ if ((ret = open(tmplock, flags, mode)) < 0) -+ goto rmd; -+ -+ errno = 0; -+ do { -+ len = write(ret, "0", 2); -+ } while ((len < 0) && (errno == EINTR)); -+ close(ret); -+ -+ ret = -1; -+ errno = EBADF; -+ if (len != 2) -+ goto unl; -+ -+ errno = 0; -+ if ((ret = lstat(tmplock, &ts)) < 0) -+ goto unl; -+ -+ if (((ret = link(tmplock, path)) < 0) && (errno == EEXIST)) -+ goto unl; -+ -+ if ((ret = lstat(path, &ps)) < 0) -+ goto unl; -+ -+ ret = -1; -+ errno = EEXIST; -+ if (ps.st_nlink != 2) -+ goto unl; -+ if ((ps.st_rdev != ts.st_rdev) || (ps.st_ino != ts.st_ino)) -+ goto unl; -+ -+ errno = 0; -+ flags |= O_TRUNC; -+ flags &= ~(O_EXCL|O_CREAT); -+ ret = open(path, flags, mode); -+unl: -+ unlink(tmplock); -+rmd: -+ *slash = '\0'; -+ rmdir(tmplock); -+err: -+ if (clear) free(clear); -+ return ret; -+safe: -+ if (clear) free(clear); -+ return open(path, flags, mode); -+} ---- sendlib.c -+++ sendlib.c 2016-04-11 11:23:21.414301183 +0000 -@@ -2223,7 +2223,7 @@ send_msg (const char *path, char **args, - if (SendmailWait >= 0 && tempfile && *tempfile) - { - /* *tempfile will be opened as stdout */ -- if (open (*tempfile, O_WRONLY | O_APPEND | O_CREAT | O_EXCL, 0600) < 0) -+ if (opennfs (*tempfile, O_WRONLY | O_CREAT | O_EXCL, 0600) < 0) - _exit (S_ERR); - /* redirect stderr to *tempfile too */ - if (dup (1) < 0) + } + + FREE (&methods); ++++++ mutt-1.6.0.tar.gz -> mutt-1.6.1.tar.gz ++++++ ++++ 4340 lines of diff (skipped) ++++++ patch-1.5.24.vk.pgp_verbose_mime ++++++ --- /var/tmp/diff_new_pack.z1tdOb/_old 2016-05-17 17:15:29.000000000 +0200 +++ /var/tmp/diff_new_pack.z1tdOb/_new 2016-05-17 17:15:29.000000000 +0200 @@ -10,11 +10,11 @@ @@ -1,3 +1,4 @@ +patch-1.5.3.vk.pgp_verbose_mime patch-1.5.9.aw.listreply.1 - patch-1.6.0.sidebar.20160404.txt rr.compressed + patch-quasi-delete-neo-20160502 --- globals.h +++ globals.h 2012-04-11 04:52:45.000000000 +0000 -@@ -239,6 +239,8 @@ WHERE REGEXP PgpGoodSign; +@@ -253,6 +253,8 @@ WHERE REGEXP PgpDecryptionOkay; WHERE char *PgpSignAs; WHERE short PgpTimeout; WHERE char *PgpEntryFormat; @@ -25,7 +25,7 @@ WHERE char *PgpVerifyCommand; --- init.h +++ init.h 2012-04-11 04:52:45.000000000 +0000 -@@ -2719,6 +2719,18 @@ struct option_t MuttVars[] = { +@@ -2947,6 +2947,18 @@ struct option_t MuttVars[] = { ** a line quoted text if it also matches $$smileys. This mostly ** happens at the beginning of a line. */ @@ -46,7 +46,7 @@ --- pgp.c +++ pgp.c 2015-09-11 14:47:19.817518523 +0000 -@@ -1213,7 +1213,8 @@ BODY *pgp_sign_message (BODY *a) +@@ -1261,7 +1261,8 @@ BODY *pgp_sign_message (BODY *a) t->disposition = DISPNONE; t->encoding = ENC7BIT; t->unlink = 1; /* ok to remove this file after sending. */ ++++++ patch-1.6.0.rr.compressed.bz2 -> patch-1.6.1.rr.compressed.bz2 ++++++ Files /work/SRC/openSUSE:Factory/mutt/patch-1.6.0.rr.compressed.bz2 and /work/SRC/openSUSE:Factory/.mutt.new/patch-1.6.1.rr.compressed.bz2 differ ++++++ widechar.sidebar.dif ++++++ --- /var/tmp/diff_new_pack.z1tdOb/_old 2016-05-17 17:15:29.000000000 +0200 +++ /var/tmp/diff_new_pack.z1tdOb/_new 2016-05-17 17:15:29.000000000 +0200 @@ -1,12 +1,10 @@ --- - handler.c | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) + handler.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) -diff --git a/handler.c b/handler.c -index 8c3b699..6f8d77c 100644 ---- a/handler.c -+++ b/handler.c -@@ -780,7 +780,7 @@ static void enriched_set_flags (const wchar_t *tag, struct enriched_state *stte) +--- handler.c ++++ handler.c 2016-05-12 13:39:27.157097136 +0000 +@@ -780,7 +780,7 @@ static void enriched_set_flags (const wc static int text_enriched_handler (BODY *a, STATE *s) { enum { @@ -15,7 +13,7 @@ } state = TEXT; long bytes = a->length; -@@ -809,7 +809,7 @@ static int text_enriched_handler (BODY *a, STATE *s) +@@ -809,7 +809,7 @@ static int text_enriched_handler (BODY * { if (state != ST_EOF) { @@ -24,7 +22,7 @@ state = ST_EOF; else bytes--; -@@ -817,6 +817,8 @@ static int text_enriched_handler (BODY *a, STATE *s) +@@ -817,6 +817,8 @@ static int text_enriched_handler (BODY * switch (state) { @@ -33,7 +31,7 @@ case TEXT : switch (wc) { -@@ -877,9 +879,8 @@ static int text_enriched_handler (BODY *a, STATE *s) +@@ -877,9 +879,8 @@ static int text_enriched_handler (BODY * enriched_flush (&stte, 1); else { @@ -44,7 +42,7 @@ } break; -@@ -1567,7 +1568,7 @@ void mutt_decode_attachment (BODY *b, STATE *s) +@@ -1567,7 +1568,7 @@ void mutt_decode_attachment (BODY *b, ST * strip all trailing spaces to improve interoperability; * if $text_flowed is unset, simply verbatim copy input */ @@ -53,23 +51,3 @@ { char *buf = NULL; size_t l = 0, sz = 0; -@@ -1595,7 +1596,6 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla - int origType; - char *savePrefix = NULL; - FILE *fp = NULL; -- char tempfile[_POSIX_PATH_MAX]; - size_t tmplength = 0; - LOFF_T tmpoffset = 0; - int decode = 0; -@@ -1606,6 +1606,8 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla - #ifdef HAVE_FMEMOPEN - char *temp; - size_t tempsize; -+#else -+ char tempfile[_POSIX_PATH_MAX]; - #endif - - /* see if we need to decode this part before processing it */ --- -2.6.2 -
