From fe30ae7a55ebf8f1f547487fcc272eaa9a239264 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 12 May 2016 14:10:16 +0000 Subject: [PATCH 1/3] . OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=120 --- aw.listreply.diff | 29 +- bsc907453-CVE-2014-9116-jessie.patch | 6 +- bug-676388-largefile.patch | 18 +- mutt-1.5.15-wrapcolumn.diff | 10 +- mutt-1.5.20-sendgroupreplyto.diff | 28 +- mutt-1.5.21-mailcap.diff | 10 +- mutt-1.5.21-tinfo.dif | 6 +- mutt-1.5.23-cariage-return.path | 14 +- mutt-1.5.9i-pgpewrap.diff | 8 +- ....6.0-opennfs.dif => mutt-1.6.1-opennfs.dif | 28 +- ...ches.tar.bz2 => mutt-1.6.1-patches.tar.bz2 | 0 mutt-1.6.0.dif => mutt-1.6.1.dif | 76 +- mutt-1.6.1.tar.gz | 3 + mutt.changes | 28 + mutt.spec | 33 +- neomutt-patches-20160502.tar.gz | 3 + nion.sidebar-color.diff | 73 - patch-1.5.24.vk.pgp_verbose_mime | 8 +- patch-1.6.0.rr.compressed.bz2 | 3 - patch-1.6.0.sidebar.20160411.patch | 1965 ----------------- patch-1.6.1.rr.compressed.bz2 | 3 + widechar.sidebar.dif | 40 +- 22 files changed, 195 insertions(+), 2197 deletions(-) rename mutt-1.6.0-opennfs.dif => mutt-1.6.1-opennfs.dif (90%) rename mutt-1.6.0-patches.tar.bz2 => mutt-1.6.1-patches.tar.bz2 (100%) rename mutt-1.6.0.dif => mutt-1.6.1.dif (97%) create mode 100644 mutt-1.6.1.tar.gz create mode 100644 neomutt-patches-20160502.tar.gz delete mode 100644 nion.sidebar-color.diff delete mode 100644 patch-1.6.0.rr.compressed.bz2 delete mode 100644 patch-1.6.0.sidebar.20160411.patch create mode 100644 patch-1.6.1.rr.compressed.bz2 diff --git a/aw.listreply.diff b/aw.listreply.diff index 644e714..75507ad 100644 --- a/aw.listreply.diff +++ b/aw.listreply.diff @@ -7,15 +7,16 @@ ask when sending list message replies to author only - Armin Wolfermann (aw) 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 @@ ask when sending list message replies to author only - Armin Wolfermann (aw) { "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 @@ ask when sending list message replies to author only - Armin Wolfermann (aw) /* 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 @@ ask when sending list message replies to author only - Armin Wolfermann (aw) 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; diff --git a/bsc907453-CVE-2014-9116-jessie.patch b/bsc907453-CVE-2014-9116-jessie.patch index 82b65bc..2339380 100644 --- a/bsc907453-CVE-2014-9116-jessie.patch +++ b/bsc907453-CVE-2014-9116-jessie.patch @@ -16,9 +16,9 @@ Index: mutt/lib.c 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; diff --git a/bug-676388-largefile.patch b/bug-676388-largefile.patch index 6ea8417..ec0222f 100644 --- a/bug-676388-largefile.patch +++ b/bug-676388-largefile.patch @@ -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 */ diff --git a/mutt-1.5.15-wrapcolumn.diff b/mutt-1.5.15-wrapcolumn.diff index e312021..02dcb88 100644 --- a/mutt-1.5.15-wrapcolumn.diff +++ b/mutt-1.5.15-wrapcolumn.diff @@ -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. */ diff --git a/mutt-1.5.20-sendgroupreplyto.diff b/mutt-1.5.20-sendgroupreplyto.diff index 128b71e..45f9d12 100644 --- a/mutt-1.5.20-sendgroupreplyto.diff +++ b/mutt-1.5.20-sendgroupreplyto.diff @@ -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)) */ diff --git a/mutt-1.5.21-mailcap.diff b/mutt-1.5.21-mailcap.diff index b25328c..96e8f81 100644 --- a/mutt-1.5.21-mailcap.diff +++ b/mutt-1.5.21-mailcap.diff @@ -3,9 +3,13 @@ set some useful defaults specifically for mutt. For example 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 { diff --git a/mutt-1.5.21-tinfo.dif b/mutt-1.5.21-tinfo.dif index 459aca9..8aeeb4c 100644 --- a/mutt-1.5.21-tinfo.dif +++ b/mutt-1.5.21-tinfo.dif @@ -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 diff --git a/mutt-1.5.23-cariage-return.path b/mutt-1.5.23-cariage-return.path index d6f5f3c..a4f91f4 100644 --- a/mutt-1.5.23-cariage-return.path +++ b/mutt-1.5.23-cariage-return.path @@ -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) { diff --git a/mutt-1.5.9i-pgpewrap.diff b/mutt-1.5.9i-pgpewrap.diff index d8be76a..e5a3df5 100644 --- a/mutt-1.5.9i-pgpewrap.diff +++ b/mutt-1.5.9i-pgpewrap.diff @@ -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; diff --git a/mutt-1.6.0-opennfs.dif b/mutt-1.6.1-opennfs.dif similarity index 90% rename from mutt-1.6.0-opennfs.dif rename to mutt-1.6.1-opennfs.dif index 5d0ee3e..fc68ad9 100644 --- a/mutt-1.6.0-opennfs.dif +++ b/mutt-1.6.1-opennfs.dif @@ -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 */ diff --git a/mutt-1.6.0-patches.tar.bz2 b/mutt-1.6.1-patches.tar.bz2 similarity index 100% rename from mutt-1.6.0-patches.tar.bz2 rename to mutt-1.6.1-patches.tar.bz2 diff --git a/mutt-1.6.0.dif b/mutt-1.6.1.dif similarity index 97% rename from mutt-1.6.0.dif rename to mutt-1.6.1.dif index 945c77e..51d5034 100644 --- a/mutt-1.6.0.dif +++ b/mutt-1.6.1.dif @@ -10,7 +10,7 @@ --- configure.ac +++ configure.ac 2016-04-11 11:09:41.997377315 +0000 -@@ -240,7 +240,7 @@ main () +@@ -274,7 +274,7 @@ main () mutt_cv_slang=$withval if test -d $withval/include/slang; then CPPFLAGS="$CPPFLAGS -I${withval}/include/slang" @@ -19,7 +19,7 @@ CPPFLAGS="$CPPFLAGS -I${withval}/include" fi LDFLAGS="$LDFLAGS -L${withval}/lib" -@@ -669,8 +669,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with- +@@ -704,8 +704,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with- else if test "$with_ssl" != "yes" then @@ -32,7 +32,7 @@ fi saved_LIBS="$LIBS" -@@ -749,8 +753,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with +@@ -784,8 +788,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with if test "$with_sasl" != "yes" then @@ -45,6 +45,30 @@ fi 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 + { "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 + { + h = ctx->hdrs[msgno]; + ++ if (!h) ++ continue; ++ + if (WithCrypto) + { + /* 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: @@ -56,17 +80,6 @@ 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.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" - - # Show documentation when pressing F1 --macro generic,pager " less @docdir@/manual.txt" "show Mutt documentation" -+macro generic,index,pager " less -iM @docdir@/manual.txt" "show Mutt documentation" - - # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" - macro index,pager y "?" "show incoming mailboxes list" --- doc/Muttrc +++ doc/Muttrc 2016-04-11 11:07:05.472260646 +0000 @@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\ @@ -258,6 +271,17 @@ # 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" + + # Show documentation when pressing F1 +-macro generic,pager " less @docdir@/manual.txt" "show Mutt documentation" ++macro generic,index,pager " less -iM @docdir@/manual.txt" "show Mutt documentation" + + # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" + macro index,pager y "?" "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) @@ -294,27 +318,3 @@ } FREE (&methods); ---- init.h -+++ init.h 2016-04-11 11:09:41.997377315 +0000 -@@ -3122,6 +3122,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 - { "ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, M_YES }, - /* - ** .pp ---- mx.c -+++ mx.c 2016-04-11 11:09:42.001377242 +0000 -@@ -1544,6 +1544,9 @@ void mx_update_context (CONTEXT *ctx, in - { - h = ctx->hdrs[msgno]; - -+ if (!h) -+ continue; -+ - if (WithCrypto) - { - /* NOTE: this _must_ be done before the check for mailcap! */ diff --git a/mutt-1.6.1.tar.gz b/mutt-1.6.1.tar.gz new file mode 100644 index 0000000..01e5bad --- /dev/null +++ b/mutt-1.6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98b26cecc6b1713082fc880344fa345c20bd7ded6459abe18c84429c7cf8ed20 +size 3956840 diff --git a/mutt.changes b/mutt.changes index 4c8dc81..be05d1d 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Thu May 12 13:50:14 UTC 2016 - werner@suse.de + +- 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 + ------------------------------------------------------------------- Mon Apr 11 12:04:29 UTC 2016 - werner@suse.de diff --git a/mutt.spec b/mutt.spec index 365880d..66eb929 100644 --- a/mutt.spec +++ b/mutt.spec @@ -67,8 +67,9 @@ Requires(postun): shared-mime-info Requires: perl(Expect) # NOTE: We don't want this dependency and desktop-data-SuSE is in all # desktop selections. -#Requires: desktop-data-SuSE -Version: 1.6.0 +#Requires: desktop-data-SuSE +%global neo 20160502 +Version: 1.6.1 Release: 0 Summary: Mail Program License: GPL-2.0+ @@ -84,21 +85,20 @@ Source6: krb5-config 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 @@ highlighting, threading, and PGP. It takes some time to get used to, 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} . diff --git a/neomutt-patches-20160502.tar.gz b/neomutt-patches-20160502.tar.gz new file mode 100644 index 0000000..b1bb225 --- /dev/null +++ b/neomutt-patches-20160502.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bf6ae78fe4c209c6467104027898530157f2f3fe149b3f09122489b339690a5 +size 266874 diff --git a/nion.sidebar-color.diff b/nion.sidebar-color.diff deleted file mode 100644 index 8c64111..0000000 --- a/nion.sidebar-color.diff +++ /dev/null @@ -1,73 +0,0 @@ - - -diff --git a/color.c b/color.c -index d6f9198..37786bc 100644 ---- a/color.c -+++ b/color.c -@@ -96,6 +96,7 @@ static const struct mapping_t Fields[] = - { "prompt", MT_COLOR_PROMPT }, - { "sidebar_new", MT_COLOR_NEW }, - { "sidebar_flagged", MT_COLOR_FLAGGED }, -+ { "sidebar", MT_COLOR_SIDEBAR }, - { NULL, 0 } - }; - -@@ -145,6 +146,7 @@ void ci_start_color (void) - - /* set some defaults */ - ColorDefs[MT_COLOR_STATUS] = A_REVERSE; -+ ColorDefs[MT_COLOR_SIDEBAR] = A_REVERSE; - ColorDefs[MT_COLOR_INDICATOR] = A_REVERSE; - ColorDefs[MT_COLOR_SEARCH] = A_REVERSE; - ColorDefs[MT_COLOR_MARKERS] = A_REVERSE; -diff --git a/mutt_curses.h b/mutt_curses.h -index ef9884e..b2e88c8 100644 ---- a/mutt_curses.h -+++ b/mutt_curses.h -@@ -119,6 +119,7 @@ enum - MT_COLOR_ATTACHMENT, - MT_COLOR_SEARCH, - MT_COLOR_BOLD, -+ MT_COLOR_SIDEBAR, - MT_COLOR_UNDERLINE, - MT_COLOR_INDEX, - MT_COLOR_PROMPT, -diff --git a/sidebar.c b/sidebar.c -index e9d9eba..8b46bff 100644 ---- a/sidebar.c -+++ b/sidebar.c -@@ -254,13 +254,14 @@ int draw_sidebar(int menu) { - } - - /* get attributes for divider */ -- SETCOLOR(MT_COLOR_STATUS); -+ SETCOLOR(MT_COLOR_SIDEBAR); - #ifndef USE_SLANG_CURSES - attr_get(&attrs, &color_pair, 0); - #else - color_pair = attr_get(); - #endif - SETCOLOR(MT_COLOR_NORMAL); -+ /* SETCOLOR(MT_COLOR_SIDEBAR); */ - - /* draw the divider */ - -@@ -270,10 +271,14 @@ int draw_sidebar(int menu) { - - for ( ; lines < SidebarHeight; lines++ ) { - move(lines, SidebarWidth - delim_len); -- addstr(NONULL(SidebarDelim)); --#ifndef USE_SLANG_CURSES -- mvchgat(lines, SidebarWidth - delim_len, delim_len, 0, color_pair, NULL); --#endif -+ if (option (OPTASCIICHARS)) -+ addstr (NONULL (SidebarDelim)); -+ else if (!option (OPTASCIICHARS) && !strcmp (NONULL(SidebarDelim), "|")) -+ addch (ACS_VLINE); -+ else if ((Charset_is_utf8) && !strcmp (NONULL(SidebarDelim), "|")) -+ addstr ("\342\224\202"); -+ else -+ addstr (NONULL (SidebarDelim)); - } - - if ( Incoming == 0 ) return 0; diff --git a/patch-1.5.24.vk.pgp_verbose_mime b/patch-1.5.24.vk.pgp_verbose_mime index b55e4b9..7392da1 100644 --- a/patch-1.5.24.vk.pgp_verbose_mime +++ b/patch-1.5.24.vk.pgp_verbose_mime @@ -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. */ diff --git a/patch-1.6.0.rr.compressed.bz2 b/patch-1.6.0.rr.compressed.bz2 deleted file mode 100644 index 09df962..0000000 --- a/patch-1.6.0.rr.compressed.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08e03883b29f3cdb1cd70b948e7de39dd381b45f5a262a85b1df96d08927bc78 -size 9671 diff --git a/patch-1.6.0.sidebar.20160411.patch b/patch-1.6.0.sidebar.20160411.patch deleted file mode 100644 index 93fe001..0000000 --- a/patch-1.6.0.sidebar.20160411.patch +++ /dev/null @@ -1,1965 +0,0 @@ ---- - Makefile.am | 1 - Makefile.in | 3 - OPS | 5 - PATCHES | 1 - buffy.c | 150 ++++++++++++++++++++ - buffy.h | 6 - color.c | 2 - compose.c | 26 +-- - configure.ac | 2 - curs_main.c | 35 ++++ - doc/Muttrc | 20 ++ - flags.c | 3 - functions.h | 10 + - globals.h | 6 - handler.c | 30 ++++ - imap/command.c | 7 - imap/imap.c | 2 - init.h | 48 ++++++ - mailbox.h | 1 - main.c | 11 + - mbox.c | 2 - menu.c | 20 +- - mh.c | 26 +++ - mutt.h | 6 - mutt_curses.h | 3 - mutt_menu.h | 1 - muttlib.c | 48 ++++++ - mx.c | 22 +++ - mx.h | 1 - pager.c | 42 ++++- - pattern.c | 38 +++++ - protos.h | 7 - sidebar.c | 410 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - sidebar.h | 36 +++++ - 34 files changed, 993 insertions(+), 38 deletions(-) - -diff --git a/Makefile.am b/mutt-1.6.0/Makefile.am ---- a/Makefile.am -+++ b/Makefile.am -@@ -32,6 +32,7 @@ mutt_SOURCES = \ - main.c mbox.c menu.c mh.c mx.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 \ - score.c send.c sendlib.c signal.c sort.c \ - status.c system.c thread.c charset.c history.c lib.c \ - muttlib.c editmsg.c mbyte.c mutt_idna.c \ -diff --git a/Makefile.in b/mutt-1.6.0/Makefile.in ---- a/Makefile.in -+++ b/Makefile.in -@@ -133,6 +133,7 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) ali - recvcmd.$(OBJEXT) rfc822.$(OBJEXT) rfc1524.$(OBJEXT) \ - rfc2047.$(OBJEXT) rfc2231.$(OBJEXT) rfc3676.$(OBJEXT) \ - score.$(OBJEXT) send.$(OBJEXT) sendlib.$(OBJEXT) \ -+ sidebar.$(OBJECT) \ - signal.$(OBJEXT) sort.$(OBJEXT) status.$(OBJEXT) \ - system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \ - history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \ -@@ -489,6 +490,7 @@ mutt_SOURCES = \ - 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 \ -+ sidebar.c \ - status.c system.c thread.c charset.c history.c lib.c \ - muttlib.c editmsg.c mbyte.c mutt_idna.c \ - url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c -@@ -819,6 +821,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/send.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendlib.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sidebar.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signal.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smime.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smtp.Po@am__quote@ -diff --git a/OPS b/mutt-1.6.0/OPS ---- a/OPS -+++ b/OPS -@@ -179,3 +179,8 @@ OP_WHAT_KEY "display the keycode for a k - OP_MAIN_SHOW_LIMIT "show currently active limit pattern" - OP_MAIN_COLLAPSE_THREAD "collapse/uncollapse current thread" - OP_MAIN_COLLAPSE_ALL "collapse/uncollapse all threads" -+OP_SIDEBAR_SCROLL_UP "scroll the mailbox pane up 1 page" -+OP_SIDEBAR_SCROLL_DOWN "scroll the mailbox pane down 1 page" -+OP_SIDEBAR_NEXT "go down to next mailbox" -+OP_SIDEBAR_PREV "go to previous mailbox" -+OP_SIDEBAR_OPEN "open hilighted mailbox" -diff --git a/PATCHES b/mutt-1.6.0/PATCHES ---- a/PATCHES -+++ b/PATCHES -@@ -1 +1,2 @@ -+patch-1.6.0.sidebar.20160404.txt - rr.compressed -diff --git a/buffy.c b/mutt-1.6.0/buffy.c ---- a/buffy.c -+++ b/buffy.c -@@ -161,6 +161,49 @@ void mutt_buffy_cleanup (const char *buf - } - } - -+static int buffy_compare_name(const void *a, const void *b) { -+ const BUFFY *b1 = * (BUFFY * const *) a; -+ const BUFFY *b2 = * (BUFFY * const *) b; -+ -+ return mutt_strcoll(b1->path, b2->path); -+} -+ -+static BUFFY *buffy_sort(BUFFY *b) -+{ -+ BUFFY *tmp = b; -+ int buffycount = 0; -+ BUFFY **ary; -+ int i; -+ -+ if (!option(OPTSIDEBARSORT)) -+ return b; -+ -+ for (; tmp != NULL; tmp = tmp->next) -+ buffycount++; -+ -+ ary = (BUFFY **) safe_calloc(buffycount, sizeof (*ary)); -+ -+ tmp = b; -+ for (i = 0; tmp != NULL; tmp = tmp->next, i++) { -+ ary[i] = tmp; -+ } -+ -+ qsort(ary, buffycount, sizeof(*ary), buffy_compare_name); -+ -+ for (i = 0; i < buffycount - 1; i++) { -+ ary[i]->next = ary[i+1]; -+ } -+ ary[buffycount - 1]->next = NULL; -+ for (i = 1; i < buffycount; i++) { -+ ary[i]->prev = ary[i-1]; -+ } -+ ary[0]->prev = NULL; -+ -+ tmp = ary[0]; -+ free(ary); -+ return tmp; -+} -+ - BUFFY *mutt_find_mailbox (const char *path) - { - BUFFY *tmp = NULL; -@@ -196,9 +239,13 @@ void mutt_update_mailbox (BUFFY * b) - static BUFFY *buffy_new (const char *path) - { - BUFFY* buffy; -+ char rp[PATH_MAX]; -+ char *r; - - buffy = (BUFFY *) safe_calloc (1, sizeof (BUFFY)); - strfcpy (buffy->path, path, sizeof (buffy->path)); -+ r = realpath(path, rp); -+ strfcpy (buffy->realpath, r ? rp : path, sizeof (buffy->realpath)); - buffy->next = NULL; - buffy->magic = 0; - -@@ -243,8 +290,8 @@ int mutt_parse_mailboxes (BUFFER *path, - p = realpath (buf, f1); - for (tmp = &Incoming; *tmp; tmp = &((*tmp)->next)) - { -- q = realpath ((*tmp)->path, f2); -- if (mutt_strcmp (p ? p : buf, q ? q : (*tmp)->path) == 0) -+ q = (*tmp)->realpath; -+ if (mutt_strcmp (p ? p : buf, q) == 0) - { - dprint(3,(debugfile,"mailbox '%s' already registered as '%s'\n", buf, (*tmp)->path)); - break; -@@ -282,6 +329,7 @@ int mutt_parse_mailboxes (BUFFER *path, - else - (*tmp)->size = 0; - } -+ Incoming = buffy_sort(Incoming); - return 0; - } - -@@ -306,6 +354,11 @@ static int buffy_maildir_dir_hasnew(BUFF - return 0; - } - -+ if (option(OPTSIDEBAR) && mailbox->msg_unread > 0) { -+ mailbox->new = 1; -+ return 1; -+ } -+ - if ((dirp = opendir (path)) == NULL) - { - mailbox->magic = 0; -@@ -357,6 +410,73 @@ static int buffy_maildir_hasnew (BUFFY* - - return 0; - } -+ -+ /* update message counts for the sidebar */ -+void buffy_maildir_update (BUFFY* mailbox) -+{ -+ char path[_POSIX_PATH_MAX]; -+ DIR *dirp; -+ struct dirent *de; -+ char *p; -+ -+ if(!option(OPTSIDEBAR)) -+ return; -+ -+ mailbox->msgcount = 0; -+ mailbox->msg_unread = 0; -+ mailbox->msg_flagged = 0; -+ -+ snprintf (path, sizeof (path), "%s/new", mailbox->path); -+ -+ if ((dirp = opendir (path)) == NULL) -+ { -+ mailbox->magic = 0; -+ return; -+ } -+ -+ while ((de = readdir (dirp)) != NULL) -+ { -+ if (*de->d_name == '.') -+ continue; -+ -+ if (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')) { -+ mailbox->new = 1; -+ mailbox->msgcount++; -+ mailbox->msg_unread++; -+ } -+ } -+ -+ closedir (dirp); -+ snprintf (path, sizeof (path), "%s/cur", mailbox->path); -+ -+ if ((dirp = opendir (path)) == NULL) -+ { -+ mailbox->magic = 0; -+ return; -+ } -+ -+ while ((de = readdir (dirp)) != NULL) -+ { -+ if (*de->d_name == '.') -+ continue; -+ -+ if (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')) { -+ mailbox->msgcount++; -+ if ((p = strstr (de->d_name, ":2,"))) { -+ if (!strchr (p + 3, 'T')) { -+ if (!strchr (p + 3, 'S')) -+ mailbox->msg_unread++; -+ if (strchr(p + 3, 'F')) -+ mailbox->msg_flagged++; -+ } -+ } -+ } -+ } -+ -+ mailbox->sb_last_checked = time(NULL); -+ closedir (dirp); -+} -+ - /* returns 1 if mailbox has new mail */ - static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb) - { -@@ -368,7 +488,7 @@ static int buffy_mbox_hasnew (BUFFY* mai - else - statcheck = sb->st_mtime > sb->st_atime - || (mailbox->newly_created && sb->st_ctime == sb->st_mtime && sb->st_ctime == sb->st_atime); -- if (statcheck) -+ if ((!option(OPTSIDEBAR) && statcheck) || (option(OPTSIDEBAR) && mailbox->msg_unread > 0)) - { - if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited) - { -@@ -388,6 +508,27 @@ static int buffy_mbox_hasnew (BUFFY* mai - return rc; - } - -+/* update message counts for the sidebar */ -+void buffy_mbox_update (BUFFY* mailbox, struct stat *sb) -+{ -+ CONTEXT *ctx = NULL; -+ -+ if(!option(OPTSIDEBAR)) -+ return; -+ if(mailbox->sb_last_checked > sb->st_mtime && mailbox->msgcount != 0) -+ return; /* no check necessary */ -+ -+ ctx = mx_open_mailbox(mailbox->path, M_READONLY | M_QUIET | M_NOSORT | M_PEEK, NULL); -+ if(ctx) -+ { -+ mailbox->msgcount = ctx->msgcount; -+ mailbox->msg_unread = ctx->unread; -+ mailbox->msg_flagged = ctx->flagged; -+ mailbox->sb_last_checked = time(NULL); -+ mx_close_mailbox(ctx, 0); -+ } -+} -+ - int mutt_buffy_check (int force) - { - BUFFY *tmp; -@@ -461,16 +602,19 @@ int mutt_buffy_check (int force) - { - case M_MBOX: - case M_MMDF: -+ buffy_mbox_update (tmp, &sb); - if (buffy_mbox_hasnew (tmp, &sb) > 0) - BuffyCount++; - break; - - case M_MAILDIR: -+ buffy_maildir_update (tmp); - if (buffy_maildir_hasnew (tmp) > 0) - BuffyCount++; - break; - - case M_MH: -+ mh_buffy_update (tmp->path, &tmp->msgcount, &tmp->msg_unread, &tmp->msg_flagged, &tmp->sb_last_checked); - mh_buffy(tmp); - if (tmp->new) - BuffyCount++; -diff --git a/buffy.h b/mutt-1.6.0/buffy.h ---- a/buffy.h -+++ b/buffy.h -@@ -23,13 +23,19 @@ - typedef struct buffy_t - { - char path[_POSIX_PATH_MAX]; -+ char realpath[_POSIX_PATH_MAX]; - off_t size; - struct buffy_t *next; -+ struct buffy_t *prev; - short new; /* mailbox has new mail */ -+ int msgcount; /* total number of messages */ -+ int msg_unread; /* number of unread messages */ -+ int msg_flagged; /* number of flagged messages */ - short notified; /* user has been notified */ - short magic; /* mailbox type */ - short newly_created; /* mbox or mmdf just popped into existence */ - time_t last_visited; /* time of last exit from this mailbox */ -+ time_t sb_last_checked; /* time of last buffy check from sidebar */ - } - BUFFY; - -diff --git a/color.c b/mutt-1.6.0/color.c ---- a/color.c -+++ b/color.c -@@ -94,6 +94,8 @@ static const struct mapping_t Fields[] = - { "underline", MT_COLOR_UNDERLINE }, - { "index", MT_COLOR_INDEX }, - { "prompt", MT_COLOR_PROMPT }, -+ { "sidebar_new", MT_COLOR_NEW }, -+ { "sidebar_flagged", MT_COLOR_FLAGGED }, - { NULL, 0 } - }; - -diff --git a/compose.c b/mutt-1.6.0/compose.c ---- a/compose.c -+++ b/compose.c -@@ -72,7 +72,7 @@ enum - - #define HDR_XOFFSET 10 - #define TITLE_FMT "%10s" /* Used for Prompts, which are ASCII */ --#define W (COLS - HDR_XOFFSET) -+#define W (COLS - HDR_XOFFSET - SidebarWidth) - - static const char * const Prompts[] = - { -@@ -110,7 +110,7 @@ static void snd_entry (char *b, size_t b - - static void redraw_crypt_lines (HEADER *msg) - { -- mvaddstr (HDR_CRYPT, 0, "Security: "); -+ mvaddstr (HDR_CRYPT, SidebarWidth, "Security: "); - - if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0) - { -@@ -145,7 +145,7 @@ static void redraw_crypt_lines (HEADER * - addstr (_(" (OppEnc mode)")); - - clrtoeol (); -- move (HDR_CRYPTINFO, 0); -+ move (HDR_CRYPTINFO, SidebarWidth); - clrtoeol (); - - if ((WithCrypto & APPLICATION_PGP) -@@ -162,7 +162,7 @@ static void redraw_crypt_lines (HEADER * - && (msg->security & ENCRYPT) - && SmimeCryptAlg - && *SmimeCryptAlg) { -- mvprintw (HDR_CRYPTINFO, 40, "%s%s", _("Encrypt with: "), -+ mvprintw (HDR_CRYPTINFO, SidebarWidth + 40, "%s%s", _("Encrypt with: "), - NONULL(SmimeCryptAlg)); - } - } -@@ -175,7 +175,7 @@ static void redraw_mix_line (LIST *chain - int c; - char *t; - -- mvaddstr (HDR_MIX, 0, " Mix: "); -+ mvaddstr (HDR_MIX, SidebarWidth, " Mix: "); - - if (!chain) - { -@@ -190,7 +190,7 @@ static void redraw_mix_line (LIST *chain - if (t && t[0] == '0' && t[1] == '\0') - t = ""; - -- if (c + mutt_strlen (t) + 2 >= COLS) -+ if (c + mutt_strlen (t) + 2 >= COLS - SidebarWidth) - break; - - addstr (NONULL(t)); -@@ -242,7 +242,7 @@ static void draw_envelope_addr (int line - - buf[0] = 0; - rfc822_write_address (buf, sizeof (buf), addr, 1); -- mvprintw (line, 0, TITLE_FMT, Prompts[line - 1]); -+ mvprintw (line, SidebarWidth, TITLE_FMT, Prompts[line - 1]); - mutt_paddstr (W, buf); - } - -@@ -252,10 +252,10 @@ static void draw_envelope (HEADER *msg, - draw_envelope_addr (HDR_TO, msg->env->to); - draw_envelope_addr (HDR_CC, msg->env->cc); - draw_envelope_addr (HDR_BCC, msg->env->bcc); -- mvprintw (HDR_SUBJECT, 0, TITLE_FMT, Prompts[HDR_SUBJECT - 1]); -+ mvprintw (HDR_SUBJECT, SidebarWidth, TITLE_FMT, Prompts[HDR_SUBJECT - 1]); - mutt_paddstr (W, NONULL (msg->env->subject)); - draw_envelope_addr (HDR_REPLYTO, msg->env->reply_to); -- mvprintw (HDR_FCC, 0, TITLE_FMT, Prompts[HDR_FCC - 1]); -+ mvprintw (HDR_FCC, SidebarWidth, TITLE_FMT, Prompts[HDR_FCC - 1]); - mutt_paddstr (W, fcc); - - if (WithCrypto) -@@ -266,7 +266,7 @@ static void draw_envelope (HEADER *msg, - #endif - - SETCOLOR (MT_COLOR_STATUS); -- mvaddstr (HDR_ATTACH - 1, 0, _("-- Attachments")); -+ mvaddstr (HDR_ATTACH - 1, SidebarWidth, _("-- Attachments")); - clrtoeol (); - - NORMAL_COLOR; -@@ -302,7 +302,7 @@ static int edit_address_list (int line, - /* redraw the expanded list so the user can see the result */ - buf[0] = 0; - rfc822_write_address (buf, sizeof (buf), *addr, 1); -- move (line, HDR_XOFFSET); -+ move (line, HDR_XOFFSET+SidebarWidth); - mutt_paddstr (W, buf); - - return 0; -@@ -564,7 +564,7 @@ int mutt_compose_menu (HEADER *msg, /* - if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0) - { - mutt_str_replace (&msg->env->subject, buf); -- move (HDR_SUBJECT, HDR_XOFFSET); -+ move (HDR_SUBJECT, HDR_XOFFSET + SidebarWidth); - if (msg->env->subject) - mutt_paddstr (W, msg->env->subject); - else -@@ -582,7 +582,7 @@ int mutt_compose_menu (HEADER *msg, /* - { - strfcpy (fcc, buf, fcclen); - mutt_pretty_mailbox (fcc, fcclen); -- move (HDR_FCC, HDR_XOFFSET); -+ move (HDR_FCC, HDR_XOFFSET + SidebarWidth); - mutt_paddstr (W, fcc); - fccSet = 1; - } -diff --git a/configure.ac b/mutt-1.6.0/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -1314,6 +1314,8 @@ if test $mutt_cv_langinfo_yesexpr = yes; - AC_DEFINE(HAVE_LANGINFO_YESEXPR,1,[ Define if you have and nl_langinfo(YESEXPR). ]) - fi - -+AC_CHECK_FUNCS(fmemopen open_memstream) -+ - dnl Documentation tools - have_openjade="no" - AC_PATH_PROG([OSPCAT], [ospcat], [none]) -diff --git a/curs_main.c b/mutt-1.6.0/curs_main.c ---- a/curs_main.c -+++ b/curs_main.c -@@ -26,7 +26,9 @@ - #include "mailbox.h" - #include "mapping.h" - #include "sort.h" -+#include "buffy.h" - #include "mx.h" -+#include "sidebar.h" - - #ifdef USE_POP - #include "pop.h" -@@ -595,20 +597,31 @@ int mutt_index_menu (void) - menu->redraw |= REDRAW_STATUS; - if (do_buffy_notify) - { -- if (mutt_buffy_notify () && option (OPTBEEPNEW)) -+ if (mutt_buffy_notify ()) -+ { -+ menu->redraw |= REDRAW_STATUS; -+ if (option (OPTBEEPNEW)) - beep (); - } -+ } - else - do_buffy_notify = 1; - } - -+ if(option(OPTSIDEBAR)) -+ menu->redraw |= REDRAW_SIDEBAR; -+ - if (op != -1) - mutt_curs_set (0); - - if (menu->redraw & REDRAW_FULL) - { - menu_redraw_full (menu); -+ draw_sidebar(menu->menu); - mutt_show_error (); -+ } else if(menu->redraw & REDRAW_SIDEBAR) { -+ draw_sidebar(menu->menu); -+ menu->redraw &= ~REDRAW_SIDEBAR; - } - - if (menu->menu == MENU_MAIN) -@@ -630,9 +643,12 @@ int mutt_index_menu (void) - - if (menu->redraw & REDRAW_STATUS) - { -+ DrawFullLine = 1; - menu_status_line (buf, sizeof (buf), menu, NONULL (Status)); -+ DrawFullLine = 0; - move (option (OPTSTATUSONTOP) ? 0 : LINES-2, 0); - SETCOLOR (MT_COLOR_STATUS); -+ set_buffystats(Context); - mutt_paddstr (COLS, buf); - NORMAL_COLOR; - menu->redraw &= ~REDRAW_STATUS; -@@ -652,7 +668,7 @@ int mutt_index_menu (void) - menu->oldcurrent = -1; - - if (option (OPTARROWCURSOR)) -- move (menu->current - menu->top + menu->offset, 2); -+ move (menu->current - menu->top + menu->offset, SidebarWidth + 2); - else if (option (OPTBRAILLEFRIENDLY)) - move (menu->current - menu->top + menu->offset, 0); - else -@@ -1091,6 +1107,7 @@ int mutt_index_menu (void) - break; - - CHECK_MSGCOUNT; -+ CHECK_VISIBLE; - CHECK_READONLY; - { - int oldvcount = Context->vcount; -@@ -1150,6 +1167,7 @@ int mutt_index_menu (void) - menu->redraw = REDRAW_FULL; - break; - -+ case OP_SIDEBAR_OPEN: - case OP_MAIN_CHANGE_FOLDER: - case OP_MAIN_NEXT_UNREAD_MAILBOX: - -@@ -1181,7 +1199,11 @@ int mutt_index_menu (void) - { - mutt_buffy (buf, sizeof (buf)); - -- if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1) -+ if ( op == OP_SIDEBAR_OPEN ) { -+ if(!CurBuffy) -+ break; -+ strncpy( buf, CurBuffy->path, sizeof(buf) ); -+ } else if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1) - { - if (menu->menu == MENU_PAGER) - { -@@ -1199,6 +1221,7 @@ int mutt_index_menu (void) - } - - mutt_expand_path (buf, sizeof (buf)); -+ set_curbuffy(buf); - if (mx_get_magic (buf) <= 0) - { - mutt_error (_("%s is not a mailbox."), buf); -@@ -2315,6 +2338,12 @@ int mutt_index_menu (void) - mutt_what_key(); - break; - -+ case OP_SIDEBAR_SCROLL_UP: -+ case OP_SIDEBAR_SCROLL_DOWN: -+ case OP_SIDEBAR_NEXT: -+ case OP_SIDEBAR_PREV: -+ scroll_sidebar(op, menu->menu); -+ break; - default: - if (menu->menu == MENU_MAIN) - km_error_key (MENU_MAIN); -diff --git a/doc/Muttrc b/mutt-1.6.0/doc/Muttrc ---- a/doc/Muttrc -+++ b/doc/Muttrc -@@ -657,6 +657,26 @@ set check_mbox_size=yes - # $crypt_autosign, $crypt_replysign and $smime_is_default. - # - # -+# set sidebar_visible=no -+# -+# Name: sidebar_visible -+# Type: boolean -+# Default: no -+# -+# -+# This specifies whether or not to show sidebar (left-side list of folders). -+# -+# -+# set sidebar_width=0 -+# -+# Name: sidebar_width -+# Type: number -+# Default: 0 -+# -+# -+# The width of the sidebar. -+# -+# - # set crypt_autosign=no - # - # Name: crypt_autosign -diff --git a/flags.c b/mutt-1.6.0/flags.c ---- a/flags.c -+++ b/flags.c -@@ -22,8 +22,10 @@ - - #include "mutt.h" - #include "mutt_curses.h" -+#include "mutt_menu.h" - #include "sort.h" - #include "mx.h" -+#include "sidebar.h" - - void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx) - { -@@ -263,6 +265,7 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE - */ - if (h->searched && (changed != h->changed || deleted != ctx->deleted || tagged != ctx->tagged || flagged != ctx->flagged)) - h->searched = 0; -+ draw_sidebar(0); - } - - void mutt_tag_set_flag (int flag, int bf) -diff --git a/functions.h b/mutt-1.6.0/functions.h ---- a/functions.h -+++ b/functions.h -@@ -169,6 +169,11 @@ const struct binding_t OpMain[] = { /* m - { "decrypt-save", OP_DECRYPT_SAVE, NULL }, - - -+ { "sidebar-scroll-up", OP_SIDEBAR_SCROLL_UP, NULL }, -+ { "sidebar-scroll-down", OP_SIDEBAR_SCROLL_DOWN, NULL }, -+ { "sidebar-next", OP_SIDEBAR_NEXT, NULL }, -+ { "sidebar-prev", OP_SIDEBAR_PREV, NULL }, -+ { "sidebar-open", OP_SIDEBAR_OPEN, NULL }, - { NULL, 0, NULL } - }; - -@@ -272,6 +277,11 @@ const struct binding_t OpPager[] = { /* - - { "what-key", OP_WHAT_KEY, NULL }, - -+ { "sidebar-scroll-up", OP_SIDEBAR_SCROLL_UP, NULL }, -+ { "sidebar-scroll-down", OP_SIDEBAR_SCROLL_DOWN, NULL }, -+ { "sidebar-next", OP_SIDEBAR_NEXT, NULL }, -+ { "sidebar-prev", OP_SIDEBAR_PREV, NULL }, -+ { "sidebar-open", OP_SIDEBAR_OPEN, NULL }, - { NULL, 0, NULL } - }; - -diff --git a/globals.h b/mutt-1.6.0/globals.h ---- a/globals.h -+++ b/globals.h -@@ -118,6 +118,9 @@ WHERE short SearchContext; - WHERE char *SendCharset; - WHERE char *Sendmail; - WHERE char *Shell; -+WHERE char *SidebarDelim; -+WHERE char *SidebarFormat; -+WHERE char *SidebarIndentStr; - WHERE char *Signature; - WHERE char *SimpleSearch; - #if USE_SMTP -@@ -214,6 +217,9 @@ WHERE short ScoreThresholdDelete; - WHERE short ScoreThresholdRead; - WHERE short ScoreThresholdFlag; - -+WHERE struct buffy_t *CurBuffy INITVAL(0); -+WHERE short DrawFullLine INITVAL(0); -+WHERE short SidebarWidth; - #ifdef USE_IMAP - WHERE short ImapKeepalive; - WHERE short ImapPipelineDepth; -diff --git a/handler.c b/mutt-1.6.0/handler.c ---- a/handler.c -+++ b/handler.c -@@ -1603,6 +1603,11 @@ static int run_decode_and_handler (BODY - - fseeko (s->fpin, b->offset, 0); - -+#ifdef HAVE_FMEMOPEN -+ char *temp; -+ size_t tempsize; -+#endif -+ - /* see if we need to decode this part before processing it */ - if (b->encoding == ENCBASE64 || b->encoding == ENCQUOTEDPRINTABLE || - b->encoding == ENCUUENCODED || plaintext || -@@ -1618,6 +1623,14 @@ static int run_decode_and_handler (BODY - { - /* decode to a tempfile, saving the original destination */ - fp = s->fpout; -+#ifdef HAVE_FMEMOPEN -+ if ((s->fpout = open_memstream(&temp, &tempsize)) == NULL) -+ { -+ mutt_error _("Unable to open memory stream!"); -+ dprint (1, (debugfile, "Can't open memory stream.\n")); -+ return -1; -+ } -+#else - mutt_mktemp (tempfile, sizeof (tempfile)); - if ((s->fpout = safe_fopen (tempfile, "w")) == NULL) - { -@@ -1625,6 +1638,7 @@ static int run_decode_and_handler (BODY - dprint (1, (debugfile, "Can't open %s.\n", tempfile)); - return -1; - } -+#endif - /* decoding the attachment changes the size and offset, so save a copy - * of the "real" values now, and restore them after processing - */ -@@ -1653,9 +1667,19 @@ static int run_decode_and_handler (BODY - /* restore final destination and substitute the tempfile for input */ - s->fpout = fp; - fp = s->fpin; -+#ifdef HAVE_FMEMOPEN -+ if(tempsize) -+ s->fpin = fmemopen(temp, tempsize, "r"); -+ else /* fmemopen cannot handle zero-length buffers */ -+ s->fpin = safe_fopen ("/dev/null", "r"); -+ if(s->fpin == NULL) { -+ mutt_perror("failed to re-open memstream!"); -+ return (-1); -+ } -+#else - s->fpin = fopen (tempfile, "r"); - unlink (tempfile); -- -+#endif - /* restore the prefix */ - s->prefix = savePrefix; - } -@@ -1680,6 +1704,10 @@ static int run_decode_and_handler (BODY - - /* restore the original source stream */ - safe_fclose (&s->fpin); -+#ifdef HAVE_FMEMOPEN -+ if(tempsize) -+ FREE(&temp); -+#endif - s->fpin = fp; - } - } -diff --git a/imap/command.c b/mutt-1.6.0/imap/command.c ---- a/imap/command.c -+++ b/imap/command.c -@@ -1016,6 +1016,13 @@ static void cmd_parse_status (IMAP_DATA* - opened */ - status->uidnext = oldun; - -+ /* Added to make the sidebar show the correct numbers */ -+ if (status->messages) -+ { -+ inc->msgcount = status->messages; -+ inc->msg_unread = status->unseen; -+ } -+ - FREE (&value); - return; - } -diff --git a/imap/imap.c b/mutt-1.6.0/imap/imap.c ---- a/imap/imap.c -+++ b/imap/imap.c -@@ -1535,7 +1535,7 @@ int imap_buffy_check (int force) - - imap_munge_mbox_name (idata, munged, sizeof (munged), name); - snprintf (command, sizeof (command), -- "STATUS %s (UIDNEXT UIDVALIDITY UNSEEN RECENT)", munged); -+ "STATUS %s (UIDNEXT UIDVALIDITY UNSEEN RECENT MESSAGES)", munged); - - if (imap_exec (idata, command, IMAP_CMD_QUEUE) < 0) - { -diff --git a/init.h b/mutt-1.6.0/init.h ---- a/init.h -+++ b/init.h -@@ -2049,6 +2049,54 @@ struct option_t MuttVars[] = { - ** not used. - ** (PGP only) - */ -+ {"sidebar_delim", DT_STR, R_BOTH, UL &SidebarDelim, UL "|"}, -+ /* -+ ** .pp -+ ** This specifies the delimiter between the sidebar (if visible) and -+ ** other screens. -+ */ -+ {"sidebar_indentstr", DT_STR, R_BOTH, UL &SidebarIndentStr, UL " "}, -+ /* -+ ** .pp -+ ** This specifies the string that is used to indent items -+ ** with sidebar_folderindent= yes -+ */ -+ { "sidebar_visible", DT_BOOL, R_BOTH, OPTSIDEBAR, 0 }, -+ /* -+ ** .pp -+ ** This specifies whether or not to show sidebar (left-side list of folders). -+ */ -+ { "sidebar_sort", DT_BOOL, R_BOTH, OPTSIDEBARSORT, 0 }, -+ /* -+ ** .pp -+ ** This specifies whether or not to sort the sidebar alphabetically. -+ */ -+ { "sidebar_width", DT_NUM, R_BOTH, UL &SidebarWidth, 0 }, -+ /* -+ ** .pp -+ ** The width of the sidebar. -+ */ -+ { "sidebar_shortpath", DT_BOOL, R_BOTH, OPTSIDEBARSHORTPATH, 0 }, -+ /* -+ ** .pp -+ ** Should the sidebar shorten the path showed. -+ */ -+ {"sidebar_format", DT_STR, R_NONE, UL &SidebarFormat, UL "%B%?F? [%F]?%* %?N?%N/?%4S"}, -+ /* -+ ** .pp -+ ** Format string for the sidebar. The sequences `%N', `%F' and `%S' -+ ** will be replaced by the number of new or flagged messages or the total -+ ** size of them mailbox. `%B' will be replaced with the name of the mailbox. -+ ** The `%!' sequence will be expanded to `!' if there is one flagged message; -+ ** to `!!' if there are two flagged messages; and to `n!' for n flagged -+ ** messages, n>2. -+ */ -+ { "sidebar_folderindent", DT_BOOL, R_BOTH, OPTSIDEBARFOLDERINDENT, 0 }, -+ /* -+ ** .pp -+ ** Should folders be indented in the sidebar. -+ */ -+ - { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0}, - /* - ** .pp -diff --git a/mailbox.h b/mutt-1.6.0/mailbox.h ---- a/mailbox.h -+++ b/mailbox.h -@@ -27,6 +27,7 @@ - #define M_NEWFOLDER (1<<4) /* create a new folder - same as M_APPEND, but uses - * safe_fopen() for mbox-style folders. - */ -+#define M_PEEK (1<<5) /* revert atime back after taking a look (if applicable) */ - - /* mx_open_new_message() */ - #define M_ADD_FROM (1<<0) /* add a From_ line */ -diff --git a/main.c b/mutt-1.6.0/main.c ---- a/main.c -+++ b/main.c -@@ -50,6 +50,7 @@ - #include - #include - #include -+#include - #include - - #ifdef HAVE_GETOPT_H -@@ -563,7 +564,7 @@ init_extended_keys(); - - int main (int argc, char **argv) - { -- char folder[_POSIX_PATH_MAX] = ""; -+ char folder[PATH_MAX] = ""; - char *subject = NULL; - char *includeFile = NULL; - char *draftFile = NULL; -@@ -1190,6 +1191,13 @@ int main (int argc, char **argv) - strfcpy (folder, NONULL(Spoolfile), sizeof (folder)); - mutt_expand_path (folder, sizeof (folder)); - -+ { -+ char tmpfolder[PATH_MAX]; -+ strfcpy (tmpfolder, folder, sizeof (tmpfolder)); -+ if(!realpath(tmpfolder, folder)) -+ strfcpy (folder, tmpfolder, sizeof (tmpfolder)); -+ } -+ - mutt_str_replace (&CurrentFolder, folder); - mutt_str_replace (&LastFolder, folder); - -@@ -1212,6 +1220,7 @@ int main (int argc, char **argv) - if((Context = mx_open_mailbox (folder, ((flags & M_RO) || option (OPTREADONLY)) ? M_READONLY : 0, NULL)) - || !explicit_folder) - { -+ set_curbuffy(folder); - mutt_index_menu (); - if (Context) - FREE (&Context); -diff --git a/mbox.c b/mutt-1.6.0/mbox.c ---- a/mbox.c -+++ b/mbox.c -@@ -104,6 +104,7 @@ int mmdf_parse_mailbox (CONTEXT *ctx) - mutt_perror (ctx->path); - return (-1); - } -+ ctx->atime = sb.st_atime; - ctx->mtime = sb.st_mtime; - ctx->size = sb.st_size; - -@@ -255,6 +256,7 @@ int mbox_parse_mailbox (CONTEXT *ctx) - - ctx->size = sb.st_size; - ctx->mtime = sb.st_mtime; -+ ctx->atime = sb.st_atime; - - #ifdef NFS_ATTRIBUTE_HACK - if (sb.st_mtime > sb.st_atime) -diff --git a/menu.c b/mutt-1.6.0/menu.c ---- a/menu.c -+++ b/menu.c -@@ -24,6 +24,7 @@ - #include "mutt_curses.h" - #include "mutt_menu.h" - #include "mbyte.h" -+#include "sidebar.h" - - char* SearchBuffers[MENU_MAX]; - -@@ -184,7 +185,7 @@ static void menu_pad_string (char *s, si - { - char *scratch = safe_strdup (s); - int shift = option (OPTARROWCURSOR) ? 3 : 0; -- int cols = COLS - shift; -+ int cols = COLS - shift - SidebarWidth; - - mutt_format_string (s, n, cols, cols, FMT_LEFT, ' ', scratch, mutt_strlen (scratch), 1); - s[n - 1] = 0; -@@ -237,6 +238,7 @@ void menu_redraw_index (MUTTMENU *menu) - int do_color; - int attr; - -+ draw_sidebar(1); - for (i = menu->top; i < menu->top + menu->pagelen; i++) - { - if (i < menu->max) -@@ -247,7 +249,7 @@ void menu_redraw_index (MUTTMENU *menu) - menu_pad_string (buf, sizeof (buf)); - - ATTRSET(attr); -- move(i - menu->top + menu->offset, 0); -+ move(i - menu->top + menu->offset, SidebarWidth); - do_color = 1; - - if (i == menu->current) -@@ -270,7 +272,7 @@ void menu_redraw_index (MUTTMENU *menu) - else - { - NORMAL_COLOR; -- CLEARLINE(i - menu->top + menu->offset); -+ CLEARLINE_WIN (i - menu->top + menu->offset); - } - } - NORMAL_COLOR; -@@ -287,7 +289,7 @@ void menu_redraw_motion (MUTTMENU *menu) - return; - } - -- move (menu->oldcurrent + menu->offset - menu->top, 0); -+ move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth); - ATTRSET(menu->color (menu->oldcurrent)); - - if (option (OPTARROWCURSOR)) -@@ -299,13 +301,13 @@ void menu_redraw_motion (MUTTMENU *menu) - { - menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent); - menu_pad_string (buf, sizeof (buf)); -- move (menu->oldcurrent + menu->offset - menu->top, 3); -+ move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth + 3); - print_enriched_string (menu->color(menu->oldcurrent), (unsigned char *) buf, 1); - } - - /* now draw it in the new location */ - SETCOLOR(MT_COLOR_INDICATOR); -- mvaddstr(menu->current + menu->offset - menu->top, 0, "->"); -+ mvaddstr(menu->current + menu->offset - menu->top, SidebarWidth, "->"); - } - else - { -@@ -318,7 +320,7 @@ void menu_redraw_motion (MUTTMENU *menu) - menu_make_entry (buf, sizeof (buf), menu, menu->current); - menu_pad_string (buf, sizeof (buf)); - SETCOLOR(MT_COLOR_INDICATOR); -- move(menu->current - menu->top + menu->offset, 0); -+ move(menu->current - menu->top + menu->offset, SidebarWidth); - print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0); - } - menu->redraw &= REDRAW_STATUS; -@@ -330,7 +332,7 @@ void menu_redraw_current (MUTTMENU *menu - char buf[LONG_STRING]; - int attr = menu->color (menu->current); - -- move (menu->current + menu->offset - menu->top, 0); -+ move (menu->current + menu->offset - menu->top, SidebarWidth); - menu_make_entry (buf, sizeof (buf), menu, menu->current); - menu_pad_string (buf, sizeof (buf)); - -@@ -873,7 +875,7 @@ int mutt_menuLoop (MUTTMENU *menu) - - - if (option (OPTARROWCURSOR)) -- move (menu->current - menu->top + menu->offset, 2); -+ move (menu->current - menu->top + menu->offset, SidebarWidth + 2); - else if (option (OPTBRAILLEFRIENDLY)) - move (menu->current - menu->top + menu->offset, 0); - else -diff --git a/mh.c b/mutt-1.6.0/mh.c ---- a/mh.c -+++ b/mh.c -@@ -295,6 +295,32 @@ void mh_buffy(BUFFY *b) - mhs_free_sequences (&mhs); - } - -+void mh_buffy_update (const char *path, int *msgcount, int *msg_unread, int *msg_flagged, time_t *sb_last_checked) -+{ -+ int i; -+ struct mh_sequences mhs; -+ memset (&mhs, 0, sizeof (mhs)); -+ -+ if(!option(OPTSIDEBAR)) -+ return; -+ -+ if (mh_read_sequences (&mhs, path) < 0) -+ return; -+ -+ msgcount = 0; -+ msg_unread = 0; -+ msg_flagged = 0; -+ for (i = 0; i <= mhs.max; i++) -+ msgcount++; -+ if (mhs_check (&mhs, i) & MH_SEQ_UNSEEN) { -+ msg_unread++; -+ } -+ if (mhs_check (&mhs, i) & MH_SEQ_FLAGGED) -+ msg_flagged++; -+ mhs_free_sequences (&mhs); -+ *sb_last_checked = time(NULL); -+} -+ - static int mh_mkstemp (CONTEXT * dest, FILE ** fp, char **tgt) - { - int fd; -diff --git a/mutt.h b/mutt-1.6.0/mutt.h ---- a/mutt.h -+++ b/mutt.h -@@ -434,6 +434,10 @@ enum - OPTSAVENAME, - OPTSENDGROUPREPLYTO, - OPTSCORE, -+ OPTSIDEBAR, -+ OPTSIDEBARSHORTPATH, -+ OPTSIDEBARSORT, -+ OPTSIDEBARFOLDERINDENT, - OPTSIGDASHES, - OPTSIGONTOP, - OPTSORTRE, -@@ -878,6 +882,7 @@ typedef struct _context - { - char *path; - FILE *fp; -+ time_t atime; - time_t mtime; - off_t size; - off_t vsize; -@@ -917,6 +922,7 @@ typedef struct _context - unsigned int quiet : 1; /* inhibit status messages? */ - unsigned int collapsed : 1; /* are all threads collapsed? */ - unsigned int closing : 1; /* mailbox is being closed */ -+ unsigned int peekonly : 1; /* just taking a glance, revert atime */ - - /* driver hooks */ - void *data; /* driver specific data */ -diff --git a/mutt_curses.h b/mutt-1.6.0/mutt_curses.h ---- a/mutt_curses.h -+++ b/mutt_curses.h -@@ -64,6 +64,7 @@ - #undef lines - #endif /* lines */ - -+#define CLEARLINE_WIN(x) move(x,SidebarWidth), clrtoeol() - #define CLEARLINE(x) move(x,0), clrtoeol() - #define CENTERLINE(x,y) move(y, (COLS-strlen(x))/2), addstr(x) - #define BEEP() do { if (option (OPTBEEP)) beep(); } while (0) -@@ -124,6 +125,8 @@ enum - MT_COLOR_UNDERLINE, - MT_COLOR_INDEX, - MT_COLOR_PROMPT, -+ MT_COLOR_NEW, -+ MT_COLOR_FLAGGED, - MT_COLOR_MAX - }; - -diff --git a/mutt_menu.h b/mutt-1.6.0/mutt_menu.h ---- a/mutt_menu.h -+++ b/mutt_menu.h -@@ -34,6 +34,7 @@ - #define REDRAW_FULL (1<<5) - #define REDRAW_BODY (1<<6) - #define REDRAW_SIGWINCH (1<<7) -+#define REDRAW_SIDEBAR (1<<8) - - #define M_MODEFMT "-- Mutt: %s" - -diff --git a/muttlib.c b/mutt-1.6.0/muttlib.c ---- a/muttlib.c -+++ b/muttlib.c -@@ -1282,6 +1282,8 @@ void mutt_FormatString (char *dest, /* - pl = pw = 1; - - /* see if there's room to add content, else ignore */ -+ if ( DrawFullLine ) -+ { - if ((col < COLS && wlen < destlen) || soft) - { - int pad; -@@ -1325,6 +1327,52 @@ void mutt_FormatString (char *dest, /* - col += wid; - src += pl; - } -+ } -+ else -+ { -+ if ((col < COLS-SidebarWidth && wlen < destlen) || soft) -+ { -+ int pad; -+ -+ /* get contents after padding */ -+ mutt_FormatString (buf, sizeof (buf), 0, src + pl, callback, data, flags); -+ len = mutt_strlen (buf); -+ wid = mutt_strwidth (buf); -+ -+ /* try to consume as many columns as we can, if we don't have -+ * memory for that, use as much memory as possible */ -+ pad = (COLS - SidebarWidth - col - wid) / pw; -+ if (pad > 0 && wlen + (pad * pl) + len > destlen) -+ pad = ((signed)(destlen - wlen - len)) / pl; -+ if (pad > 0) -+ { -+ while (pad--) -+ { -+ memcpy (wptr, src, pl); -+ wptr += pl; -+ wlen += pl; -+ col += pw; -+ } -+ } -+ else if (soft && pad < 0) -+ { -+ /* \0-terminate dest for length computation in mutt_wstr_trunc() */ -+ *wptr = 0; -+ /* make sure right part is at most as wide as display */ -+ len = mutt_wstr_trunc (buf, destlen, COLS, &wid); -+ /* truncate left so that right part fits completely in */ -+ wlen = mutt_wstr_trunc (dest, destlen - len, col + pad, &col); -+ wptr = dest + wlen; -+ } -+ if (len + wlen > destlen) -+ len = mutt_wstr_trunc (buf, destlen - wlen, COLS - SidebarWidth - col, NULL); -+ memcpy (wptr, buf, len); -+ wptr += len; -+ wlen += len; -+ col += wid; -+ src += pl; -+ } -+ } - break; /* skip rest of input */ - } - else if (ch == '|') -diff --git a/mx.c b/mutt-1.6.0/mx.c ---- a/mx.c -+++ b/mx.c -@@ -596,6 +596,7 @@ static int mx_open_mailbox_append (CONTE - * M_APPEND open mailbox for appending - * M_READONLY open mailbox in read-only mode - * M_QUIET only print error messages -+ * M_PEEK revert atime where applicable - * ctx if non-null, context struct to use - */ - CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx) -@@ -618,6 +619,8 @@ CONTEXT *mx_open_mailbox (const char *pa - ctx->quiet = 1; - if (flags & M_READONLY) - ctx->readonly = 1; -+ if (flags & M_PEEK) -+ ctx->peekonly = 1; - - if (flags & (M_APPEND|M_NEWFOLDER)) - { -@@ -722,12 +725,25 @@ CONTEXT *mx_open_mailbox (const char *pa - void mx_fastclose_mailbox (CONTEXT *ctx) - { - int i; -+#ifndef BUFFY_SIZE -+ struct utimbuf ut; -+#endif - - if(!ctx) - return; -+#ifndef BUFFY_SIZE -+ /* fix up the times so buffy won't get confused */ -+ if (ctx->peekonly && ctx->path && ctx->mtime > ctx->atime) -+ { -+ ut.actime = ctx->atime; -+ ut.modtime = ctx->mtime; -+ utime (ctx->path, &ut); -+ } -+#endif - - /* never announce that a mailbox we've just left has new mail. #3290 - * XXX: really belongs in mx_close_mailbox, but this is a nice hook point */ -+ if(!ctx->peekonly) - mutt_buffy_setnotified(ctx->path); - - if (ctx->mx_close) -@@ -740,6 +756,8 @@ void mx_fastclose_mailbox (CONTEXT *ctx) - mutt_clear_threads (ctx); - for (i = 0; i < ctx->msgcount; i++) - mutt_free_header (&ctx->hdrs[i]); -+ ctx->msgcount -= ctx->deleted; -+ set_buffystats(ctx); - FREE (&ctx->hdrs); - FREE (&ctx->v2r); - #ifdef USE_COMPRESSED -@@ -843,6 +861,10 @@ int mx_close_mailbox (CONTEXT *ctx, int - if (!ctx->hdrs[i]->deleted && ctx->hdrs[i]->read - && !(ctx->hdrs[i]->flagged && option (OPTKEEPFLAGGED))) - read_msgs++; -+ if (ctx->hdrs[i]->deleted && !ctx->hdrs[i]->read) -+ ctx->unread--; -+ if (ctx->hdrs[i]->deleted && ctx->hdrs[i]->flagged) -+ ctx->flagged--; - } - - if (read_msgs && quadoption (OPT_MOVE) != M_NO) -diff --git a/mx.h b/mutt-1.6.0/mx.h ---- a/mx.h -+++ b/mx.h -@@ -60,6 +60,7 @@ void mbox_reset_atime (CONTEXT *, struct - int mh_read_dir (CONTEXT *, const char *); - int mh_sync_mailbox (CONTEXT *, int *); - int mh_check_mailbox (CONTEXT *, int *); -+void mh_buffy_update (const char *, int *, int *, int *, time_t *); - int mh_check_empty (const char *); - - int maildir_read_dir (CONTEXT *); -diff --git a/pager.c b/mutt-1.6.0/pager.c ---- a/pager.c -+++ b/pager.c -@@ -29,6 +29,7 @@ - #include "pager.h" - #include "attach.h" - #include "mbyte.h" -+#include "sidebar.h" - - #include "mutt_crypt.h" - -@@ -1096,6 +1097,7 @@ static int format_line (struct line_t ** - wchar_t wc; - mbstate_t mbstate; - int wrap_cols = mutt_term_width ((flags & M_PAGER_NOWRAP) ? 0 : Wrap); -+ wrap_cols -= SidebarWidth; - - if (check_attachment_marker ((char *)buf) == 0) - wrap_cols = COLS; -@@ -1573,6 +1575,7 @@ mutt_pager (const char *banner, const ch - - int bodyoffset = 1; /* offset of first line of real text */ - int statusoffset = 0; /* offset for the status bar */ -+ int statuswidth; - int helpoffset = LINES - 2; /* offset for the help bar. */ - int bodylen = LINES - 2 - bodyoffset; /* length of displayable area */ - -@@ -1747,7 +1750,7 @@ mutt_pager (const char *banner, const ch - if ((redraw & REDRAW_BODY) || topline != oldtopline) - { - do { -- move (bodyoffset, 0); -+ move (bodyoffset, SidebarWidth); - curline = oldtopline = topline; - lines = 0; - force_redraw = 0; -@@ -1760,6 +1763,7 @@ mutt_pager (const char *banner, const ch - &QuoteList, &q_level, &force_redraw, &SearchRE) > 0) - lines++; - curline++; -+ move(lines + bodyoffset, SidebarWidth); - } - last_offset = lineInfo[curline].offset; - } while (force_redraw); -@@ -1772,6 +1776,7 @@ mutt_pager (const char *banner, const ch - addch ('~'); - addch ('\n'); - lines++; -+ move(lines + bodyoffset, SidebarWidth); - } - NORMAL_COLOR; - -@@ -1789,29 +1794,39 @@ mutt_pager (const char *banner, const ch - hfi.ctx = Context; - hfi.pager_progress = pager_progress_str; - -+ statuswidth = COLS - (option(OPTSTATUSONTOP) && PagerIndexLines > 0 ? SidebarWidth : 0); -+ - if (last_pos < sb.st_size - 1) - snprintf(pager_progress_str, sizeof(pager_progress_str), OFF_T_FMT "%%", (100 * last_offset / sb.st_size)); - else - strfcpy(pager_progress_str, (topline == 0) ? "all" : "end", sizeof(pager_progress_str)); - - /* print out the pager status bar */ -- move (statusoffset, 0); -+ move (statusoffset, SidebarWidth); - SETCOLOR (MT_COLOR_STATUS); -+ if(option(OPTSTATUSONTOP) && PagerIndexLines > 0) { -+ CLEARLINE_WIN (statusoffset); -+ } else { -+ CLEARLINE (statusoffset); -+ DrawFullLine = 1; /* for mutt_make_string_info */ -+ } - - if (IsHeader (extra) || IsMsgAttach (extra)) - { -- size_t l1 = COLS * MB_LEN_MAX; -+ size_t l1 = statuswidth * MB_LEN_MAX; - size_t l2 = sizeof (buffer); - hfi.hdr = (IsHeader (extra)) ? extra->hdr : extra->bdy->hdr; - mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT); -- mutt_paddstr (COLS, buffer); -+ mutt_paddstr (statuswidth, buffer); - } - else - { - char bn[STRING]; - snprintf (bn, sizeof (bn), "%s (%s)", banner, pager_progress_str); -- mutt_paddstr (COLS, bn); -+ mutt_paddstr (statuswidth, bn); - } -+ if(!option(OPTSTATUSONTOP) || PagerIndexLines == 0) -+ DrawFullLine = 0; /* reset */ - NORMAL_COLOR; - if (option(OPTTSENABLED) && TSSupported) - { -@@ -1827,16 +1842,22 @@ mutt_pager (const char *banner, const ch - /* redraw the pager_index indicator, because the - * flags for this message might have changed. */ - menu_redraw_current (index); -+ draw_sidebar(MENU_PAGER); - - /* print out the index status bar */ - menu_status_line (buffer, sizeof (buffer), index, NONULL(Status)); - -- move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), 0); -+ move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), -+ (option(OPTSTATUSONTOP) ? 0: SidebarWidth)); - SETCOLOR (MT_COLOR_STATUS); -- mutt_paddstr (COLS, buffer); -+ mutt_paddstr (COLS - (option(OPTSTATUSONTOP) ? 0 : SidebarWidth), buffer); - NORMAL_COLOR; - } - -+ /* if we're not using the index, update every time */ -+ if ( index == 0 ) -+ draw_sidebar(MENU_PAGER); -+ - redraw = 0; - - if (option(OPTBRAILLEFRIENDLY)) { -@@ -2777,6 +2798,13 @@ search_next: - mutt_what_key (); - break; - -+ case OP_SIDEBAR_SCROLL_UP: -+ case OP_SIDEBAR_SCROLL_DOWN: -+ case OP_SIDEBAR_NEXT: -+ case OP_SIDEBAR_PREV: -+ scroll_sidebar(ch, MENU_PAGER); -+ break; -+ - default: - ch = -1; - break; -diff --git a/pattern.c b/mutt-1.6.0/pattern.c ---- a/pattern.c -+++ b/pattern.c -@@ -154,6 +154,10 @@ msg_search (CONTEXT *ctx, pattern_t* pat - HEADER *h = ctx->hdrs[msgno]; - char *buf; - size_t blen; -+#ifdef HAVE_FMEMOPEN -+ char *temp; -+ size_t tempsize; -+#endif - - if ((msg = mx_open_message (ctx, msgno)) != NULL) - { -@@ -163,12 +167,20 @@ msg_search (CONTEXT *ctx, pattern_t* pat - memset (&s, 0, sizeof (s)); - s.fpin = msg->fp; - s.flags = M_CHARCONV; -+#ifdef HAVE_FMEMOPEN -+ if((s.fpout = open_memstream(&temp, &tempsize)) == NULL) -+ { -+ mutt_perror ("Error opening memstream"); -+ return (0); -+ } -+#else - mutt_mktemp (tempfile, sizeof (tempfile)); - if ((s.fpout = safe_fopen (tempfile, "w+")) == NULL) - { - mutt_perror (tempfile); - return (0); - } -+#endif - - if (pat->op != M_BODY) - mutt_copy_header (msg->fp, h, s.fpout, CH_FROM | CH_DECODE, NULL); -@@ -184,7 +196,11 @@ msg_search (CONTEXT *ctx, pattern_t* pat - if (s.fpout) - { - safe_fclose (&s.fpout); -+#ifdef HAVE_FMEMOPEN -+ FREE(&temp); -+#else - unlink (tempfile); -+#endif - } - return (0); - } -@@ -193,11 +209,28 @@ msg_search (CONTEXT *ctx, pattern_t* pat - mutt_body_handler (h->content, &s); - } - -+#ifdef HAVE_FMEMOPEN -+ fclose(s.fpout); -+ lng = tempsize; -+ -+ if(tempsize) { -+ if ((fp = fmemopen(temp, tempsize, "r")) == NULL) { -+ mutt_perror ("Error re-opening memstream"); -+ return (0); -+ } -+ } else { /* fmemopen cannot handle empty buffers */ -+ if ((fp = safe_fopen ("/dev/null", "r")) == NULL) { -+ mutt_perror ("Error opening /dev/null"); -+ return (0); -+ } -+ } -+#else - fp = s.fpout; - fflush (fp); - fseek (fp, 0, 0); - fstat (fileno (fp), &st); - lng = (long) st.st_size; -+#endif - } - else - { -@@ -244,7 +277,12 @@ msg_search (CONTEXT *ctx, pattern_t* pat - if (option (OPTTHOROUGHSRC)) - { - safe_fclose (&fp); -+#ifdef HAVE_FMEMOPEN -+ if(tempsize) -+ FREE (&temp); -+#else - unlink (tempfile); -+#endif - } - } - -diff --git a/protos.h b/mutt-1.6.0/protos.h ---- a/protos.h -+++ b/protos.h -@@ -36,6 +36,13 @@ struct hdr_format_info - const char *pager_progress; - }; - -+struct sidebar_entry { -+ char box[SHORT_STRING]; -+ unsigned int size; -+ unsigned int new; -+ unsigned int flagged; -+}; -+ - void mutt_make_string_info (char *, size_t, const char *, struct hdr_format_info *, format_flag); - - int mutt_extract_token (BUFFER *, BUFFER *, int); -diff --git a/sidebar.c b/mutt-1.6.0/sidebar.c ---- a/sidebar.c -+++ b/sidebar.c -@@ -0,0 +1,410 @@ -+/* -+ * Copyright (C) ????-2004 Justin Hibbits -+ * Copyright (C) 2004 Thomer M. Gil -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ */ -+ -+ -+#if HAVE_CONFIG_H -+# include "config.h" -+#endif -+ -+#include "mutt.h" -+#include "mutt_menu.h" -+#include "mutt_curses.h" -+#include "sidebar.h" -+#include "buffy.h" -+#include -+#include "keymap.h" -+#include -+ -+/*BUFFY *CurBuffy = 0;*/ -+static BUFFY *TopBuffy = 0; -+static BUFFY *BottomBuffy = 0; -+static int known_lines = 0; -+ -+void calc_boundaries() { -+ -+ BUFFY *tmp = Incoming; -+ -+ int count = LINES - 2 - (option(OPTHELP) ? 1 : 0); -+ -+ if ( known_lines != LINES ) { -+ TopBuffy = BottomBuffy = 0; -+ known_lines = LINES; -+ } -+ for ( ; tmp->next != 0; tmp = tmp->next ) -+ tmp->next->prev = tmp; -+ -+ if ( TopBuffy == 0 && BottomBuffy == 0 ) -+ TopBuffy = Incoming; -+ if ( BottomBuffy == 0 ) { -+ BottomBuffy = TopBuffy; -+ while ( --count && BottomBuffy->next ) -+ BottomBuffy = BottomBuffy->next; -+ } -+ else if ( TopBuffy == CurBuffy->next ) { -+ BottomBuffy = CurBuffy; -+ tmp = BottomBuffy; -+ while ( --count && tmp->prev) -+ tmp = tmp->prev; -+ TopBuffy = tmp; -+ } -+ else if ( BottomBuffy == CurBuffy->prev ) { -+ TopBuffy = CurBuffy; -+ tmp = TopBuffy; -+ while ( --count && tmp->next ) -+ tmp = tmp->next; -+ BottomBuffy = tmp; -+ } -+} -+ -+static const char * -+sidebar_format_str (char *dest, -+ size_t destlen, -+ size_t col, -+ char op, -+ const char *src, -+ const char *prefix, -+ const char *ifstring, -+ const char *elsestring, -+ unsigned long data, -+ format_flag flags) -+{ -+/* casting from unsigned long - srsly?! */ -+struct sidebar_entry *sbe = (struct sidebar_entry *) data; -+unsigned int optional; -+char fmt[SHORT_STRING], buf[SHORT_STRING]; -+ -+optional = flags & M_FORMAT_OPTIONAL; -+ -+switch(op) { -+ case 'F': -+ if(!optional) { -+ snprintf (fmt, sizeof (fmt), "%%%sd", prefix); -+ snprintf (dest, destlen, fmt, sbe->flagged); -+ } else if(sbe->flagged == 0) { -+ optional = 0; -+ } -+ break; -+ -+ case '!': -+ if(sbe->flagged == 0) -+ mutt_format_s(dest, destlen, prefix, ""); -+ if(sbe->flagged == 1) -+ mutt_format_s(dest, destlen, prefix, "!"); -+ if(sbe->flagged == 2) -+ mutt_format_s(dest, destlen, prefix, "!!"); -+ if(sbe->flagged > 2) { -+ snprintf (buf, sizeof (buf), "%d!", sbe->flagged); -+ mutt_format_s(dest, destlen, prefix, buf); -+ } -+ break; -+ -+ case 'S': -+ if(!optional) { -+ snprintf (fmt, sizeof (fmt), "%%%sd", prefix); -+ snprintf (dest, destlen, fmt, sbe->size); -+ } else if (sbe->size == 0) { -+ optional = 0; -+ } -+ break; -+ -+ case 'N': -+ if(!optional) { -+ snprintf (fmt, sizeof (fmt), "%%%sd", prefix); -+ snprintf (dest, destlen, fmt, sbe->new); -+ } else if(sbe->new == 0) { -+ optional = 0; -+ } -+ break; -+ -+ case 'B': -+ mutt_format_s(dest, destlen, prefix, sbe->box); -+ break; -+ } -+ -+ if(optional) -+ mutt_FormatString (dest, destlen, col, ifstring, sidebar_format_str, (unsigned long) sbe, flags); -+ else if (flags & M_FORMAT_OPTIONAL) -+ mutt_FormatString (dest, destlen, col, elsestring, sidebar_format_str, (unsigned long) sbe, flags); -+ -+ return (src); -+} -+ -+char *make_sidebar_entry(char *box, unsigned int size, unsigned int new, unsigned int flagged) { -+ static char *entry = 0; -+ struct sidebar_entry sbe; -+ int SBvisual; -+ -+ SBvisual = SidebarWidth - strlen(SidebarDelim); -+ if (SBvisual < 1) -+ return NULL; -+ -+ sbe.new = new; -+ sbe.flagged = flagged; -+ sbe.size = size; -+ strncpy(sbe.box, box, 31); -+ -+ safe_realloc(&entry, SBvisual + 2); -+ entry[SBvisual + 1] = '\0'; -+ -+ mutt_FormatString (entry, SBvisual+1, 0, SidebarFormat, sidebar_format_str, (unsigned long) &sbe, 0); -+ -+ return entry; -+} -+ -+void set_curbuffy(char buf[LONG_STRING]) -+{ -+ BUFFY* tmp = CurBuffy = Incoming; -+ -+ if (!Incoming) -+ return; -+ -+ while(1) { -+ if(!strcmp(tmp->path, buf) || !strcmp(tmp->realpath, buf)) { -+ CurBuffy = tmp; -+ break; -+ } -+ -+ if(tmp->next) -+ tmp = tmp->next; -+ else -+ break; -+ } -+} -+ -+int draw_sidebar(int menu) { -+ -+ BUFFY *tmp; -+#ifndef USE_SLANG_CURSES -+ attr_t attrs; -+#endif -+ short delim_len = strlen(SidebarDelim); -+ short color_pair; -+ -+ static bool initialized = false; -+ static int prev_show_value; -+ static short saveSidebarWidth; -+ int lines = 0; -+ int SidebarHeight; -+ -+ if(option(OPTSTATUSONTOP) || option(OPTHELP)) -+ lines++; /* either one will occupy the first line */ -+ -+ /* initialize first time */ -+ if(!initialized) { -+ prev_show_value = option(OPTSIDEBAR); -+ saveSidebarWidth = SidebarWidth; -+ if(!option(OPTSIDEBAR)) SidebarWidth = 0; -+ initialized = true; -+ } -+ -+ /* save or restore the value SidebarWidth */ -+ if(prev_show_value != option(OPTSIDEBAR)) { -+ if(prev_show_value && !option(OPTSIDEBAR)) { -+ saveSidebarWidth = SidebarWidth; -+ SidebarWidth = 0; -+ } else if(!prev_show_value && option(OPTSIDEBAR)) { -+ mutt_buffy_check(1); /* we probably have bad or no numbers */ -+ SidebarWidth = saveSidebarWidth; -+ } -+ prev_show_value = option(OPTSIDEBAR); -+ } -+ -+ -+/* if ( SidebarWidth == 0 ) return 0; */ -+ if (SidebarWidth > 0 && option (OPTSIDEBAR) -+ && delim_len >= SidebarWidth) { -+ unset_option (OPTSIDEBAR); -+ /* saveSidebarWidth = SidebarWidth; */ -+ if (saveSidebarWidth > delim_len) { -+ SidebarWidth = saveSidebarWidth; -+ mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar.")); -+ sleep (2); -+ } else { -+ SidebarWidth = 0; -+ mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar. Please set your sidebar_width to a sane value.")); -+ sleep (4); /* the advise to set a sane value should be seen long enough */ -+ } -+ saveSidebarWidth = 0; -+ return (0); -+ } -+ -+ if ( SidebarWidth == 0 || !option(OPTSIDEBAR)) { -+ if (SidebarWidth > 0) { -+ saveSidebarWidth = SidebarWidth; -+ SidebarWidth = 0; -+ } -+ unset_option(OPTSIDEBAR); -+ return 0; -+ } -+ -+ /* get attributes for divider */ -+ SETCOLOR(MT_COLOR_STATUS); -+#ifndef USE_SLANG_CURSES -+ attr_get(&attrs, &color_pair, 0); -+#else -+ color_pair = attr_get(); -+#endif -+ SETCOLOR(MT_COLOR_NORMAL); -+ -+ /* draw the divider */ -+ -+ SidebarHeight = LINES - 1; -+ if(option(OPTHELP) || !option(OPTSTATUSONTOP)) -+ SidebarHeight--; -+ -+ for ( ; lines < SidebarHeight; lines++ ) { -+ move(lines, SidebarWidth - delim_len); -+ addstr(NONULL(SidebarDelim)); -+#ifndef USE_SLANG_CURSES -+ mvchgat(lines, SidebarWidth - delim_len, delim_len, 0, color_pair, NULL); -+#endif -+ } -+ -+ if ( Incoming == 0 ) return 0; -+ lines = 0; -+ if(option(OPTSTATUSONTOP) || option(OPTHELP)) -+ lines++; /* either one will occupy the first line */ -+ -+ if ( known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0 ) -+ calc_boundaries(menu); -+ if ( CurBuffy == 0 ) CurBuffy = Incoming; -+ -+ tmp = TopBuffy; -+ -+ SETCOLOR(MT_COLOR_NORMAL); -+ -+ for ( ; tmp && lines < SidebarHeight; tmp = tmp->next ) { -+ if ( tmp == CurBuffy ) -+ SETCOLOR(MT_COLOR_INDICATOR); -+ else if ( tmp->msg_unread > 0 ) -+ SETCOLOR(MT_COLOR_NEW); -+ else if ( tmp->msg_flagged > 0 ) -+ SETCOLOR(MT_COLOR_FLAGGED); -+ else -+ SETCOLOR(MT_COLOR_NORMAL); -+ -+ move( lines, 0 ); -+ if ( Context && Context->path && -+ (!strcmp(tmp->path, Context->path)|| -+ !strcmp(tmp->realpath, Context->path)) ) { -+ tmp->msg_unread = Context->unread; -+ tmp->msgcount = Context->msgcount; -+ tmp->msg_flagged = Context->flagged; -+ } -+ /* check whether Maildir is a prefix of the current folder's path */ -+ short maildir_is_prefix = 0; -+ if ( (strlen(tmp->path) > strlen(Maildir)) && -+ (strncmp(Maildir, tmp->path, strlen(Maildir)) == 0) ) -+ maildir_is_prefix = 1; -+ /* calculate depth of current folder and generate its display name with indented spaces */ -+ int sidebar_folder_depth = 0; -+ char *sidebar_folder_name; -+ sidebar_folder_name = option(OPTSIDEBARSHORTPATH) ? mutt_basename(tmp->path) : tmp->path + maildir_is_prefix*(strlen(Maildir) + 1); -+ if ( maildir_is_prefix && option(OPTSIDEBARFOLDERINDENT) ) { -+ char *tmp_folder_name; -+ int i; -+ tmp_folder_name = tmp->path + strlen(Maildir) + 1; -+ for (i = 0; i < strlen(tmp->path) - strlen(Maildir); i++) { -+ if (tmp_folder_name[i] == '/' || tmp_folder_name[i] == '.') sidebar_folder_depth++; -+ } -+ if (sidebar_folder_depth > 0) { -+ if (option(OPTSIDEBARSHORTPATH)) { -+ tmp_folder_name = strrchr(tmp->path, '.'); -+ if (tmp_folder_name == NULL) -+ tmp_folder_name = mutt_basename(tmp->path); -+ else -+ tmp_folder_name++; -+ } -+ else -+ tmp_folder_name = tmp->path + strlen(Maildir) + 1; -+ sidebar_folder_name = malloc(strlen(tmp_folder_name) + sidebar_folder_depth*strlen(NONULL(SidebarIndentStr)) + 1); -+ sidebar_folder_name[0]=0; -+ for (i=0; i < sidebar_folder_depth; i++) -+ strncat(sidebar_folder_name, NONULL(SidebarIndentStr), strlen(NONULL(SidebarIndentStr))); -+ strncat(sidebar_folder_name, tmp_folder_name, strlen(tmp_folder_name)); -+ } -+ } -+ printw( "%.*s", SidebarWidth - delim_len + 1, -+ make_sidebar_entry(sidebar_folder_name, tmp->msgcount, -+ tmp->msg_unread, tmp->msg_flagged)); -+ if (sidebar_folder_depth > 0) -+ free(sidebar_folder_name); -+ lines++; -+ } -+ SETCOLOR(MT_COLOR_NORMAL); -+ for ( ; lines < SidebarHeight; lines++ ) { -+ int i = 0; -+ move( lines, 0 ); -+ for ( ; i < SidebarWidth - delim_len; i++ ) -+ addch(' '); -+ } -+ return 0; -+} -+ -+ -+void set_buffystats(CONTEXT* Context) -+{ -+ BUFFY *tmp = Incoming; -+ while(tmp) { -+ if(Context && (!strcmp(tmp->path, Context->path) || -+ !strcmp(tmp->realpath, Context->path))) { -+ tmp->msg_unread = Context->unread; -+ tmp->msgcount = Context->msgcount; -+ tmp->msg_flagged = Context->flagged; -+ break; -+ } -+ tmp = tmp->next; -+ } -+} -+ -+void scroll_sidebar(int op, int menu) -+{ -+ if(!SidebarWidth) return; -+ if(!CurBuffy) return; -+ -+ switch (op) { -+ case OP_SIDEBAR_NEXT: -+ if ( CurBuffy->next == NULL ) return; -+ CurBuffy = CurBuffy->next; -+ break; -+ case OP_SIDEBAR_PREV: -+ if ( CurBuffy->prev == NULL ) return; -+ CurBuffy = CurBuffy->prev; -+ break; -+ case OP_SIDEBAR_SCROLL_UP: -+ CurBuffy = TopBuffy; -+ if ( CurBuffy != Incoming ) { -+ calc_boundaries(menu); -+ CurBuffy = CurBuffy->prev; -+ } -+ break; -+ case OP_SIDEBAR_SCROLL_DOWN: -+ CurBuffy = BottomBuffy; -+ if ( CurBuffy->next ) { -+ calc_boundaries(menu); -+ CurBuffy = CurBuffy->next; -+ } -+ break; -+ default: -+ return; -+ } -+ calc_boundaries(menu); -+ draw_sidebar(menu); -+} -+ -diff --git a/sidebar.h b/mutt-1.6.0/sidebar.h ---- a/sidebar.h -+++ b/sidebar.h -@@ -0,0 +1,36 @@ -+/* -+ * Copyright (C) ????-2004 Justin Hibbits -+ * Copyright (C) 2004 Thomer M. Gil -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ */ -+ -+#ifndef SIDEBAR_H -+#define SIDEBAR_H -+ -+struct MBOX_LIST { -+ char *path; -+ int msgcount; -+ int new; -+} MBLIST; -+ -+/* parameter is whether or not to go to the status line */ -+/* used for omitting the last | that covers up the status bar in the index */ -+int draw_sidebar(int); -+void scroll_sidebar(int, int); -+void set_curbuffy(char*); -+void set_buffystats(CONTEXT*); -+ -+#endif /* SIDEBAR_H */ diff --git a/patch-1.6.1.rr.compressed.bz2 b/patch-1.6.1.rr.compressed.bz2 new file mode 100644 index 0000000..b358ada --- /dev/null +++ b/patch-1.6.1.rr.compressed.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7b32cd1c47eaa6e8cb75bb5a04010e8fde46ae293a040c4ab6418950bc9e9a1 +size 9764 diff --git a/widechar.sidebar.dif b/widechar.sidebar.dif index a64fe93..3d7c3ff 100644 --- a/widechar.sidebar.dif +++ b/widechar.sidebar.dif @@ -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 @@ index 8c3b699..6f8d77c 100644 } 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 @@ index 8c3b699..6f8d77c 100644 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 @@ index 8c3b699..6f8d77c 100644 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 @@ index 8c3b699..6f8d77c 100644 } 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 @@ index 8c3b699..6f8d77c 100644 { 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 - From db807c327e09ad536d807e96792bcba64c7eb87f Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 12 May 2016 14:16:52 +0000 Subject: [PATCH 2/3] . OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=121 --- mutt-1.6.1-patches.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mutt-1.6.1-patches.tar.bz2 b/mutt-1.6.1-patches.tar.bz2 index ffe792f..193d9cb 100644 --- a/mutt-1.6.1-patches.tar.bz2 +++ b/mutt-1.6.1-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:859441143833d0f64f59eccec64091a5eb9913282b20ac7fc9490917f6fbd3a5 -size 235 +oid sha256:3e0e55cb6809db0943ef6d9c0add765eef67d08c66891d00423b033f607dd0e7 +size 251 From 8636cf28365c42f9c3da33e6933f01dc9024c301 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 13 May 2016 09:10:10 +0000 Subject: [PATCH 3/3] . OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=122 --- mutt-1.6.0.tar.gz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 mutt-1.6.0.tar.gz diff --git a/mutt-1.6.0.tar.gz b/mutt-1.6.0.tar.gz deleted file mode 100644 index 34eaaf9..0000000 --- a/mutt-1.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29afb6238ab7a540c0e3a78ce25c970f975ab6c0f0bc9f919993aab772136c19 -size 3954591