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

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=129
This commit is contained in:
Dr. Werner Fink 2016-05-31 12:38:26 +00:00 committed by Git OBS Bridge
parent be21305d3c
commit f906f9ff92
14 changed files with 161 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
COLS-workaround.dif
View File

@ -1,13 +1,17 @@
Current neomutt sidebar patch does change COLS which does Current neomutt sidebar patch does change COLS which does
not work with threadsafe ncurses6 not work with threadsafe ncurses6. Beside this: do not
bother other non-sidebar users as well make sidebar delimeter
look well.
--- ---
buffy.c | 6 +++---
configure.ac | 8 ++++++++ configure.ac | 8 ++++++++
1 file changed, 8 insertions(+) sidebar.c | 9 ++++++++-
3 files changed, 19 insertions(+), 4 deletions(-)
--- configure.ac --- configure.ac
+++ configure.ac 2016-05-23 13:43:40.810914709 +0000 +++ configure.ac 2016-05-31 11:15:58.082946555 +0000
@@ -305,6 +305,14 @@ main () @@ -313,6 +313,14 @@ main ()
if test x$mutt_cv_curses != x/usr; then if test x$mutt_cv_curses != x/usr; then
LDFLAGS="$LDFLAGS -L${mutt_cv_curses}/lib" LDFLAGS="$LDFLAGS -L${mutt_cv_curses}/lib"
CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include" CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include"
@ -22,3 +26,49 @@ not work with threadsafe ncurses6
fi]) fi])
AC_CHECK_FUNC(initscr,,[ AC_CHECK_FUNC(initscr,,[
--- buffy.c
+++ buffy.c 2016-05-31 12:24:04.232839516 +0000
@@ -756,10 +756,10 @@ int mutt_buffy_check (int force)
buffy_check(tmp, &contex_sb);
sb_set_update_time();
}
-#else
- for (tmp = Incoming; tmp; tmp = tmp->next)
- buffy_check(tmp, &contex_sb);
+ else if (!option (OPTSIDEBAR))
#endif
+ for (tmp = Incoming; tmp; tmp = tmp->next)
+ buffy_check(tmp, &contex_sb);
#ifdef USE_NOTMUCH
for (tmp = VirtIncoming; tmp; tmp = tmp->next)
--- sidebar.c
+++ sidebar.c 2016-05-31 11:52:28.873409292 +0000
@@ -643,6 +643,7 @@ draw_divider (int first_row, int num_row
{
/* Calculate the width of the delimiter in screen cells */
int delim_len = mutt_strwidth (SidebarDividerChar);
+ int altchar = 0;
if (delim_len < 1)
return delim_len;
@@ -653,12 +654,18 @@ draw_divider (int first_row, int num_row
if (delim_len > SidebarWidth)
return -1;
+ if (delim_len == 1 && strcmp(SidebarDividerChar, "|") == 0)
+ altchar++;
+
SETCOLOR(MT_COLOR_DIVIDER);
int i;
for (i = 0; i < num_rows; i++) {
move (first_row + i, SidebarWidth - delim_len);
- addstr (NONULL(SidebarDividerChar));
+ if (altchar)
+ addch (ACS_VLINE);
+ else
+ addstr (NONULL(SidebarDividerChar));
}
return delim_len;

28
aw.listreply.diff
View File

@ -8,15 +8,15 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
4 files changed, 27 insertions(+) 4 files changed, 27 insertions(+)
--- PATCHES --- PATCHES
+++ PATCHES 2015-01-26 15:34:40.133518493 +0000 +++ PATCHES 2016-05-31 11:06:13.182101809 +0000
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
+patch-1.5.9.aw.listreply.1 +patch-1.5.9.aw.listreply.1
rr.compressed patch-quasi-delete-neo-20160530
patch-quasi-delete-neo-20160502 patch-progress-neo-20160530
patch-progress-neo-20160502 patch-status-color-neo-20160530
--- init.h --- init.h
+++ init.h 2012-06-21 09:48:22.000000000 +0000 +++ init.h 2016-05-31 11:04:49.979688830 +0000
@@ -1396,6 +1396,13 @@ struct option_t MuttVars[] = { @@ -1492,6 +1492,13 @@ struct option_t MuttVars[] = {
** The locale used by \fCstrftime(3)\fP to format dates. Legal values are ** 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. ** the strings your system accepts for the locale environment variable \fC$$$LC_TIME\fP.
*/ */
@ -31,18 +31,18 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
/* /*
** .pp ** .pp
--- mutt.h --- mutt.h
+++ mutt.h 2012-06-21 09:48:22.000000000 +0000 +++ mutt.h 2016-05-31 11:07:07.177071921 +0000
@@ -309,6 +309,7 @@ enum @@ -313,6 +313,7 @@ enum
#endif #endif
OPT_SUBJECT, OPT_SUBJECT,
OPT_VERIFYSIG, /* verify PGP signatures */ OPT_VERIFYSIG, /* verify PGP signatures */
+ OPT_LISTREPLY, + OPT_LISTREPLY,
#ifdef USE_NNTP
/* THIS MUST BE THE LAST VALUE. */ OPT_TOMODERATED,
OPT_MAX OPT_CATCHUP,
--- send.c --- send.c
+++ send.c 2012-06-21 09:48:22.000000000 +0000 +++ send.c 2016-05-31 11:04:49.983688753 +0000
@@ -455,6 +455,7 @@ static int include_reply (CONTEXT *ctx, @@ -516,6 +516,7 @@ static int include_reply (CONTEXT *ctx,
static int default_to (ADDRESS **to, ENVELOPE *env, int flags, int hmfupto) static int default_to (ADDRESS **to, ENVELOPE *env, int flags, int hmfupto)
{ {
char prompt[STRING]; char prompt[STRING];
@ -50,7 +50,7 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
if (flags && env->mail_followup_to && hmfupto == M_YES) if (flags && env->mail_followup_to && hmfupto == M_YES)
{ {
@@ -468,6 +469,23 @@ static int default_to (ADDRESS **to, ENV @@ -529,6 +530,23 @@ static int default_to (ADDRESS **to, ENV
if (flags & SENDLISTREPLY) if (flags & SENDLISTREPLY)
return 0; return 0;

8
bug-676388-largefile.patch
View File

@ -5,7 +5,7 @@
3 files changed, 5 insertions(+), 5 deletions(-) 3 files changed, 5 insertions(+), 5 deletions(-)
--- crypt-gpgme.c --- crypt-gpgme.c
+++ crypt-gpgme.c 2011-03-02 17:18:01.000000000 +0000 +++ crypt-gpgme.c 2016-05-31 11:14:02.965141918 +0000
@@ -496,7 +496,7 @@ static gpgme_data_t body_to_data_object @@ -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 /* 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 to LENGTH bytes starting at OFFSET bytes from the beginning of the
@ -16,7 +16,7 @@
int err = 0; int err = 0;
gpgme_data_t data; gpgme_data_t data;
--- mh.c --- mh.c
+++ mh.c 2011-03-02 17:48:36.000000000 +0000 +++ mh.c 2016-05-31 11:14:02.965141918 +0000
@@ -1620,9 +1620,9 @@ static int mh_rewrite_message (CONTEXT * @@ -1620,9 +1620,9 @@ static int mh_rewrite_message (CONTEXT *
char newpath[_POSIX_PATH_MAX]; char newpath[_POSIX_PATH_MAX];
char partpath[_POSIX_PATH_MAX]; char partpath[_POSIX_PATH_MAX];
@ -31,8 +31,8 @@
if ((dest = mx_open_new_message (ctx, h, 0)) == NULL) if ((dest = mx_open_new_message (ctx, h, 0)) == NULL)
return -1; return -1;
--- mutt.h --- mutt.h
+++ mutt.h 2011-03-02 16:52:03.000000000 +0000 +++ mutt.h 2016-05-31 11:14:02.965141918 +0000
@@ -681,7 +681,7 @@ typedef struct body @@ -729,7 +729,7 @@ typedef struct body
PARAMETER *parameter; /* parameters of the content-type */ PARAMETER *parameter; /* parameters of the content-type */
char *description; /* content-description */ char *description; /* content-description */
char *form_name; /* Content-Disposition form-data name param */ char *form_name; /* Content-Disposition form-data name param */

4
mutt-1.5.15-wrapcolumn.diff
View File

@ -5,8 +5,8 @@ Index: init.h
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
--- init.h --- init.h
+++ init.h 2016-05-12 12:31:41.287171877 +0000 +++ init.h 2016-05-31 11:13:06.686215217 +0000
@@ -3783,7 +3783,8 @@ struct option_t MuttVars[] = { @@ -4020,7 +4020,8 @@ struct option_t MuttVars[] = {
** When \fIset\fP, mutt will weed headers when displaying, forwarding, ** When \fIset\fP, mutt will weed headers when displaying, forwarding,
** printing, or replying to messages. ** printing, or replying to messages.
*/ */

12
mutt-1.5.20-sendgroupreplyto.diff
View File

@ -5,8 +5,8 @@
3 files changed, 16 insertions(+) 3 files changed, 16 insertions(+)
--- init.h --- init.h
+++ init.h 2009-06-25 22:00:00.000000000 +0000 +++ init.h 2016-05-31 11:12:26.410983323 +0000
@@ -2645,6 +2645,13 @@ struct option_t MuttVars[] = { @@ -2860,6 +2860,13 @@ struct option_t MuttVars[] = {
** .pp ** .pp
** Also see the $$force_name variable. ** Also see the $$force_name variable.
*/ */
@ -21,8 +21,8 @@
/* /*
** .pp ** .pp
--- mutt.h --- mutt.h
+++ mutt.h 2009-06-25 22:00:00.000000000 +0000 +++ mutt.h 2016-05-31 11:12:26.410983323 +0000
@@ -457,6 +457,7 @@ enum @@ -480,6 +480,7 @@ enum
OPTSAVEADDRESS, OPTSAVEADDRESS,
OPTSAVEEMPTY, OPTSAVEEMPTY,
OPTSAVENAME, OPTSAVENAME,
@ -31,8 +31,8 @@
#ifdef USE_SIDEBAR #ifdef USE_SIDEBAR
OPTSIDEBAR, OPTSIDEBAR,
--- send.c --- send.c
+++ send.c 2009-06-26 10:24:12.832816460 +0000 +++ send.c 2016-05-31 11:12:26.414983246 +0000
@@ -563,8 +563,16 @@ int mutt_fetch_recips (ENVELOPE *out, EN @@ -624,8 +624,16 @@ int mutt_fetch_recips (ENVELOPE *out, EN
if ((flags & SENDGROUPREPLY) && (!in->mail_followup_to || hmfupto != M_YES)) if ((flags & SENDGROUPREPLY) && (!in->mail_followup_to || hmfupto != M_YES))
{ {
/* if(!mutt_addr_is_user(in->to)) */ /* if(!mutt_addr_is_user(in->to)) */

4
mutt-1.5.21-mailcap.diff
View File

@ -8,8 +8,8 @@ Index: mutt-1.5.21/init.c
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
--- init.c --- init.c
+++ init.c 2016-05-12 13:43:29.484251262 +0000 +++ init.c 2016-05-31 11:15:25.291571898 +0000
@@ -3300,8 +3300,8 @@ void mutt_init (int skip_sys_rc, LIST *c @@ -3322,8 +3322,8 @@ void mutt_init (int skip_sys_rc, LIST *c
MailcapPath = safe_strdup (p); MailcapPath = safe_strdup (p);
else else
{ {

4
mutt-1.5.21-tinfo.dif
View File

@ -3,8 +3,8 @@
1 file changed, 7 insertions(+), 2 deletions(-) 1 file changed, 7 insertions(+), 2 deletions(-)
--- configure.ac --- configure.ac
+++ configure.ac 2011-11-22 12:48:52.319147493 +0000 +++ configure.ac 2016-05-31 11:14:28.772649746 +0000
@@ -313,9 +313,14 @@ main () @@ -321,9 +321,14 @@ main ()
do do
AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break]) AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break])
done done

30
mutt-1.6.1-opennfs.dif
View File

@ -10,8 +10,8 @@
8 files changed, 144 insertions(+), 9 deletions(-) 8 files changed, 144 insertions(+), 9 deletions(-)
--- Makefile.am --- Makefile.am
+++ Makefile.am 2016-04-11 11:24:25.813117416 +0000 +++ Makefile.am 2016-05-31 11:13:39.369591907 +0000
@@ -29,7 +29,7 @@ mutt_SOURCES = \ @@ -32,7 +32,7 @@ mutt_SOURCES = \
edit.c enter.c flags.c init.c filter.c from.c \ edit.c enter.c flags.c init.c filter.c from.c \
getdomain.c group.c \ getdomain.c group.c \
handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \ handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \
@ -20,7 +20,7 @@
postpone.c query.c recvattach.c recvcmd.c \ postpone.c query.c recvattach.c recvcmd.c \
rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
score.c send.c sendlib.c signal.c sort.c \ score.c send.c sendlib.c signal.c sort.c \
@@ -99,7 +99,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c @@ -107,7 +107,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c
mutt_dotlock_LDADD = $(LIBOBJS) mutt_dotlock_LDADD = $(LIBOBJS)
mutt_dotlock_DEPENDENCIES = $(LIBOBJS) mutt_dotlock_DEPENDENCIES = $(LIBOBJS)
@ -30,8 +30,8 @@
pgpring_DEPENDENCIES = $(LIBOBJS) $(INTLDEPS) pgpring_DEPENDENCIES = $(LIBOBJS) $(INTLDEPS)
--- Makefile.in --- Makefile.in
+++ Makefile.in 2016-04-11 11:23:21.414301183 +0000 +++ Makefile.in 2016-05-31 11:13:39.369591907 +0000
@@ -128,7 +128,7 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) ali @@ -125,7 +125,7 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) ali
hash.$(OBJEXT) hdrline.$(OBJEXT) headers.$(OBJEXT) \ hash.$(OBJEXT) hdrline.$(OBJEXT) headers.$(OBJEXT) \
help.$(OBJEXT) hook.$(OBJEXT) keymap.$(OBJEXT) main.$(OBJEXT) \ help.$(OBJEXT) hook.$(OBJEXT) keymap.$(OBJEXT) main.$(OBJEXT) \
mbox.$(OBJEXT) menu.$(OBJEXT) mh.$(OBJEXT) mx.$(OBJEXT) \ mbox.$(OBJEXT) menu.$(OBJEXT) mh.$(OBJEXT) mx.$(OBJEXT) \
@ -40,7 +40,7 @@
postpone.$(OBJEXT) query.$(OBJEXT) recvattach.$(OBJEXT) \ postpone.$(OBJEXT) query.$(OBJEXT) recvattach.$(OBJEXT) \
recvcmd.$(OBJEXT) rfc822.$(OBJEXT) rfc1524.$(OBJEXT) \ recvcmd.$(OBJEXT) rfc822.$(OBJEXT) rfc1524.$(OBJEXT) \
rfc2047.$(OBJEXT) rfc2231.$(OBJEXT) rfc3676.$(OBJEXT) \ rfc2047.$(OBJEXT) rfc2231.$(OBJEXT) rfc3676.$(OBJEXT) \
@@ -157,7 +157,7 @@ pgpewrap_LDADD = $(LDADD) @@ -154,7 +154,7 @@ pgpewrap_LDADD = $(LDADD)
pgpewrap_DEPENDENCIES = $(LIBOBJS) $(am__DEPENDENCIES_1) pgpewrap_DEPENDENCIES = $(LIBOBJS) $(am__DEPENDENCIES_1)
am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) \ am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) \
lib.$(OBJEXT) extlib.$(OBJEXT) sha1.$(OBJEXT) md5.$(OBJEXT) \ lib.$(OBJEXT) extlib.$(OBJEXT) sha1.$(OBJEXT) md5.$(OBJEXT) \
@ -49,7 +49,7 @@
pgpring_OBJECTS = $(am_pgpring_OBJECTS) pgpring_OBJECTS = $(am_pgpring_OBJECTS)
am_txt2c_OBJECTS = txt2c.$(OBJEXT) am_txt2c_OBJECTS = txt2c.$(OBJEXT)
txt2c_OBJECTS = $(am_txt2c_OBJECTS) txt2c_OBJECTS = $(am_txt2c_OBJECTS)
@@ -484,7 +484,7 @@ mutt_SOURCES = \ @@ -481,7 +481,7 @@ mutt_SOURCES = \
edit.c enter.c flags.c init.c filter.c from.c \ edit.c enter.c flags.c init.c filter.c from.c \
getdomain.c group.c \ getdomain.c group.c \
handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \ handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \
@ -59,7 +59,7 @@
rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
score.c send.c sendlib.c signal.c sort.c \ score.c send.c sendlib.c signal.c sort.c \
--- lib.c --- lib.c
+++ lib.c 2016-04-11 11:23:21.414301183 +0000 +++ lib.c 2016-05-31 11:13:39.369591907 +0000
@@ -50,6 +50,7 @@ @@ -50,6 +50,7 @@
#define EX_OK 0 #define EX_OK 0
#endif #endif
@ -89,7 +89,7 @@
if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 || if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 ||
compare_stat(&osb, &nsb) == -1) compare_stat(&osb, &nsb) == -1)
--- mbox.c --- mbox.c
+++ mbox.c 2016-04-11 11:23:21.414301183 +0000 +++ mbox.c 2016-05-31 11:13:39.369591907 +0000
@@ -785,7 +785,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. */ /* Create a temporary file to write the new version of the mailbox in. */
@ -100,7 +100,7 @@
{ {
if (-1 != i) if (-1 != i)
--- mh.c --- mh.c
+++ mh.c 2016-05-12 12:34:49.099410561 +0000 +++ mh.c 2016-05-31 11:13:39.373591832 +0000
@@ -353,7 +353,11 @@ static int mh_mkstemp (CONTEXT * dest, F @@ -353,7 +353,11 @@ static int mh_mkstemp (CONTEXT * dest, F
{ {
snprintf (path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%" PRIu64, snprintf (path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%" PRIu64,
@ -127,15 +127,15 @@
if (errno != EEXIST) if (errno != EEXIST)
{ {
--- mutt.h --- mutt.h
+++ mutt.h 2016-04-11 11:23:21.414301183 +0000 +++ mutt.h 2016-05-31 11:13:39.373591832 +0000
@@ -1029,4 +1029,5 @@ typedef struct @@ -1078,4 +1078,5 @@ typedef struct
#include "lib.h" #include "lib.h"
#include "globals.h" #include "globals.h"
+extern int opennfs(const char *, int, int); +extern int opennfs(const char *, int, int);
#endif /*MUTT_H*/ #endif /*MUTT_H*/
--- opennfs.c --- opennfs.c
+++ opennfs.c 2016-04-11 11:23:21.414301183 +0000 +++ opennfs.c 2016-05-31 11:13:39.373591832 +0000
@@ -0,0 +1,122 @@ @@ -0,0 +1,122 @@
+#include <errno.h> +#include <errno.h>
+#include <fcntl.h> +#include <fcntl.h>
@ -260,8 +260,8 @@
+ return open(path, flags, mode); + return open(path, flags, mode);
+} +}
--- sendlib.c --- sendlib.c
+++ sendlib.c 2016-04-11 11:23:21.414301183 +0000 +++ sendlib.c 2016-05-31 11:13:39.373591832 +0000
@@ -2217,7 +2217,7 @@ send_msg (const char *path, char **args, @@ -2260,7 +2260,7 @@ send_msg (const char *path, char **args,
if (SendmailWait >= 0 && tempfile && *tempfile) if (SendmailWait >= 0 && tempfile && *tempfile)
{ {
/* *tempfile will be opened as stdout */ /* *tempfile will be opened as stdout */

84
mutt-1.6.1.dif
View File

@ -9,8 +9,8 @@
7 files changed, 112 insertions(+), 30 deletions(-) 7 files changed, 112 insertions(+), 30 deletions(-)
--- configure.ac --- configure.ac
+++ configure.ac 2016-04-11 11:09:41.997377315 +0000 +++ configure.ac 2016-05-31 11:11:35.279958476 +0000
@@ -274,7 +274,7 @@ main () @@ -282,7 +282,7 @@ main ()
mutt_cv_slang=$withval mutt_cv_slang=$withval
if test -d $withval/include/slang; then if test -d $withval/include/slang; then
CPPFLAGS="$CPPFLAGS -I${withval}/include/slang" CPPFLAGS="$CPPFLAGS -I${withval}/include/slang"
@ -19,7 +19,7 @@
CPPFLAGS="$CPPFLAGS -I${withval}/include" CPPFLAGS="$CPPFLAGS -I${withval}/include"
fi fi
LDFLAGS="$LDFLAGS -L${withval}/lib" LDFLAGS="$LDFLAGS -L${withval}/lib"
@@ -704,8 +704,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with- @@ -721,8 +721,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with-
else else
if test "$with_ssl" != "yes" if test "$with_ssl" != "yes"
then then
@ -32,7 +32,7 @@
fi fi
saved_LIBS="$LIBS" saved_LIBS="$LIBS"
@@ -784,8 +788,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with @@ -801,8 +805,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with
if test "$with_sasl" != "yes" if test "$with_sasl" != "yes"
then then
@ -45,32 +45,8 @@
fi fi
saved_LIBS="$LIBS" 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
+++ doc/Makefile.in 2016-04-11 11:09:41.997377315 +0000 +++ doc/Makefile.in 2016-05-31 11:11:35.283958400 +0000
@@ -697,7 +697,7 @@ uninstall-local: @@ -697,7 +697,7 @@ uninstall-local:
check: check:
@ -80,8 +56,19 @@
LC_ALL=C w3m -dump 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' > $@ LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
--- doc/Muttrc.head
+++ doc/Muttrc.head 2016-05-31 11:11:35.283958400 +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 @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"
--- doc/Muttrc --- doc/Muttrc
+++ doc/Muttrc 2016-04-11 11:07:05.472260646 +0000 +++ doc/Muttrc 2016-05-31 11:11:35.283958400 +0000
@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\ @@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
"call urlview to extract URLs out of a message" "call urlview to extract URLs out of a message"
@ -271,19 +258,8 @@
# set write_inc=10 # set write_inc=10
# #
# Name: write_inc # 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 <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
+++ imap/auth.c 2016-04-11 11:09:41.997377315 +0000 +++ imap/auth.c 2016-05-31 11:11:35.283958400 +0000
@@ -72,6 +72,23 @@ int imap_authenticate (IMAP_DATA* idata) @@ -72,6 +72,23 @@ int imap_authenticate (IMAP_DATA* idata)
dprint (2, (debugfile, "imap_authenticate: Trying method %s\n", method)); dprint (2, (debugfile, "imap_authenticate: Trying method %s\n", method));
authenticator = imap_authenticators; authenticator = imap_authenticators;
@ -318,3 +294,27 @@
} }
FREE (&methods); FREE (&methods);
--- init.h
+++ init.h 2016-05-31 11:11:35.279958476 +0000
@@ -3569,6 +3569,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-05-31 11:11:35.279958476 +0000
@@ -1832,6 +1832,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! */

5
mutt.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue May 31 12:35:33 UTC 2016 - werner@suse.de
- Avoid sidebar patch from bother other users (boo#982129)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 20 15:14:52 UTC 2016 - werner@suse.de Fri May 20 15:14:52 UTC 2016 - werner@suse.de

7
mutt.spec
View File

@ -71,7 +71,8 @@ Requires: perl(Expect)
# NOTE: We don't want this dependency and desktop-data-SuSE is in all # NOTE: We don't want this dependency and desktop-data-SuSE is in all
# desktop selections. # desktop selections.
#Requires: desktop-data-SuSE #Requires: desktop-data-SuSE
%global neo 20160502 ####%global neo 20160502
%global neo 20160530
Version: 1.6.1 Version: 1.6.1
Release: 0 Release: 0
Summary: Mail Program Summary: Mail Program
@ -92,7 +93,6 @@ Source9: mutt.mailcap
Source10: neomutt-patches-%{neo}.tar.gz Source10: neomutt-patches-%{neo}.tar.gz
Patch: %name-%version.dif Patch: %name-%version.dif
# http://www.spinnaker.de/mutt/compressed/ # http://www.spinnaker.de/mutt/compressed/
Patch1: patch-1.6.1.rr.compressed.bz2
Patch2: %name-1.5.9i-pgpewrap.diff Patch2: %name-1.5.9i-pgpewrap.diff
Patch3: %name-1.5.20-sendgroupreplyto.diff Patch3: %name-1.5.20-sendgroupreplyto.diff
Patch4: %name-1.5.15-wrapcolumn.diff Patch4: %name-1.5.15-wrapcolumn.diff
@ -128,8 +128,7 @@ for p in ../%name-%version-patches/*; do
patch -s -p1 < $p patch -s -p1 < $p
done done
patch -s -p1 < ../neomutt-patches-%{neo}/neomutt-%{neo}.patch patch -s -p1 < ../neomutt-patches-%{neo}/neomutt-%{neo}.patch
%patch %patch -p0 -b .p0
%patch1 -p0 -b .compressed
%patch2 -p0 -b .pgpewrap %patch2 -p0 -b .pgpewrap
%patch3 -p0 -b .sendgroupreplyto %patch3 -p0 -b .sendgroupreplyto
%patch4 -p0 -b .wrapcolumn %patch4 -p0 -b .wrapcolumn

3
neomutt-patches-20160502.tar.gz
View File

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

3
neomutt-patches-20160530.tar.gz Normal file
View File

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

16
patch-1.5.24.vk.pgp_verbose_mime
View File

@ -6,15 +6,15 @@
4 files changed, 17 insertions(+), 1 deletion(-) 4 files changed, 17 insertions(+), 1 deletion(-)
--- PATCHES --- PATCHES
+++ PATCHES 2012-04-11 04:52:45.000000000 +0000 +++ PATCHES 2016-05-31 11:10:11.833549975 +0000
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
+patch-1.5.3.vk.pgp_verbose_mime +patch-1.5.3.vk.pgp_verbose_mime
patch-1.5.9.aw.listreply.1 patch-1.5.9.aw.listreply.1
rr.compressed patch-quasi-delete-neo-20160530
patch-quasi-delete-neo-20160502 patch-progress-neo-20160530
--- globals.h --- globals.h
+++ globals.h 2012-04-11 04:52:45.000000000 +0000 +++ globals.h 2016-05-31 11:08:36.991358869 +0000
@@ -253,6 +253,8 @@ WHERE REGEXP PgpDecryptionOkay; @@ -274,6 +274,8 @@ WHERE REGEXP PgpDecryptionOkay;
WHERE char *PgpSignAs; WHERE char *PgpSignAs;
WHERE short PgpTimeout; WHERE short PgpTimeout;
WHERE char *PgpEntryFormat; WHERE char *PgpEntryFormat;
@ -24,8 +24,8 @@
WHERE char *PgpDecodeCommand; WHERE char *PgpDecodeCommand;
WHERE char *PgpVerifyCommand; WHERE char *PgpVerifyCommand;
--- init.h --- init.h
+++ init.h 2012-04-11 04:52:45.000000000 +0000 +++ init.h 2016-05-31 11:08:36.995358792 +0000
@@ -2947,6 +2947,18 @@ struct option_t MuttVars[] = { @@ -3184,6 +3184,18 @@ struct option_t MuttVars[] = {
** a line quoted text if it also matches $$smileys. This mostly ** a line quoted text if it also matches $$smileys. This mostly
** happens at the beginning of a line. ** happens at the beginning of a line.
*/ */
@ -45,7 +45,7 @@
--- pgp.c --- pgp.c
+++ pgp.c 2015-09-11 14:47:19.817518523 +0000 +++ pgp.c 2016-05-31 11:08:36.995358792 +0000
@@ -1261,7 +1261,8 @@ BODY *pgp_sign_message (BODY *a) @@ -1261,7 +1261,8 @@ BODY *pgp_sign_message (BODY *a)
t->disposition = DISPNONE; t->disposition = DISPNONE;
t->encoding = ENC7BIT; t->encoding = ENC7BIT;