Hello community,
here is the log from the commit of package mutt for openSUSE:Factory checked in at 2016-04-14 13:07:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mutt (Old)
and /work/SRC/openSUSE:Factory/.mutt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mutt"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mutt/mutt.changes 2016-03-07 13:24:14.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2016-04-14 13:07:29.000000000 +0200
@@ -1,0 +2,42 @@
+Mon Apr 11 12:04:29 UTC 2016 - werner@suse.de
+
+- Update to mutt version 1.6.0 (2016-04-04):
+ + Enabled utf-8 mailbox support for IMAP.
+ + New expandos %r and %R for comma separated list of To: and Cc:
+ recipients respectively.
+ + Improved support for internationalized email and SMTPUTF8 (RFC653[0-3]).
+ ! $use_idn has been renamed to $idn_decode.
+ + $idn_encode controls whether outgoing email address domains will
+ be IDNA encoded. If your MTA supports it, unset to use utf-8
+ email address domains.
+ + The S/MIME message digest algorithm is now specified using the
+ option $smime_sign_digest_alg. Note that $smime_sign_command
+ should be modified to include "-md %d". Please see
+ contrib/smime.rc.
+ + $reflow_space_quotes allows format=flowed email quotes to be
+ displayed with spacing between them.
+ ! multipart draft files are now supported.
+ + The "-E" command line argument causes mutt to edit draft or include files.
+ All changes made in mutt will be saved back out to those files.
+ + $resume_draft_files and $resume_edited_draft_files control how
+ mutt processes draft files.
+ + For classic gpg mode, $pgp_decryption_okay should be set to verify
+ multipart/encrypted are actually encrypted. Please see
+ contrib/gpg.rc for the suggested value.
+ ! mailto URL header parameters by default are now restricted to
+ 'body' and 'subject'.
+ + mailto_allow and unmailto_allow can be used to add or remove
+ allowed mailto header parameters.
+ ! The method of setting $hostname has been changed. Rather than
+ scanning /etc/resolv.conf, the domain will now be determined using
+ DNS calls.
+- Modfied patches
+ aw.listreply.diff
+ patch-1.5.24.vk.pgp_verbose_mime
+- Ported patches
+ mutt-1.5.24.dif becomes mutt-1.6.0.dif
+ mutt-1.5.24-opennfs.dif becomes mutt-1.6.0-opennfs.dif
+ patch-1.5.24.rr.compressed.bz2 becomes patch-1.6.0.rr.compressed.bz2
+ patch-1.5.24.sidebar.20151111.patch becomes patch-1.6.0.sidebar.20160411.patch
+
+-------------------------------------------------------------------
Old:
----
mutt-1.5.24-opennfs.dif
mutt-1.5.24-patches.tar.bz2
mutt-1.5.24.dif
mutt-1.5.24.tar.gz
patch-1.5.24.rr.compressed.bz2
patch-1.5.24.sidebar.20151111.patch
New:
----
mutt-1.6.0-opennfs.dif
mutt-1.6.0-patches.tar.bz2
mutt-1.6.0.dif
mutt-1.6.0.tar.gz
patch-1.6.0.rr.compressed.bz2
patch-1.6.0.sidebar.20160411.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mutt.spec ++++++
--- /var/tmp/diff_new_pack.8ME1Ga/_old 2016-04-14 13:07:31.000000000 +0200
+++ /var/tmp/diff_new_pack.8ME1Ga/_new 2016-04-14 13:07:31.000000000 +0200
@@ -68,7 +68,7 @@
# NOTE: We don't want this dependency and desktop-data-SuSE is in all
# desktop selections.
#Requires: desktop-data-SuSE
-Version: 1.5.24
+Version: 1.6.0
Release: 0
Summary: Mail Program
License: GPL-2.0+
@@ -90,9 +90,9 @@
Patch2: %name-1.5.9i-pgpewrap.diff
Patch3: %name-1.5.20-sendgroupreplyto.diff
Patch4: %name-1.5.15-wrapcolumn.diff
-# http://lunar-linux.org/mutt-sidebar
-Patch6: patch-1.5.24.sidebar.20151111.patch
-Patch7: mutt-1.5.24-opennfs.dif
+# http://www.lunar-linux.org/mutt-sidebar/
+Patch6: patch-1.6.0.sidebar.20160411.patch
+Patch7: mutt-1.6.0-opennfs.dif
Patch9: bug-676388-largefile.patch
Patch10: mutt-1.5.21-tinfo.dif
# http://www.wolfermann.org/mutt.html
++++++ aw.listreply.diff ++++++
--- /var/tmp/diff_new_pack.8ME1Ga/_old 2016-04-14 13:07:31.000000000 +0200
+++ /var/tmp/diff_new_pack.8ME1Ga/_new 2016-04-14 13:07:31.000000000 +0200
@@ -11,7 +11,7 @@
+++ mutt-1.5.23/PATCHES 2015-01-26 15:34:40.133518493 +0000
@@ -1,2 +1,3 @@
+patch-1.5.9.aw.listreply.1
- patch-1.5.24.sidebar.20151111.txt
+ 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
@@ -19,11 +19,11 @@
** 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.
*/
-+ { "list_reply", DT_QUAD, R_NONE, OPT_LISTREPLY, M_NO },
++ { "list_reply", DT_QUAD, R_NONE, OPT_LISTREPLY, M_NO },
+ /*
+ ** .pp
+ ** When set, address replies to the mailing list the original message came
-+ ** from (instead to the author only). Setting this option to ``ask-yes'' or
++ ** from (instead to the author only). Setting this option to ``ask-yes'' or
+ ** ``ask-no'' will ask if you really intended to reply to the author only.
+ */
{ "mail_check", DT_NUM, R_NONE, UL &BuffyTimeout, 5 },
++++++ mutt-1.5.24-opennfs.dif -> mutt-1.6.0-opennfs.dif ++++++
--- /work/SRC/openSUSE:Factory/mutt/mutt-1.5.24-opennfs.dif 2015-09-13 09:45:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mutt.new/mutt-1.6.0-opennfs.dif 2016-04-14 13:07:29.000000000 +0200
@@ -10,7 +10,7 @@
8 files changed, 144 insertions(+), 9 deletions(-)
--- Makefile.am
-+++ Makefile.am 2015-09-11 14:41:16.061518931 +0000
++++ Makefile.am 2016-04-11 11:24:25.813117416 +0000
@@ -29,7 +29,7 @@ mutt_SOURCES = \
edit.c enter.c flags.c init.c filter.c from.c \
getdomain.c group.c \
@@ -19,7 +19,7 @@
+ main.c mbox.c menu.c mh.c mx.c opennfs.c pager.c parse.c pattern.c \
postpone.c query.c recvattach.c recvcmd.c \
rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
- score.c send.c sendlib.c signal.c sort.c \
+ sidebar.c \
@@ -84,7 +84,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c
mutt_dotlock_LDADD = $(LIBOBJS)
mutt_dotlock_DEPENDENCIES = $(LIBOBJS)
@@ -30,8 +30,8 @@
pgpring_DEPENDENCIES = $(LIBOBJS) $(INTLDEPS)
--- Makefile.in
-+++ Makefile.in 2015-09-11 14:41:53.390018589 +0000
-@@ -125,7 +125,7 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) ali
++++ Makefile.in 2016-04-11 11:23:21.414301183 +0000
+@@ -128,7 +128,7 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) ali
hash.$(OBJEXT) hdrline.$(OBJEXT) headers.$(OBJEXT) \
help.$(OBJEXT) hook.$(OBJEXT) keymap.$(OBJEXT) main.$(OBJEXT) \
mbox.$(OBJEXT) menu.$(OBJEXT) mh.$(OBJEXT) mx.$(OBJEXT) \
@@ -40,7 +40,7 @@
postpone.$(OBJEXT) query.$(OBJEXT) recvattach.$(OBJEXT) \
recvcmd.$(OBJEXT) rfc822.$(OBJEXT) rfc1524.$(OBJEXT) \
rfc2047.$(OBJEXT) rfc2231.$(OBJEXT) rfc3676.$(OBJEXT) \
-@@ -155,7 +155,7 @@ pgpewrap_LDADD = $(LDADD)
+@@ -159,7 +159,7 @@ pgpewrap_LDADD = $(LDADD)
pgpewrap_DEPENDENCIES = $(LIBOBJS) $(am__DEPENDENCIES_1)
am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) \
lib.$(OBJEXT) extlib.$(OBJEXT) sha1.$(OBJEXT) md5.$(OBJEXT) \
@@ -49,7 +49,7 @@
pgpring_OBJECTS = $(am_pgpring_OBJECTS)
am_txt2c_OBJECTS = txt2c.$(OBJEXT)
txt2c_OBJECTS = $(am_txt2c_OBJECTS)
-@@ -474,7 +474,7 @@ mutt_SOURCES = \
+@@ -486,7 +486,7 @@ mutt_SOURCES = \
edit.c enter.c flags.c init.c filter.c from.c \
getdomain.c group.c \
handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \
@@ -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 2009-03-02 23:00:00.000000000 +0000
++++ lib.c 2016-04-11 11:23:21.414301183 +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 2010-11-04 14:01:05.000000000 +0000
++++ mbox.c 2016-04-11 11:23:21.414301183 +0000
@@ -781,7 +781,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
/* Create a temporary file to write the new version of the mailbox in. */
@@ -100,7 +100,7 @@
{
if (-1 != i)
--- mh.c
-+++ mh.c 2009-03-02 23:00:00.000000000 +0000
++++ mh.c 2016-04-11 11:23:21.414301183 +0000
@@ -332,7 +332,11 @@ static int mh_mkstemp (CONTEXT * dest, F
{
snprintf (path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%d",
@@ -127,15 +127,15 @@
if (errno != EEXIST)
{
--- mutt.h
-+++ mutt.h 2009-03-02 23:00:00.000000000 +0000
-@@ -981,4 +981,5 @@ typedef struct
++++ mutt.h 2016-04-11 11:23:21.414301183 +0000
+@@ -987,4 +987,5 @@ typedef struct
#include "lib.h"
#include "globals.h"
+extern int opennfs(const char *, int, int);
#endif /*MUTT_H*/
--- opennfs.c
-+++ opennfs.c 2009-03-02 23:00:00.000000000 +0000
++++ opennfs.c 2016-04-11 11:23:21.414301183 +0000
@@ -0,0 +1,122 @@
+#include
+#include
@@ -260,7 +260,7 @@
+ return open(path, flags, mode);
+}
--- sendlib.c
-+++ sendlib.c 2009-03-02 23:00:00.000000000 +0000
++++ sendlib.c 2016-04-11 11:23:21.414301183 +0000
@@ -2223,7 +2223,7 @@ send_msg (const char *path, char **args,
if (SendmailWait >= 0 && tempfile && *tempfile)
{
++++++ mutt-1.5.24-patches.tar.bz2 -> mutt-1.6.0-patches.tar.bz2 ++++++
++++++ mutt-1.5.24-opennfs.dif -> mutt-1.6.0.dif ++++++
--- /work/SRC/openSUSE:Factory/mutt/mutt-1.5.24-opennfs.dif 2015-09-13 09:45:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mutt.new/mutt-1.6.0.dif 2016-04-14 13:07:29.000000000 +0200
@@ -1,272 +1,320 @@
---
- Makefile.am | 4 -
- Makefile.in | 6 +-
- lib.c | 7 ++-
- mbox.c | 2
- mh.c | 9 +++-
- mutt.h | 1
- opennfs.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- sendlib.c | 2
- 8 files changed, 144 insertions(+), 9 deletions(-)
+ configure.ac | 10 ++++-
+ doc/Makefile.in | 2 -
+ doc/Muttrc | 102 +++++++++++++++++++++++++++++++++++++++++---------------
+ doc/Muttrc.head | 2 -
+ imap/auth.c | 20 ++++++++++
+ init.h | 3 +
+ mx.c | 3 +
+ 7 files changed, 112 insertions(+), 30 deletions(-)
---- Makefile.am
-+++ Makefile.am 2015-09-11 14:41:16.061518931 +0000
-@@ -29,7 +29,7 @@ mutt_SOURCES = \
- edit.c enter.c flags.c init.c filter.c from.c \
- getdomain.c group.c \
- handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \
-- main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c \
-+ main.c mbox.c menu.c mh.c mx.c opennfs.c pager.c parse.c pattern.c \
- postpone.c query.c recvattach.c recvcmd.c \
- rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
- score.c send.c sendlib.c signal.c sort.c \
-@@ -84,7 +84,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c
- mutt_dotlock_LDADD = $(LIBOBJS)
- mutt_dotlock_DEPENDENCIES = $(LIBOBJS)
-
--pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5.c pgppacket.c ascii.c
-+pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c opennfs.c md5.c pgppacket.c ascii.c
- pgpring_LDADD = $(LIBOBJS) $(INTLLIBS)
- pgpring_DEPENDENCIES = $(LIBOBJS) $(INTLDEPS)
-
---- Makefile.in
-+++ Makefile.in 2015-09-11 14:41:53.390018589 +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) \
- mbox.$(OBJEXT) menu.$(OBJEXT) mh.$(OBJEXT) mx.$(OBJEXT) \
-- pager.$(OBJEXT) parse.$(OBJEXT) pattern.$(OBJEXT) \
-+ opennfs.$(OBJEXT) pager.$(OBJEXT) parse.$(OBJEXT) pattern.$(OBJEXT) \
- postpone.$(OBJEXT) query.$(OBJEXT) recvattach.$(OBJEXT) \
- recvcmd.$(OBJEXT) rfc822.$(OBJEXT) rfc1524.$(OBJEXT) \
- rfc2047.$(OBJEXT) rfc2231.$(OBJEXT) rfc3676.$(OBJEXT) \
-@@ -155,7 +155,7 @@ pgpewrap_LDADD = $(LDADD)
- pgpewrap_DEPENDENCIES = $(LIBOBJS) $(am__DEPENDENCIES_1)
- am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) \
- lib.$(OBJEXT) extlib.$(OBJEXT) sha1.$(OBJEXT) md5.$(OBJEXT) \
-- pgppacket.$(OBJEXT) ascii.$(OBJEXT)
-+ pgppacket.$(OBJEXT) ascii.$(OBJEXT) opennfs.$(OBJEXT)
- pgpring_OBJECTS = $(am_pgpring_OBJECTS)
- am_txt2c_OBJECTS = txt2c.$(OBJEXT)
- txt2c_OBJECTS = $(am_txt2c_OBJECTS)
-@@ -474,7 +474,7 @@ mutt_SOURCES = \
- edit.c enter.c flags.c init.c filter.c from.c \
- getdomain.c group.c \
- handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \
-- main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c \
-+ main.c mbox.c menu.c mh.c mx.c opennfs.c pager.c parse.c pattern.c \
- postpone.c query.c recvattach.c recvcmd.c \
- rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
- score.c send.c sendlib.c signal.c sort.c \
---- lib.c
-+++ lib.c 2009-03-02 23:00:00.000000000 +0000
-@@ -50,6 +50,7 @@
- #define EX_OK 0
- #endif
-
-+#include "mutt.h"
- #include "lib.h"
-
-
-@@ -633,6 +634,10 @@ int safe_open (const char *path, int fla
- struct stat osb, nsb;
- int fd;
-
-+#if defined(__linux__)
-+ if ((fd = opennfs (path, flags, 0600)) < 0)
-+ return fd;
-+#else
- if (flags & O_EXCL)
- {
- char safe_file[_POSIX_PATH_MAX];
-@@ -656,7 +661,7 @@ int safe_open (const char *path, int fla
+--- configure.ac
++++ configure.ac 2016-04-11 11:09:41.997377315 +0000
+@@ -240,7 +240,7 @@ main ()
+ mutt_cv_slang=$withval
+ if test -d $withval/include/slang; then
+ CPPFLAGS="$CPPFLAGS -I${withval}/include/slang"
+- elif test -d $withval/include; then
++ elif test -d $withval/include && test $withval != /usr ; then
+ CPPFLAGS="$CPPFLAGS -I${withval}/include"
+ fi
+ LDFLAGS="$LDFLAGS -L${withval}/lib"
+@@ -669,8 +669,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with-
+ else
+ if test "$with_ssl" != "yes"
+ then
++ case $withval in /usr|/usr/local) ;;
++ *)
+ LDFLAGS="$LDFLAGS -L$withval/lib"
+ CPPFLAGS="$CPPFLAGS -I$withval/include"
++ ;;
++ esac
+ fi
+ saved_LIBS="$LIBS"
- if ((fd = open (path, flags & ~O_EXCL, 0600)) < 0)
- return fd;
--
-+#endif
- /* make sure the file is not symlink */
- if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 ||
- compare_stat(&osb, &nsb) == -1)
---- mbox.c
-+++ mbox.c 2010-11-04 14:01:05.000000000 +0000
-@@ -781,7 +781,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
-
- /* Create a temporary file to write the new version of the mailbox in. */
- mutt_mktemp (tempfile, sizeof (tempfile));
-- if ((i = open (tempfile, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1 ||
-+ if ((i = opennfs (tempfile, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1 ||
- (fp = fdopen (i, "w")) == NULL)
- {
- if (-1 != i)
---- mh.c
-+++ mh.c 2009-03-02 23:00:00.000000000 +0000
-@@ -332,7 +332,11 @@ static int mh_mkstemp (CONTEXT * dest, F
- {
- snprintf (path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%d",
- dest->path, NONULL (Hostname), (int) getpid (), Counter++);
-+#if defined(__linux__)
-+ if ((fd = opennfs (path, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1)
-+#else
- if ((fd = open (path, O_WRONLY | O_EXCL | O_CREAT, 0666)) == -1)
-+#endif
- {
- if (errno != EEXIST)
- {
-@@ -1345,8 +1349,11 @@ int maildir_open_new_message (MESSAGE *
+@@ -749,8 +753,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with
+
+ if test "$with_sasl" != "yes"
+ then
++ case $with_sasl in /usr|/usr/local) ;;
++ *)
+ CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
+ LDFLAGS="$LDFLAGS -L$with_sasl/lib"
++ ;;
++ esac
+ fi
+
+ saved_LIBS="$LIBS"
+--- doc/Makefile.in
++++ doc/Makefile.in 2016-04-11 11:09:41.997377315 +0000
+@@ -697,7 +697,7 @@ uninstall-local:
+
+ check:
+ manual.txt: manual.html
+- -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \
++ -LC_ALL=C lynx -dont_wrap_pre -center -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \
+ LC_ALL=C w3m -dump manual.html > $@ || \
+ LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
+
+--- doc/Muttrc.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"
+--- doc/Muttrc
++++ doc/Muttrc 2016-04-11 11:07:05.472260646 +0000
+@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
+ "call urlview to extract URLs out of a message"
- dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n",
- path));
--
-+#if defined(__linux__)
-+ if ((fd = opennfs (path, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1)
-+#else
- if ((fd = open (path, O_WRONLY | O_EXCL | O_CREAT, 0666)) == -1)
+ # Show documentation when pressing F1
+-macro generic,pager <F1> "<shell-escape> less /usr/local/share/doc/mutt/manual.txt<Enter>" "show Mutt documentation"
++macro generic,index,pager <F1> "<shell-escape> less -iM /usr/share/doc/packages/mutt/manual.txt.gz<Enter>" "show Mutt documentation"
+
+ # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
+ macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
+@@ -364,9 +364,9 @@ attachments -I message/external-body
+ # unset, you must first use the <tag-prefix> function (bound to ``;''
+ # by default) to make the next function apply to all tagged messages.
+ #
+-#
+-# set autoedit=no
+-#
++
++set autoedit=yes
++
+ # Name: autoedit
+ # Type: boolean
+ # Default: no
+@@ -482,9 +482,9 @@ attachments -I message/external-body
+ # Note: It should only be set in case Mutt isn't able to determine the
+ # character set used correctly.
+ #
+-#
+-# set check_mbox_size=no
+-#
++
++set check_mbox_size=yes
++
+ # Name: check_mbox_size
+ # Type: boolean
+ # Default: no
+@@ -912,11 +912,11 @@ attachments -I message/external-body
+ # filtered message is read from the standard output.
+ #
+ #
+-# set dotlock_program="/usr/local/bin/mutt_dotlock"
++# set dotlock_program="/usr/bin/mutt_dotlock"
+ #
+ # Name: dotlock_program
+ # Type: path
+-# Default: "/usr/local/bin/mutt_dotlock"
++# Default: "/usr/bin/mutt_dotlock"
+ #
+ #
+ # Contains the path of the mutt_dotlock(8) binary to be used by
+@@ -2380,9 +2380,9 @@ attachments -I message/external-body
+ # directly from the pager, and screen resizes cause lines longer than
+ # the screen width to be badly formatted in the help menu.
+ #
+-#
+-# set pager_context=0
+-#
++
++set pager_context=4
++
+ # Name: pager_context
+ # Type: number
+ # Default: 0
+@@ -2410,9 +2410,9 @@ attachments -I message/external-body
+ # pager. The valid sequences are listed in the $index_format
+ # section.
+ #
+-#
+-# set pager_index_lines=0
+-#
++
++set pager_index_lines=10
++
+ # Name: pager_index_lines
+ # Type: number
+ # Default: 0
+@@ -2430,9 +2430,9 @@ attachments -I message/external-body
+ # is less than $pager_index_lines, then the index will only use as
+ # many lines as it needs.
+ #
+-#
+-# set pager_stop=no
+-#
++
++set pager_stop=yes
++
+ # Name: pager_stop
+ # Type: boolean
+ # Default: no
+@@ -3538,9 +3538,9 @@ attachments -I message/external-body
+ # user-defined headers, and other processing effects from being
+ # made multiple times to the draft file.
+ #
+-#
+-# set reverse_alias=no
+-#
++
++set reverse_alias=yes
++
+ # Name: reverse_alias
+ # Type: boolean
+ # Default: no
+@@ -3672,6 +3672,18 @@ attachments -I message/external-body
+ # Also see the $force_name variable.
+ #
+ #
++# set send_group_reply_to=no
++#
++# Name: send_group_reply_to
++# Type: boolean
++# Default: no
++#
++#
++# This variable controls how group replies are done.
++# When set, all recepients listet in "To:" are set in the
++# "To:" header again, else in the "CC", which is the default.
++#
++#
+ # set score=yes
+ #
+ # Name: score
+@@ -4255,9 +4267,9 @@ attachments -I message/external-body
+ # Setting this variable overrides the value of the $sendmail
+ # variable.
+ #
+-#
+-# set sort=date
+-#
++
++set sort=reverse-date-sent
++
+ # Name: sort
+ # Type: sort order
+ # Default: date
+@@ -4741,9 +4753,9 @@ attachments -I message/external-body
+ # When set, mutt uses the date received rather than the date sent
+ # to thread messages by subject.
+ #
+-#
+-# set tilde=no
+-#
++
++set tilde=yes
++
+ # Name: tilde
+ # Type: boolean
+ # Default: no
+@@ -5079,6 +5091,42 @@ attachments -I message/external-body
+ # in this case.
+ #
+ #
++# set xterm_icon="M%?n?AIL&ail?"
++#
++# Name: xterm_icon
++# Type: string
++# Default: "M%?n?AIL&ail?"
++#
++#
++# Controls the format of the icon title, as long as xterm_set_titles
++# is enabled. This string is identical in formatting to the one used by
++# ``$status_format''.
++#
++#
++# set xterm_set_titles=no
++#
++# Name: xterm_set_titles
++# Type: boolean
++# Default: no
++#
++#
++# Controls whether mutt sets the xterm title bar and icon name
++# (as long as you're in an appropriate terminal). The default must
++# be off to force in the validity checking.
++#
++#
++# set xterm_title="Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
++#
++# Name: xterm_title
++# Type: string
++# Default: "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
++#
++#
++# Controls the format of the title bar of the xterm provided that
++# xterm_set_titles has been set. This string is identical in formatting
++# to the one used by ``$status_format''.
++#
++#
+ # set write_inc=10
+ #
+ # Name: write_inc
+--- imap/auth.c
++++ imap/auth.c 2016-04-11 11:09:41.997377315 +0000
+@@ -72,6 +72,23 @@ int imap_authenticate (IMAP_DATA* idata)
+ dprint (2, (debugfile, "imap_authenticate: Trying method %s\n", method));
+ authenticator = imap_authenticators;
+
++#ifdef USE_SASL
++ /* "login" not supported by SASL */
++ if (!ascii_strcasecmp ("login", method))
++ {
++ while (authenticator->authenticate)
++ {
++ char* identify = authenticator->method;
++ if (identify && !ascii_strcasecmp(identify, method))
++ if ((r = authenticator->authenticate(idata, method)) != IMAP_AUTH_UNAVAIL)
++ {
++ FREE(&methods);
++ return r;
++ }
++ authenticator++;
++ }
++ } else {
+#endif
- {
- if (errno != EEXIST)
+ while (authenticator->authenticate)
{
---- mutt.h
-+++ mutt.h 2009-03-02 23:00:00.000000000 +0000
-@@ -981,4 +981,5 @@ typedef struct
- #include "lib.h"
- #include "globals.h"
-
-+extern int opennfs(const char *, int, int);
- #endif /*MUTT_H*/
---- opennfs.c
-+++ opennfs.c 2009-03-02 23:00:00.000000000 +0000
-@@ -0,0 +1,122 @@
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+
-+#ifndef NFS_SUPER_MAGIC
-+# define NFS_SUPER_MAGIC 0x6969
+ if (!authenticator->method ||
+@@ -85,6 +102,9 @@ int imap_authenticate (IMAP_DATA* idata)
+
+ authenticator++;
+ }
++#ifdef USE_SASL
++ }
+#endif
-+
-+int opennfs(const char *path, int flags, int mode)
-+{
-+ char tmplock[NFS_MAXPATHLEN+1], sysname[256];
-+ char *slash, *ptr, *dir, *base, *clear = (char*)0;
-+ struct stat ps, ts;
-+ struct statfs fs;
-+ ssize_t len;
-+ int ret;
-+
-+ if ((flags & (O_WRONLY|O_RDWR)) == 0)
-+ goto safe;
-+
-+ if ((flags & (O_EXCL|O_CREAT)) != (O_EXCL|O_CREAT))
-+ goto safe;
-+
-+#if defined(O_NOFOLLOW)
-+ flags |= O_NOFOLLOW;
+ }
+
+ 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;
+
-+ ret = -1;
-+ if ((clear = strdup(path)) == (char*)0)
-+ goto err;
-+ dir = dirname(clear);
-+
-+ if ((ret = (statfs(dir, &fs))) < 0)
-+ goto err;
-+
-+ if (fs.f_type != NFS_SUPER_MAGIC)
-+ goto safe;
-+
-+ if ((ret = gethostname(sysname, sizeof(sysname))) < 0)
-+ goto err;
-+
-+ ret = -1;
-+ ptr = &tmplock[0];
-+ if (((len = snprintf(ptr, NFS_MAXPATHLEN, "%s/.%s-XXXXXX", dir, sysname)) < 0) || (len >= NFS_MAXPATHLEN))
-+ goto err;
-+ ptr += len;
-+ slash = ptr;
-+
-+ free(clear);
-+ clear = (char*)0;
-+
-+ if (mkdtemp(tmplock) == (char*)0)
-+ goto err;
-+
-+ ret = -1;
-+ if ((clear = strdup(path)) == (char*)0)
-+ goto rmd;
-+ base = basename(clear);
-+
-+ ret = -1;
-+ if (((len = snprintf(ptr, NFS_MAXPATHLEN - len, "/%s", base)) < 0) || (len >= (NFS_MAXPATHLEN - len)))
-+ goto rmd;
-+
-+ free(clear);
-+ clear = (char*)0;
-+
-+ if ((ret = open(tmplock, flags, mode)) < 0)
-+ goto rmd;
-+
-+ errno = 0;
-+ do {
-+ len = write(ret, "0", 2);
-+ } while ((len < 0) && (errno == EINTR));
-+ close(ret);
-+
-+ ret = -1;
-+ errno = EBADF;
-+ if (len != 2)
-+ goto unl;
-+
-+ errno = 0;
-+ if ((ret = lstat(tmplock, &ts)) < 0)
-+ goto unl;
-+
-+ if (((ret = link(tmplock, path)) < 0) && (errno == EEXIST))
-+ goto unl;
-+
-+ if ((ret = lstat(path, &ps)) < 0)
-+ goto unl;
-+
-+ ret = -1;
-+ errno = EEXIST;
-+ if (ps.st_nlink != 2)
-+ goto unl;
-+ if ((ps.st_rdev != ts.st_rdev) || (ps.st_ino != ts.st_ino))
-+ goto unl;
-+
-+ errno = 0;
-+ flags |= O_TRUNC;
-+ flags &= ~(O_EXCL|O_CREAT);
-+ ret = open(path, flags, mode);
-+unl:
-+ unlink(tmplock);
-+rmd:
-+ *slash = '\0';
-+ rmdir(tmplock);
-+err:
-+ if (clear) free(clear);
-+ return ret;
-+safe:
-+ if (clear) free(clear);
-+ return open(path, flags, mode);
-+}
---- sendlib.c
-+++ sendlib.c 2009-03-02 23:00:00.000000000 +0000
-@@ -2223,7 +2223,7 @@ send_msg (const char *path, char **args,
- if (SendmailWait >= 0 && tempfile && *tempfile)
- {
- /* *tempfile will be opened as stdout */
-- if (open (*tempfile, O_WRONLY | O_APPEND | O_CREAT | O_EXCL, 0600) < 0)
-+ if (opennfs (*tempfile, O_WRONLY | O_CREAT | O_EXCL, 0600) < 0)
- _exit (S_ERR);
- /* redirect stderr to *tempfile too */
- if (dup (1) < 0)
+ if (WithCrypto)
+ {
+ /* NOTE: this _must_ be done before the check for mailcap! */
++++++ mutt-1.5.24.tar.gz -> mutt-1.6.0.tar.gz ++++++
++++ 130229 lines of diff (skipped)
++++++ patch-1.5.24.vk.pgp_verbose_mime ++++++
--- /var/tmp/diff_new_pack.8ME1Ga/_old 2016-04-14 13:07:32.000000000 +0200
+++ /var/tmp/diff_new_pack.8ME1Ga/_new 2016-04-14 13:07:32.000000000 +0200
@@ -10,7 +10,7 @@
@@ -1,3 +1,4 @@
+patch-1.5.3.vk.pgp_verbose_mime
patch-1.5.9.aw.listreply.1
- patch-1.5.24.sidebar.20151111.txt
+ patch-1.6.0.sidebar.20160404.txt
rr.compressed
--- globals.h
+++ globals.h 2012-04-11 04:52:45.000000000 +0000
++++++ patch-1.5.24.sidebar.20151111.patch -> patch-1.6.0.sidebar.20160411.patch ++++++
++++ 1160 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/mutt/patch-1.5.24.sidebar.20151111.patch
++++ and /work/SRC/openSUSE:Factory/.mutt.new/patch-1.6.0.sidebar.20160411.patch