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

New neo patc set 20160611

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=136
This commit is contained in:
Dr. Werner Fink 2016-06-13 09:33:22 +00:00 committed by Git OBS Bridge
parent 19ee8f881d
commit d12715c232
11 changed files with 97 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
COLS-workaround.dif
View File

@ -4,14 +4,13 @@ bother other non-sidebar users as well make sidebar delimeter
look well.
---
buffy.c | 6 +++---
configure.ac | 8 ++++++++
sidebar.c | 9 ++++++++-
3 files changed, 19 insertions(+), 4 deletions(-)
2 files changed, 16 insertions(+), 1 deletion(-)
--- configure.ac
+++ configure.ac 2016-05-31 11:15:58.082946555 +0000
@@ -313,6 +313,14 @@ main ()
+++ configure.ac 2016-06-13 09:03:34.248832759 +0000
@@ -312,6 +312,14 @@ main ()
if test x$mutt_cv_curses != x/usr; then
LDFLAGS="$LDFLAGS -L${mutt_cv_curses}/lib"
CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include"
@ -26,49 +25,34 @@ look well.
fi])
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
+++ sidebar.c 2016-06-13 09:10:18.201095164 +0000
@@ -651,6 +651,7 @@ static int draw_divider (int first_row,
{
/* Calculate the width of the delimiter in screen cells */
int delim_len = mutt_strwidth (SidebarDividerChar);
+ int altchar = 0;
/* 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)
return delim_len;
@@ -661,13 +662,19 @@ static int draw_divider (int first_row,
if (delim_len > SidebarWidth)
return -1;
+ if (delim_len == 1 && strcmp(SidebarDividerChar, "|") == 0)
+ altchar++;
+ if (delim_len == 1 && strcmp(SidebarDividerChar, "|") == 0)
+ altchar++;
+
SETCOLOR(MT_COLOR_DIVIDER);
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));
}
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;
return delim_len;

14
aw.listreply.diff
View File

@ -8,14 +8,14 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
4 files changed, 27 insertions(+)
--- PATCHES
+++ PATCHES 2016-05-31 11:06:13.182101809 +0000
+++ PATCHES 2016-06-13 09:01:38.147057961 +0000
@@ -1,3 +1,4 @@
+patch-1.5.9.aw.listreply.1
patch-quasi-delete-neo-20160530
patch-progress-neo-20160530
patch-status-color-neo-20160530
patch-quasi-delete-neo-20160612
patch-progress-neo-20160612
patch-status-color-neo-20160612
--- init.h
+++ init.h 2016-05-31 11:04:49.979688830 +0000
+++ init.h 2016-06-13 09:00:11.228724235 +0000
@@ -1492,6 +1492,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.
@ -31,7 +31,7 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
/*
** .pp
--- mutt.h
+++ mutt.h 2016-05-31 11:07:07.177071921 +0000
+++ mutt.h 2016-06-13 09:00:11.228724235 +0000
@@ -313,6 +313,7 @@ enum
#endif
OPT_SUBJECT,
@ -41,7 +41,7 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
OPT_TOMODERATED,
OPT_CATCHUP,
--- send.c
+++ send.c 2016-05-31 11:04:49.983688753 +0000
+++ send.c 2016-06-13 09:00:11.228724235 +0000
@@ -516,6 +516,7 @@ static int include_reply (CONTEXT *ctx,
static int default_to (ADDRESS **to, ENVELOPE *env, int flags, int hmfupto)
{

8
bug-676388-largefile.patch
View File

@ -5,7 +5,7 @@
3 files changed, 5 insertions(+), 5 deletions(-)
--- crypt-gpgme.c
+++ crypt-gpgme.c 2016-05-31 11:14:02.965141918 +0000
+++ crypt-gpgme.c 2016-06-13 08:59:27.309566323 +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
@ -16,8 +16,8 @@
int err = 0;
gpgme_data_t data;
--- mh.c
+++ mh.c 2016-05-31 11:14:02.965141918 +0000
@@ -1620,9 +1620,9 @@ static int mh_rewrite_message (CONTEXT *
+++ mh.c 2016-06-13 08:59:27.309566323 +0000
@@ -1619,9 +1619,9 @@ static int mh_rewrite_message (CONTEXT *
char newpath[_POSIX_PATH_MAX];
char partpath[_POSIX_PATH_MAX];
@ -31,7 +31,7 @@
if ((dest = mx_open_new_message (ctx, h, 0)) == NULL)
return -1;
--- mutt.h
+++ mutt.h 2016-05-31 11:14:02.965141918 +0000
+++ mutt.h 2016-06-13 08:59:27.309566323 +0000
@@ -729,7 +729,7 @@ typedef struct body
PARAMETER *parameter; /* parameters of the content-type */
char *description; /* content-description */

4
mutt-1.5.21-tinfo.dif
View File

@ -3,8 +3,8 @@
1 file changed, 7 insertions(+), 2 deletions(-)
--- configure.ac
+++ configure.ac 2016-05-31 11:14:28.772649746 +0000
@@ -321,9 +321,14 @@ main ()
+++ configure.ac 2016-06-13 09:00:11.224724311 +0000
@@ -320,9 +320,14 @@ main ()
do
AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break])
done

22
mutt-1.6.1-opennfs.dif
View File

@ -10,7 +10,7 @@
8 files changed, 144 insertions(+), 9 deletions(-)
--- Makefile.am
+++ Makefile.am 2016-05-31 11:13:39.369591907 +0000
+++ Makefile.am 2016-06-13 08:58:36.526540129 +0000
@@ -32,7 +32,7 @@ mutt_SOURCES = \
edit.c enter.c flags.c init.c filter.c from.c \
getdomain.c group.c \
@ -20,7 +20,7 @@
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 \
@@ -107,7 +107,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c
@@ -96,7 +96,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c
mutt_dotlock_LDADD = $(LIBOBJS)
mutt_dotlock_DEPENDENCIES = $(LIBOBJS)
@ -30,7 +30,7 @@
pgpring_DEPENDENCIES = $(LIBOBJS) $(INTLDEPS)
--- Makefile.in
+++ Makefile.in 2016-05-31 11:13:39.369591907 +0000
+++ Makefile.in 2016-06-13 08:58:36.526540129 +0000
@@ -125,7 +125,7 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) ali
hash.$(OBJEXT) hdrline.$(OBJEXT) headers.$(OBJEXT) \
help.$(OBJEXT) hook.$(OBJEXT) keymap.$(OBJEXT) main.$(OBJEXT) \
@ -59,7 +59,7 @@
rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
score.c send.c sendlib.c signal.c sort.c \
--- lib.c
+++ lib.c 2016-05-31 11:13:39.369591907 +0000
+++ lib.c 2016-06-13 08:58:36.526540129 +0000
@@ -50,6 +50,7 @@
#define EX_OK 0
#endif
@ -89,7 +89,7 @@
if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 ||
compare_stat(&osb, &nsb) == -1)
--- mbox.c
+++ mbox.c 2016-05-31 11:13:39.369591907 +0000
+++ mbox.c 2016-06-13 08:58:36.526540129 +0000
@@ -785,7 +785,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
/* Create a temporary file to write the new version of the mailbox in. */
@ -100,8 +100,8 @@
{
if (-1 != i)
--- mh.c
+++ mh.c 2016-05-31 11:13:39.373591832 +0000
@@ -353,7 +353,11 @@ static int mh_mkstemp (CONTEXT * dest, F
+++ mh.c 2016-06-13 08:58:36.526540129 +0000
@@ -352,7 +352,11 @@ static int mh_mkstemp (CONTEXT * dest, F
{
snprintf (path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%" PRIu64,
dest->path, NONULL (Hostname), (int) getpid (), mutt_rand64());
@ -113,7 +113,7 @@
{
if (errno != EEXIST)
{
@@ -1377,8 +1381,11 @@ int maildir_open_new_message (MESSAGE *
@@ -1376,8 +1380,11 @@ int maildir_open_new_message (MESSAGE *
dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n",
path));
@ -127,7 +127,7 @@
if (errno != EEXIST)
{
--- mutt.h
+++ mutt.h 2016-05-31 11:13:39.373591832 +0000
+++ mutt.h 2016-06-13 08:58:36.526540129 +0000
@@ -1078,4 +1078,5 @@ typedef struct
#include "lib.h"
#include "globals.h"
@ -135,7 +135,7 @@
+extern int opennfs(const char *, int, int);
#endif /*MUTT_H*/
--- opennfs.c
+++ opennfs.c 2016-05-31 11:13:39.373591832 +0000
+++ opennfs.c 2016-06-13 08:58:36.526540129 +0000
@@ -0,0 +1,122 @@
+#include <errno.h>
+#include <fcntl.h>
@ -260,7 +260,7 @@
+ return open(path, flags, mode);
+}
--- sendlib.c
+++ sendlib.c 2016-05-31 11:13:39.373591832 +0000
+++ sendlib.c 2016-06-13 08:58:36.526540129 +0000
@@ -2260,7 +2260,7 @@ send_msg (const char *path, char **args,
if (SendmailWait >= 0 && tempfile && *tempfile)
{

57
mutt-1.6.1.dif
View File

@ -3,15 +3,14 @@
doc/Makefile.in | 2 -
doc/Muttrc | 102 +++++++++++++++++++++++++++++++++++++++++---------------
doc/Muttrc.head | 2 -
headers.c | 9 ++++
imap/auth.c | 20 ++++++++++
init.h | 3 +
mx.c | 3 +
8 files changed, 121 insertions(+), 30 deletions(-)
7 files changed, 112 insertions(+), 30 deletions(-)
--- configure.ac
+++ configure.ac 2016-05-31 11:11:35.279958476 +0000
@@ -282,7 +282,7 @@ main ()
+++ configure.ac 2016-06-13 08:57:37.543671328 +0000
@@ -281,7 +281,7 @@ main ()
mutt_cv_slang=$withval
if test -d $withval/include/slang; then
CPPFLAGS="$CPPFLAGS -I${withval}/include/slang"
@ -20,7 +19,7 @@
CPPFLAGS="$CPPFLAGS -I${withval}/include"
fi
LDFLAGS="$LDFLAGS -L${withval}/lib"
@@ -721,8 +721,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with-
@@ -720,8 +720,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with-
else
if test "$with_ssl" != "yes"
then
@ -33,7 +32,7 @@
fi
saved_LIBS="$LIBS"
@@ -801,8 +805,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with
@@ -800,8 +804,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with
if test "$with_sasl" != "yes"
then
@ -47,7 +46,7 @@
saved_LIBS="$LIBS"
--- doc/Makefile.in
+++ doc/Makefile.in 2016-05-31 11:11:35.283958400 +0000
+++ doc/Makefile.in 2016-06-13 08:57:37.543671328 +0000
@@ -697,7 +697,7 @@ uninstall-local:
check:
@ -58,7 +57,7 @@
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
+++ doc/Muttrc.head 2016-06-13 08:57:37.543671328 +0000
@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
"call urlview to extract URLs out of a message"
@ -69,7 +68,7 @@
# 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 2016-05-31 11:11:35.283958400 +0000
+++ doc/Muttrc 2016-06-13 08:57:37.547671252 +0000
@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
"call urlview to extract URLs out of a message"
@ -260,7 +259,7 @@
#
# Name: write_inc
--- imap/auth.c
+++ imap/auth.c 2016-05-31 11:11:35.283958400 +0000
+++ imap/auth.c 2016-06-13 08:57:37.547671252 +0000
@@ -72,6 +72,23 @@ int imap_authenticate (IMAP_DATA* idata)
dprint (2, (debugfile, "imap_authenticate: Trying method %s\n", method));
authenticator = imap_authenticators;
@ -296,8 +295,8 @@
FREE (&methods);
--- init.h
+++ init.h 2016-05-31 11:11:35.279958476 +0000
@@ -3569,6 +3569,9 @@ struct option_t MuttVars[] = {
+++ init.h 2016-06-13 08:57:37.547671252 +0000
@@ -3570,6 +3570,9 @@ struct option_t MuttVars[] = {
** the default from the GNUTLS library.
*/
# endif /* USE_SSL_GNUTLS */
@ -308,7 +307,7 @@
/*
** .pp
--- mx.c
+++ mx.c 2016-05-31 11:11:35.279958476 +0000
+++ mx.c 2016-06-13 08:57:37.547671252 +0000
@@ -1832,6 +1832,9 @@ void mx_update_context (CONTEXT *ctx, in
{
h = ctx->hdrs[msgno];
@ -319,35 +318,3 @@
if (WithCrypto)
{
/* NOTE: this _must_ be done before the check for mailcap! */
--- headers.c
+++ headers.c 2016-06-02 06:52:06.767101363 +0000
@@ -220,6 +220,9 @@ void mutt_label_ref_dec(ENVELOPE *env)
uintptr_t count;
LIST *label;
+ if (!Labels)
+ return;
+
for (label = env->labels; label; label = label->next)
{
if (label->data == NULL)
@@ -241,6 +244,9 @@ void mutt_label_ref_inc(ENVELOPE *env)
uintptr_t count;
LIST *label;
+ if (!Labels)
+ return;
+
for (label = env->labels; label; label = label->next)
{
if (label->data == NULL)
@@ -360,6 +366,9 @@ void mutt_scan_labels(CONTEXT *ctx)
{
int i;
+ if (!ctx)
+ return;
+
for (i = 0; i < ctx->msgcount; i++)
if (ctx->hdrs[i]->env->labels)
mutt_label_ref_inc(ctx->hdrs[i]->env);

22
mutt.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Mon Jun 13 09:27:36 UTC 2016 - werner@suse.de
- Update to neomutt 20160611
- Temporarily disable $sidebar_refresh_time
Unfortunately, this was causing too many problems.
It will be fixed and re-enabled as soon as possible.
- Fix several crashes, on startup, in Keywords
- Reflow text now works as it should
- Lots of typos fixed
- Compress config bug prevented it working
- Some minor bug-fixes from mutt/default
- Single quote at line beginning misinterpreted by groff
- Setting $sidebar_width to more than 128 would cause bad things to happen.
- Fix alignment in the compose menu.
- Fix sidebar buffy stats updating on mailbox close.
- Modify patch mutt-1.6.1.dif, that is skip upstream of neo as now
part of neo
- Adopt patches COLS-workaround.dif, aw.listreply.diff,
bug-676388-largefile.patch, mutt-1.5.21-tinfo.dif,
mutt-1.6.1-opennfs.dif, and patch-1.5.24.vk.pgp_verbose_mime
-------------------------------------------------------------------
Thu Jun 2 06:58:11 UTC 2016 - werner@suse.de

4
mutt.spec
View File

@ -71,7 +71,7 @@ Requires: perl(Expect)
# NOTE: We don't want this dependency and desktop-data-SuSE is in all
# desktop selections.
#Requires: desktop-data-SuSE
%global neo 20160530
%global neo 20160611
Version: 1.6.1
Release: 0
Summary: Mail Program
@ -126,7 +126,7 @@ for p in ../%name-%version-patches/*; do
echo Patch $p
patch -s -p1 < $p
done
patch -s -p1 < ../neomutt-patches-%{neo}/neomutt-%{neo}.patch
patch -s -p1 < ../neomutt-patches-%{neo}/mutt-%{version}/neomutt-%{neo}.patch
%patch -p0 -b .p0
%patch2 -p0 -b .pgpewrap
%patch3 -p0 -b .sendgroupreplyto

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

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

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

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

14
patch-1.5.24.vk.pgp_verbose_mime
View File

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