Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2015-09-13 09:45:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-01-27 09:09:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2015-09-13 09:45:28.000000000 +0200 @@ -1,0 +2,46 @@ +Fri Sep 11 15:14:48 UTC 2015 - wer...@suse.de + +- Update to mutt version 1.5.24 + + terminal status-line (TS) support, a.k.a. xterm title. see the + following variables: $ts_enabled, $ts_icon_format, $ts_status_format + ! $ssl_use_sslv3 is disabled by default. + ! command-line arguments: -H now combines template and command-line + address arguments. + ! GnuPG signature name is set to signature.asc + + New color object "prompt" added. + + Ability to encrypt postponed messages. See $postpone_encrypt and + $postpone_encrypt_as. + ! History ring now has a scratch buffer. + ! mail-key is implemented for GPGME. (Requires a recent GPGME). + ! Removed GPG_AGENT_INFO check for GnuPG 2.1 compatibility. Please + set pgp_use_gpg_agent if using GnuPG 2.1 or later. + ! $smime_encrypt_with now defaults to aes256. + ! GnuPG fingerprints are used internally when possible. + "--with-fingerprint" should be added to $pgp_list_pubring_command and + $pgp_list_secring_command to enable this. Please see contrib/gpg.rc. + Fingerprints may also be used at the prompts for key selection. + + $crypt_opportunistic_encrypt automatically enables/disables encryption + based on message recipients. + ! Attachments for signed, unencrypted emails may be deleted. + ! Multiple crypt-hooks may be defined for the same regexp. + This means multiple keys may be used for a recipient. + + $crypt_confirmhook allows the confirmation prompt for crypt-hooks to + be disabled. + + $ssl_ciphers allows the SSL ciphers to be directly set. + ! sime_keys better handles importing certificate chains. + ! sime_keys now records certificate purposes (sign/encrypt). Run + "sime_keys refresh" to update smime index files. + + $maildir_check_cur polls the maildir "cur" directory for new mail. +- Ported patches + patch-1.5.21.vk.pgp_verbose_mime becomes patch-1.5.24.vk.pgp_verbose_mime + patch-1.5.23.rr.compressed.bz2 becomes patch-1.5.24.rr.compressed.bz2 + patch-1.5.23.sidebar.20140412.patch becomes patch-1.5.24.sidebar.20140412.patch + mutt-1.5.21-opennfs.dif becomes mutt-1.5.24-opennfs.dif + mutt-1.5.23.dif becomes mutt-1.5.24.dif +- Modfied patches + nion.sidebar-color.diff + widechar.sidebar.dif +- Removed patch + patch-1.5.23.xtitles.patch + +------------------------------------------------------------------- Old: ---- mutt-1.5.21-opennfs.dif mutt-1.5.23-patches.tar.bz2 mutt-1.5.23.dif mutt-1.5.23.tar.gz patch-1.5.21.vk.pgp_verbose_mime patch-1.5.23.rr.compressed.bz2 patch-1.5.23.sidebar.20140412.patch patch-1.5.23.xtitles.patch New: ---- 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.20140412.patch patch-1.5.24.vk.pgp_verbose_mime ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mutt.spec ++++++ --- /var/tmp/diff_new_pack.O8eFfR/_old 2015-09-13 09:45:29.000000000 +0200 +++ /var/tmp/diff_new_pack.O8eFfR/_new 2015-09-13 09:45:29.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package mutt # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,7 @@ BuildRequires: cyrus-sasl-gssapi BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook_4 +BuildRequires: fdupes BuildRequires: gdbm-devel BuildRequires: glibc-i18ndata BuildRequires: ispell @@ -66,8 +67,8 @@ # NOTE: We don't want this dependency and desktop-data-SuSE is in all # desktop selections. #Requires: desktop-data-SuSE -Version: 1.5.23 -Release: 33.2 +Version: 1.5.24 +Release: 0 Summary: Mail Program License: GPL-2.0+ Group: Productivity/Networking/Email/Clients @@ -88,15 +89,14 @@ Patch2: %name-1.5.9i-pgpewrap.diff Patch3: %name-1.5.20-sendgroupreplyto.diff Patch4: %name-1.5.15-wrapcolumn.diff -Patch5: patch-1.5.23.xtitles.patch # http://lunar-linux.org/mutt-sidebar -Patch6: patch-1.5.23.sidebar.20140412.patch -Patch7: mutt-1.5.21-opennfs.dif +Patch6: patch-1.5.24.sidebar.20140412.patch +Patch7: mutt-1.5.24-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.21.vk.pgp_verbose_mime +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 @@ -122,18 +122,17 @@ patch -s -p1 < $p done %patch -%patch1 -p1 -b .compressed +%patch1 -p0 -b .compressed %patch2 -p0 -b .pgpewrap %patch3 -p1 -b .sendgroupreplyto %patch4 -p0 -b .wrapcolumn -%patch5 -p1 -b .xtitles -%patch6 -p1 -b .sidebar +%patch6 -p0 -b .sidebar %patch7 -p0 -b .opennfs %patch9 -p1 -b .largefile %patch10 -p0 -b .tinfo %patch11 -p1 -b .listreply -%patch12 -p1 -b .pgp_verbose_mtime -%patch14 -p1 -b .sidebar.color +%patch12 -p0 -b .pgp_verbose_mtime +%patch14 -p2 -b .sidebar.color %patch15 -p0 -b .widechar.sidebar %patch16 -p0 -b .crlf %patch18 -p1 -b .mailcap @@ -246,8 +245,6 @@ install -D -m 644 %{SOURCE9} %{buildroot}%{_datadir}/mutt/mailcap %suse_update_desktop_file mutt -#%fdupes %{buildroot} - %if 0%{?suse_version} >= 1140 %post @@ -261,7 +258,6 @@ %defattr(-,root,root) %doc doc/manual*.html doc/manual.txt.gz COPYRIGHT README* NEWS TODO %doc doc/PGP-Notes.txt doc/applying-patches.txt doc/devel-notes.txt -%doc contrib/ %config(noreplace) %{_sysconfdir}/skel/.muttrc %{_bindir}/mutt %{_bindir}/pgpewrap ++++++ mutt-1.5.21-opennfs.dif -> mutt-1.5.24-opennfs.dif ++++++ --- /work/SRC/openSUSE:Factory/mutt/mutt-1.5.21-opennfs.dif 2011-09-23 02:13:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt-1.5.24-opennfs.dif 2015-09-13 09:45:28.000000000 +0200 @@ -1,6 +1,17 @@ +--- + 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(-) + --- Makefile.am -+++ Makefile.am 2009-03-02 23:00:00.000000000 +0000 -@@ -27,7 +27,7 @@ mutt_SOURCES = \ ++++ 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 \ @@ -9,18 +20,18 @@ 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 \ -@@ -83,7 +83,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c - mutt_dotlock_LDADD = @LIBOBJS@ - mutt_dotlock_DEPENDENCIES = @LIBOBJS@ +@@ -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) + pgpring_LDADD = $(LIBOBJS) $(INTLLIBS) + pgpring_DEPENDENCIES = $(LIBOBJS) $(INTLDEPS) --- Makefile.in -+++ Makefile.in 2009-03-03 16:00:38.000000000 +0000 -@@ -77,7 +77,7 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) ali ++++ 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) \ @@ -29,16 +40,16 @@ postpone.$(OBJEXT) query.$(OBJEXT) recvattach.$(OBJEXT) \ recvcmd.$(OBJEXT) rfc822.$(OBJEXT) rfc1524.$(OBJEXT) \ rfc2047.$(OBJEXT) rfc2231.$(OBJEXT) rfc3676.$(OBJEXT) \ -@@ -105,7 +105,7 @@ pgpewrap_LDADD = $(LDADD) - pgpewrap_DEPENDENCIES = @LIBOBJS@ +@@ -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__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; - am__vpath_adj = case $$p in \ -@@ -354,7 +354,7 @@ mutt_SOURCES = \ + 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 \ @@ -57,7 +68,7 @@ #include "lib.h" -@@ -632,6 +633,10 @@ int safe_open (const char *path, int fla +@@ -633,6 +634,10 @@ int safe_open (const char *path, int fla struct stat osb, nsb; int fd; @@ -68,7 +79,7 @@ if (flags & O_EXCL) { char safe_file[_POSIX_PATH_MAX]; -@@ -655,7 +660,7 @@ int safe_open (const char *path, int fla +@@ -656,7 +661,7 @@ int safe_open (const char *path, int fla if ((fd = open (path, flags & ~O_EXCL, 0600)) < 0) return fd; @@ -78,8 +89,8 @@ if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 || compare_stat(&osb, &nsb) == -1) --- mbox.c -+++ mbox.c 2010-11-04 14:01:04.775926675 +0000 -@@ -782,7 +782,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int ++++ 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)); @@ -90,7 +101,7 @@ if (-1 != i) --- mh.c +++ mh.c 2009-03-02 23:00:00.000000000 +0000 -@@ -277,7 +277,11 @@ static int mh_mkstemp (CONTEXT * dest, F +@@ -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++); @@ -102,7 +113,7 @@ { if (errno != EEXIST) { -@@ -1290,8 +1294,11 @@ int maildir_open_new_message (MESSAGE * +@@ -1345,8 +1349,11 @@ int maildir_open_new_message (MESSAGE * dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n", path)); @@ -117,7 +128,7 @@ { --- mutt.h +++ mutt.h 2009-03-02 23:00:00.000000000 +0000 -@@ -972,4 +972,5 @@ typedef struct +@@ -981,4 +981,5 @@ typedef struct #include "lib.h" #include "globals.h" @@ -250,7 +261,7 @@ +} --- sendlib.c +++ sendlib.c 2009-03-02 23:00:00.000000000 +0000 -@@ -2216,7 +2216,7 @@ send_msg (const char *path, char **args, +@@ -2223,7 +2223,7 @@ send_msg (const char *path, char **args, if (SendmailWait >= 0 && tempfile && *tempfile) { /* *tempfile will be opened as stdout */ ++++++ mutt-1.5.23-patches.tar.bz2 -> mutt-1.5.24-patches.tar.bz2 ++++++ ++++++ mutt-1.5.21-opennfs.dif -> mutt-1.5.24.dif ++++++ --- /work/SRC/openSUSE:Factory/mutt/mutt-1.5.21-opennfs.dif 2011-09-23 02:13:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt-1.5.24.dif 2015-09-13 09:45:28.000000000 +0200 @@ -1,261 +1,320 @@ ---- Makefile.am -+++ Makefile.am 2009-03-02 23:00:00.000000000 +0000 -@@ -27,7 +27,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 \ -@@ -83,7 +83,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 2009-03-03 16:00:38.000000000 +0000 -@@ -77,7 +77,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) \ -@@ -105,7 +105,7 @@ pgpewrap_LDADD = $(LDADD) - pgpewrap_DEPENDENCIES = @LIBOBJS@ - 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__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; - am__vpath_adj = case $$p in \ -@@ -354,7 +354,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" - - -@@ -632,6 +633,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]; -@@ -655,7 +660,7 @@ int safe_open (const char *path, int fla +--- + 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(-) + +--- configure.ac ++++ configure.ac 2007-06-01 10:57:38.000000000 +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:04.775926675 +0000 -@@ -782,7 +782,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 -@@ -277,7 +277,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) - { -@@ -1290,8 +1294,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 2010-11-04 13:01:18.000000000 +0000 +@@ -685,7 +685,7 @@ uninstall-local: + + check: + manual.txt: manual.html +- -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \ ++ -LC_ALL=C lynx -dont_wrap_pre -center -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \ + LC_ALL=C w3m -dump manual.html > $@ || \ + LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@ + +--- doc/Muttrc ++++ doc/Muttrc 2009-03-03 14:56:33.000000000 +0000 +@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\ + "call urlview to extract URLs out of a message" + + # Show documentation when pressing F1 +-macro generic,pager <F1> "<shell-escape> less /usr/local/share/doc/mutt/manual.txt<Enter>" "show Mutt documentation" ++macro generic,index,pager <F1> "<shell-escape> less -iM /usr/share/doc/packages/mutt/manual.txt.gz<Enter>" "show Mutt documentation" + + # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" + macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list" +@@ -364,9 +364,9 @@ attachments -I message/external-body + # unset, you must first use the <tag-prefix> function (bound to ``;'' + # by default) to make the next function apply to all tagged messages. + # +-# +-# set autoedit=no +-# ++ ++set autoedit=yes ++ + # Name: autoedit + # Type: boolean + # Default: no +@@ -482,9 +482,9 @@ attachments -I message/external-body + # Note: It should only be set in case Mutt isn't able to determine the + # character set used correctly. + # +-# +-# set check_mbox_size=no +-# ++ ++set check_mbox_size=yes ++ + # Name: check_mbox_size + # Type: boolean + # Default: no +@@ -909,11 +909,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 +@@ -2351,9 +2351,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 +@@ -2381,9 +2381,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 +@@ -2401,9 +2401,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 +@@ -3440,9 +3440,9 @@ attachments -I message/external-body + # (possibly undeleted) message whenever a command that modifies the + # current message is executed. + # +-# +-# set reverse_alias=no +-# ++ ++set reverse_alias=yes ++ + # Name: reverse_alias + # Type: boolean + # Default: no +@@ -3574,6 +3574,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 +@@ -4144,9 +4156,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 +@@ -4630,9 +4642,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 +@@ -4980,6 +4992,42 @@ attachments -I message/external-body + # in this case. + # + # ++# set xterm_icon="M%?n?AIL&ail?" ++# ++# Name: xterm_icon ++# Type: string ++# Default: "M%?n?AIL&ail?" ++# ++# ++# Controls the format of the icon title, as long as xterm_set_titles ++# is enabled. This string is identical in formatting to the one used by ++# ``$status_format''. ++# ++# ++# set xterm_set_titles=no ++# ++# Name: xterm_set_titles ++# Type: boolean ++# Default: no ++# ++# ++# Controls whether mutt sets the xterm title bar and icon name ++# (as long as you're in an appropriate terminal). The default must ++# be off to force in the validity checking. ++# ++# ++# set xterm_title="Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?" ++# ++# Name: xterm_title ++# Type: string ++# Default: "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?" ++# ++# ++# Controls the format of the title bar of the xterm provided that ++# xterm_set_titles has been set. This string is identical in formatting ++# to the one used by ``$status_format''. ++# ++# + # set write_inc=10 + # + # Name: write_inc +--- doc/Muttrc.head ++++ doc/Muttrc.head 2007-06-01 10:51:04.000000000 +0000 +@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\ + "call urlview to extract URLs out of a message" - dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n", - path)); -- -+#if defined(__linux__) -+ if ((fd = opennfs (path, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1) -+#else - if ((fd = open (path, O_WRONLY | O_EXCL | O_CREAT, 0666)) == -1) + # Show documentation when pressing F1 +-macro generic,pager <F1> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation" ++macro generic,index,pager <F1> "<shell-escape> less -iM @docdir@/manual.txt<Enter>" "show Mutt documentation" + + # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" + macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list" +--- imap/auth.c ++++ imap/auth.c 2006-11-09 15:19:56.000000000 +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 -@@ -972,4 +972,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 <errno.h> -+#include <fcntl.h> -+#include <libgen.h> -+#include <limits.h> -+#include <nfs/nfs.h> -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <sys/vfs.h> -+#include <unistd.h> -+ -+#ifndef NFS_SUPER_MAGIC -+# define NFS_SUPER_MAGIC 0x6969 + 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 2009-06-25 15:52:10.000000000 +0000 +@@ -3044,6 +3044,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 2011-07-07 11:24:49.000000000 +0000 +@@ -1537,6 +1537,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 -@@ -2216,7 +2216,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.23.tar.gz -> mutt-1.5.24.tar.gz ++++++ ++++ 144508 lines of diff (skipped) ++++++ nion.sidebar-color.diff ++++++ --- /var/tmp/diff_new_pack.O8eFfR/_old 2015-09-13 09:45:30.000000000 +0200 +++ /var/tmp/diff_new_pack.O8eFfR/_new 2015-09-13 09:45:30.000000000 +0200 @@ -1,16 +1,17 @@ -diff --git a/color.c b/color.c -index bb6cbb4..bbf20a3 100644 ---- a/color.c -+++ b/color.c -@@ -95,6 +95,7 @@ static struct mapping_t Fields[] = + + +diff --git a/mutt-1.5.24/color.c b/mutt-1.5.24/color.c +--- a/mutt-1.5.24/color.c ++++ b/mutt-1.5.24/color.c +@@ -95,6 +95,7 @@ static const struct mapping_t Fields[] = { "index", MT_COLOR_INDEX }, { "sidebar_new", MT_COLOR_NEW }, { "sidebar_flagged", MT_COLOR_FLAGGED }, -+ { "sidebar", MT_COLOR_SIDEBAR }, ++ { "sidebar", MT_COLOR_SIDEBAR }, + { "prompt", MT_COLOR_PROMPT }, { NULL, 0 } }; - -@@ -144,6 +145,7 @@ void ci_start_color (void) +@@ -145,6 +146,7 @@ void ci_start_color (void) /* set some defaults */ ColorDefs[MT_COLOR_STATUS] = A_REVERSE; @@ -18,11 +19,10 @@ 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 5f61048..cb1acf2 100644 ---- a/mutt_curses.h -+++ b/mutt_curses.h -@@ -125,6 +125,7 @@ enum +diff --git a/mutt-1.5.24/mutt_curses.h b/mutt-1.5.24/mutt_curses.h +--- a/mutt-1.5.24/mutt_curses.h ++++ b/mutt-1.5.24/mutt_curses.h +@@ -119,6 +119,7 @@ enum MT_COLOR_ATTACHMENT, MT_COLOR_SEARCH, MT_COLOR_BOLD, @@ -30,11 +30,10 @@ MT_COLOR_UNDERLINE, MT_COLOR_INDEX, MT_COLOR_NEW, -diff --git a/sidebar.c b/sidebar.c -index 9e12319..4b37b76 100644 ---- a/sidebar.c -+++ b/sidebar.c -@@ -250,13 +250,14 @@ +diff --git a/mutt-1.5.24/sidebar.c b/mutt-1.5.24/sidebar.c +--- a/mutt-1.5.24/sidebar.c ++++ b/mutt-1.5.24/sidebar.c +@@ -250,13 +250,14 @@ int draw_sidebar(int menu) { } /* get attributes for divider */ @@ -50,7 +49,7 @@ /* draw the divider */ -@@ -266,10 +267,14 @@ +@@ -266,10 +267,14 @@ int draw_sidebar(int menu) { for ( ; lines < SidebarHeight; lines++ ) { move(lines, SidebarWidth - delim_len); @@ -69,4 +68,3 @@ } if ( Incoming == 0 ) return 0; - ++++++ patch-1.5.23.sidebar.20140412.patch -> patch-1.5.24.sidebar.20140412.patch ++++++ ++++ 4311 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/mutt/patch-1.5.23.sidebar.20140412.patch ++++ and /work/SRC/openSUSE:Factory/.mutt.new/patch-1.5.24.sidebar.20140412.patch ++++++ patch-1.5.21.vk.pgp_verbose_mime -> patch-1.5.24.vk.pgp_verbose_mime ++++++ --- /work/SRC/openSUSE:Factory/mutt/patch-1.5.21.vk.pgp_verbose_mime 2012-05-31 17:07:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/patch-1.5.24.vk.pgp_verbose_mime 2015-09-13 09:45:28.000000000 +0200 @@ -1,7 +1,20 @@ -diff -rupN a/globals.h b/globals.h ---- a/globals.h 2009-08-26 03:08:52.000000000 +0800 -+++ b/globals.h 2012-04-11 12:52:44.826523028 +0800 -@@ -227,6 +227,8 @@ WHERE REGEXP PgpGoodSign; +--- + PATCHES | 1 + + globals.h | 2 ++ + init.h | 12 ++++++++++++ + pgp.c | 3 ++- + 4 files changed, 17 insertions(+), 1 deletion(-) + +--- PATCHES ++++ PATCHES 2012-04-11 04:52:45.000000000 +0000 +@@ -1,3 +1,4 @@ ++patch-1.5.3.vk.pgp_verbose_mime + patch-1.5.9.aw.listreply.1 + patch-1.5.23.sidebar.20140412.txt + rr.compressed +--- globals.h ++++ globals.h 2012-04-11 04:52:45.000000000 +0000 +@@ -239,6 +239,8 @@ WHERE REGEXP PgpGoodSign; WHERE char *PgpSignAs; WHERE short PgpTimeout; WHERE char *PgpEntryFormat; @@ -10,10 +23,9 @@ WHERE char *PgpClearSignCommand; WHERE char *PgpDecodeCommand; WHERE char *PgpVerifyCommand; -diff -rupN a/init.h b/init.h ---- a/init.h 2010-09-15 23:39:31.000000000 +0800 -+++ b/init.h 2012-04-11 12:52:44.825523029 +0800 -@@ -2556,6 +2556,18 @@ struct option_t MuttVars[] = { +--- init.h ++++ init.h 2012-04-11 04:52:45.000000000 +0000 +@@ -2719,6 +2719,18 @@ struct option_t MuttVars[] = { ** a line quoted text if it also matches $$smileys. This mostly ** happens at the beginning of a line. */ @@ -32,18 +44,13 @@ -diff -rupN a/PATCHES b/PATCHES ---- a/PATCHES 2008-03-20 04:07:06.000000000 +0800 -+++ b/PATCHES 2012-04-11 12:52:44.824523030 +0800 -@@ -0,0 +1 @@ -+patch-1.5.3.vk.pgp_verbose_mime -diff -rupN a/pgp.c b/pgp.c ---- a/pgp.c 2010-09-14 01:19:55.000000000 +0800 -+++ b/pgp.c 2012-04-11 12:52:44.825523029 +0800 -@@ -1129,6 +1129,8 @@ BODY *pgp_sign_message (BODY *a) +--- pgp.c ++++ pgp.c 2015-09-11 14:47:19.817518523 +0000 +@@ -1213,7 +1213,8 @@ BODY *pgp_sign_message (BODY *a) t->disposition = DISPNONE; t->encoding = ENC7BIT; t->unlink = 1; /* ok to remove this file after sending. */ +- mutt_set_parameter ("name", "signature.asc", &t->parameter); + mutt_set_parameter ("name", PgpMimeSignatureFilename, &t->parameter); + t->description = safe_strdup (PgpMimeSignatureDescription); ++++++ widechar.sidebar.dif ++++++ --- /var/tmp/diff_new_pack.O8eFfR/_old 2015-09-13 09:45:30.000000000 +0200 +++ /var/tmp/diff_new_pack.O8eFfR/_new 2015-09-13 09:45:30.000000000 +0200 @@ -1,6 +1,10 @@ +--- + handler.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + --- handler.c -+++ handler.c 2013-04-22 00:00:00.000000000 +0000 -@@ -778,7 +778,7 @@ static void enriched_set_flags (const wc ++++ handler.c 2015-09-11 14:52:40.778018507 +0000 +@@ -780,7 +780,7 @@ static void enriched_set_flags (const wc static int text_enriched_handler (BODY *a, STATE *s) { enum { @@ -9,7 +13,7 @@ } state = TEXT; long bytes = a->length; -@@ -807,7 +807,7 @@ static int text_enriched_handler (BODY * +@@ -809,7 +809,7 @@ static int text_enriched_handler (BODY * { if (state != ST_EOF) { @@ -18,7 +22,7 @@ state = ST_EOF; else bytes--; -@@ -815,6 +815,8 @@ static int text_enriched_handler (BODY * +@@ -817,6 +817,8 @@ static int text_enriched_handler (BODY * switch (state) { @@ -27,7 +31,7 @@ case TEXT : switch (wc) { -@@ -875,9 +877,8 @@ static int text_enriched_handler (BODY * +@@ -877,9 +879,8 @@ static int text_enriched_handler (BODY * enriched_flush (&stte, 1); else { @@ -38,7 +42,7 @@ } break; -@@ -1490,7 +1491,7 @@ void mutt_decode_attachment (BODY *b, ST +@@ -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 */ @@ -47,15 +51,15 @@ { char *buf = NULL; size_t l = 0, sz = 0; -@@ -1518,7 +1519,6 @@ int mutt_body_handler (BODY *b, STATE *s - int decode = 0; - int plaintext = 0; +@@ -1595,7 +1596,6 @@ static int run_decode_and_handler (BODY + int origType; + char *savePrefix = NULL; FILE *fp = NULL; - char tempfile[_POSIX_PATH_MAX]; - handler_t handler = NULL; - LOFF_T tmpoffset = 0; size_t tmplength = 0; -@@ -1528,6 +1528,8 @@ int mutt_body_handler (BODY *b, STATE *s + LOFF_T tmpoffset = 0; + int decode = 0; +@@ -1604,6 +1604,8 @@ static int run_decode_and_handler (BODY #ifdef HAVE_FMEMOPEN char *temp; size_t tempsize; @@ -63,4 +67,4 @@ + char tempfile[_POSIX_PATH_MAX]; #endif - int oflags = s->flags; + fseeko (s->fpin, b->offset, 0);
