commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at Wed Nov 10 20:41:24 CET 2010. -------- --- mutt/mutt.changes 2010-05-10 22:36:54.000000000 +0200 +++ mutt/mutt.changes 2010-11-04 15:29:31.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Nov 4 15:28:59 CET 2010 - werner@suse.de + +- Update to mutt version 1.5.21 which include last three fixes + * Beside this better support of S/MIME certificates +- Use an other sidebar patch found for OpenBSD +- Update our patches + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mutt-1.5.19-opennfs.dif mutt-1.5.20-bnc537141.dif mutt-1.5.20-bnc559525.dif mutt-1.5.20-openssl_1.0.diff mutt-1.5.20.dif mutt-1.5.20.sidebar-fix.dif mutt-1.5.20.tar.bz2 patch-1.5.20.rr.compressed.1.bz2 patch-1.5.20.sidebar.20090619.txt.bz2 New: ---- mutt-1.5.21-opennfs.dif mutt-1.5.21.dif mutt-1.5.21.sidebar-fix.dif mutt-1.5.21.tar.bz2 patch-1.5.21.rr.compressed.1.bz2 patch-1.5.21.sidebar-aa6aa.txt.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mutt.spec ++++++ --- /var/tmp/diff_new_pack.ahTQ6P/_old 2010-11-10 20:33:56.000000000 +0100 +++ /var/tmp/diff_new_pack.ahTQ6P/_new 2010-11-10 20:33:56.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package mutt (Version 1.5.20) +# spec file for package mutt (Version 1.5.21) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -31,8 +31,8 @@ # desktop selections. #Requires: desktop-data-SuSE AutoReqProv: on -Version: 1.5.20 -Release: 8 +Version: 1.5.21 +Release: 1 Summary: Mail Program # ftp://ftp.mutt.org/mutt/devel/ Source0: %name-%version.tar.bz2 @@ -50,13 +50,10 @@ Patch4: %name-1.5.15-wrapcolumn.diff Patch5: patch-1.5.5.1.nt.xtitles.3.ab.1 # http://lunar-linux.org/index.php?page=mutt-sidebar -Patch6: patch-%version.sidebar.20090619.txt.bz2 -Patch7: mutt-1.5.20.sidebar-fix.dif -Patch8: mutt-1.5.19-opennfs.dif +Patch6: patch-1.5.21.sidebar-aa6aa.txt.bz2 +Patch7: mutt-1.5.21.sidebar-fix.dif +Patch8: mutt-1.5.21-opennfs.dif Patch9: mutt-1.5.20-gpgme_set_locale.patch -Patch10: mutt-1.5.20-bnc537141.dif -Patch11: mutt-1.5.20-bnc559525.dif -Patch12: mutt-1.5.20-openssl_1.0.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -65,13 +62,6 @@ highlighting, threading, and PGP. It takes some time to get used to, however. - - -Authors: --------- - Michael Elkins <me@cs.hmc.edu> - Thomas Roessler <roessler@does-not-exist.org> - %prep %setup -q -n mutt-%version %patch @@ -84,9 +74,6 @@ %patch7 -p0 %patch8 -p0 %patch9 -p1 -%patch10 -p0 -%patch11 -p0 -%patch12 -p1 cp doc/Muttrc Muttrc.SuSE cp %{S:2} . @@ -168,6 +155,7 @@ %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/mutt.png %_mandir/man1/mutt.1.gz +%_mandir/man1/smime_keys.1.gz %_mandir/man5/mmdf_mutt.5.gz %_mandir/man5/muttrc.5.gz %_mandir/man5/mbox_mutt.5.gz ++++++ mutt-1.5.19-opennfs.dif -> mutt-1.5.21-opennfs.dif ++++++ --- mutt/mutt-1.5.19-opennfs.dif 2009-11-25 14:04:02.000000000 +0100 +++ mutt/mutt-1.5.21-opennfs.dif 2010-11-04 15:29:28.000000000 +0100 @@ -1,6 +1,6 @@ --- Makefile.am +++ Makefile.am 2009-03-02 23:00:00.000000000 +0000 -@@ -23,7 +23,7 @@ mutt_SOURCES = \ +@@ -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 \ @@ -9,7 +9,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 \ -@@ -78,7 +78,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c +@@ -83,7 +83,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c mutt_dotlock_LDADD = @LIBOBJS@ mutt_dotlock_DEPENDENCIES = @LIBOBJS@ @@ -38,7 +38,7 @@ pgpring_OBJECTS = $(am_pgpring_OBJECTS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ -@@ -352,7 +352,7 @@ mutt_SOURCES = \ +@@ -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 \ @@ -78,11 +78,11 @@ if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 || compare_stat(&osb, &nsb) == -1) --- mbox.c -+++ mbox.c 2009-03-02 23:00:00.000000000 +0000 -@@ -767,7 +767,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int ++++ 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); + 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) @@ -90,7 +90,7 @@ if (-1 != i) --- mh.c +++ mh.c 2009-03-02 23:00:00.000000000 +0000 -@@ -252,7 +252,11 @@ static int mh_mkstemp (CONTEXT * dest, F +@@ -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++); @@ -102,7 +102,7 @@ { if (errno != EEXIST) { -@@ -1265,8 +1269,11 @@ int maildir_open_new_message (MESSAGE * +@@ -1290,8 +1294,11 @@ int maildir_open_new_message (MESSAGE * dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n", path)); @@ -117,7 +117,7 @@ { --- mutt.h +++ mutt.h 2009-03-02 23:00:00.000000000 +0000 -@@ -968,4 +968,5 @@ typedef struct +@@ -972,4 +972,5 @@ typedef struct #include "lib.h" #include "globals.h" @@ -250,7 +250,7 @@ +} --- sendlib.c +++ sendlib.c 2009-03-02 23:00:00.000000000 +0000 -@@ -2122,7 +2122,7 @@ send_msg (const char *path, char **args, +@@ -2216,7 +2216,7 @@ send_msg (const char *path, char **args, if (SendmailWait >= 0 && tempfile && *tempfile) { /* *tempfile will be opened as stdout */ ++++++ mutt-1.5.19-opennfs.dif -> mutt-1.5.21.dif ++++++ --- mutt/mutt-1.5.19-opennfs.dif 2009-11-25 14:04:02.000000000 +0100 +++ mutt/mutt-1.5.21.dif 2010-11-04 15:29:28.000000000 +0100 @@ -1,261 +1,298 @@ ---- Makefile.am -+++ Makefile.am 2009-03-02 23:00:00.000000000 +0000 -@@ -23,7 +23,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 \ -@@ -78,7 +78,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 \ -@@ -352,7 +352,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 - - 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 2009-03-02 23:00:00.000000000 +0000 -@@ -767,7 +767,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int - - /* Create a temporary file to write the new version of the mailbox in. */ - mutt_mktemp (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 -@@ -252,7 +252,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) - { -@@ -1265,8 +1269,11 @@ int maildir_open_new_message (MESSAGE * +--- configure.ac ++++ configure.ac 2007-06-01 10:57:38.000000000 +0000 +@@ -235,7 +235,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" +@@ -660,8 +660,12 @@ AC_ARG_WITH(ssl, AC_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" + +@@ -730,8 +734,12 @@ AC_ARG_WITH(sasl, AC_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:17.839926726 +0000 +@@ -575,7 +575,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 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" + + # 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 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" - 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 +@@ -870,11 +870,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 +@@ -2288,9 +2288,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 +@@ -2318,9 +2318,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 +@@ -2338,9 +2338,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 +@@ -3306,9 +3306,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 +@@ -3440,6 +3440,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 +@@ -4011,9 +4023,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 +@@ -4457,9 +4469,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 +@@ -4770,6 +4782,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 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 -@@ -968,4 +968,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 +@@ -2944,6 +2944,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 -+ -+ 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 -@@ -2122,7 +2122,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) + { "ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, M_YES }, + /* + ** .pp ++++++ mutt-1.5.20.sidebar-fix.dif -> mutt-1.5.21.sidebar-fix.dif ++++++ --- mutt/mutt-1.5.20.sidebar-fix.dif 2009-06-26 13:26:37.000000000 +0200 +++ mutt/mutt-1.5.21.sidebar-fix.dif 2010-11-04 15:29:28.000000000 +0100 @@ -1,144 +1,65 @@ ---- buffy.c -+++ buffy.c 2009-06-26 13:09:04.609901395 +0200 -@@ -334,7 +334,6 @@ int mutt_buffy_check (int force) - char path[_POSIX_PATH_MAX]; - struct stat contex_sb; - time_t t; -- CONTEXT *ctx; +--- Makefile.am ++++ Makefile.am 2010-11-04 13:51:48.432426391 +0000 +@@ -71,6 +71,7 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP O + rfc2231.h rfc822.h rfc3676.h sha1.h sort.h mime.types VERSION prepare \ + _regex.h OPS.MIX README.SECURITY remailer.c remailer.h browser.h \ + mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h \ ++ sidebar.h \ + README.SSL smime.h group.h \ + muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \ + ChangeLog mkchangelog.sh mutt_idna.h \ +--- Makefile.in ++++ Makefile.in 2010-11-04 13:54:41.299925329 +0000 +@@ -84,7 +84,7 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) ali + score.$(OBJEXT) send.$(OBJEXT) sendlib.$(OBJEXT) \ + signal.$(OBJEXT) sort.$(OBJEXT) status.$(OBJEXT) \ + system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \ +- history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \ ++ history.$(OBJEXT) lib.$(OBJEXT) sidebar.$(OBJEXT) muttlib.$(OBJEXT) \ + editmsg.$(OBJEXT) mbyte.$(OBJEXT) url.$(OBJEXT) \ + ascii.$(OBJEXT) crypt-mod.$(OBJEXT) safe_asprintf.$(OBJEXT) + am__objects_1 = +@@ -359,6 +359,7 @@ mutt_SOURCES = \ + rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ + score.c send.c sendlib.c signal.c sort.c \ + status.c system.c thread.c charset.c history.c lib.c \ ++ sidebar.c \ + muttlib.c editmsg.c mbyte.c \ + url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c - sb.st_size=0; - contex_sb.st_dev=0; -@@ -374,8 +373,6 @@ int mutt_buffy_check (int force) - - for (tmp = Incoming; tmp; tmp = tmp->next) - { -- if ( tmp->new == 1 ) -- tmp->has_new = 1; - #ifdef USE_IMAP - if (tmp->magic != M_IMAP) - #endif -@@ -427,14 +424,18 @@ int mutt_buffy_check (int force) - ) - - { -+ int check; -+ - switch (tmp->magic) +@@ -389,6 +390,7 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP O + rfc2231.h rfc822.h rfc3676.h sha1.h sort.h mime.types VERSION prepare \ + _regex.h OPS.MIX README.SECURITY remailer.c remailer.h browser.h \ + mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h \ ++ sidebar.h \ + README.SSL smime.h group.h \ + muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \ + ChangeLog mkchangelog.sh mutt_idna.h \ +--- buffy.c ++++ buffy.c 2010-11-04 13:57:02.163926692 +0000 +@@ -520,19 +520,22 @@ int mutt_buffy_check (int force) { case M_MBOX: case M_MMDF: - -- { -- if (STAT_CHECK || tmp->msgcount == 0) -+ check = STAT_CHECK; -+ -+ if (option(OPTSIDEBAR) && (check || tmp->msgcount == 0)) - { -+ CONTEXT *ctx; - BUFFY b = *tmp; - int msgcount = 0; - int msg_unread = 0; -@@ -449,11 +450,12 @@ int mutt_buffy_check (int force) - *tmp = b; - tmp->msgcount = msgcount; - tmp->msg_unread = msg_unread; -- if(STAT_CHECK) { -- tmp->has_new = tmp->new = 1; -- BuffyCount++; -- } - } -+ if(check) -+ { -+ tmp->new = 1; -+ BuffyCount++; -+ } - else if (option(OPTCHECKMBOXSIZE)) - { - /* some other program has deleted mail from the folder */ -@@ -462,7 +464,7 @@ int mutt_buffy_check (int force) - if (tmp->newly_created && - (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime)) - tmp->newly_created = 0; -- } -+ +- buffy_mbox_update (tmp); ++ if (option(OPTSIDEBAR)) ++ buffy_mbox_update (tmp); + if (buffy_mbox_hasnew (tmp, &sb) > 0) + BuffyCount++; break; case M_MAILDIR: -@@ -483,7 +485,13 @@ int mutt_buffy_check (int force) - if (*de->d_name != '.' && - (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T'))) - { -- tmp->has_new = tmp->new = 1; -+ if (!option(OPTSIDEBAR)) -+ { -+ tmp->new = 1; -+ BuffyCount++; -+ break; -+ } -+ tmp->new = 1; - tmp->msgcount++; - tmp->msg_unread++; - } -@@ -493,6 +501,9 @@ int mutt_buffy_check (int force) - - closedir (dirp); - -+ if (!option(OPTSIDEBAR)) -+ break; -+ - /* - * count read messages (for folderlist (sidebar) we also need to count - * messages in cur so that we the total number of messages -@@ -523,25 +534,25 @@ int mutt_buffy_check (int force) +- buffy_maildir_update (tmp); ++ if (option(OPTSIDEBAR)) ++ buffy_maildir_update (tmp); + if (buffy_maildir_hasnew (tmp) > 0) + BuffyCount++; break; case M_MH: -- { -- DIR *dp; -- struct dirent *de; -+ +- mh_buffy_update (tmp->path, &tmp->msgcount, &tmp->msg_unread, &tmp->msg_flagged); ++ if (option(OPTSIDEBAR)) ++ mh_buffy_update (tmp->path, &tmp->msgcount, &tmp->msg_unread, &tmp->msg_flagged); if ((tmp->new = mh_buffy (tmp->path)) > 0) BuffyCount++; -- -- if ((dp = opendir (path)) == NULL) -- break; -- tmp->msgcount = 0; -- while ((de = readdir (dp))) -- { -- if (mh_valid_message (de->d_name)) -- { -- tmp->msgcount++; -- tmp->has_new = tmp->new = 1; -- } -- } -- closedir (dp); -- } -+ if (!option(OPTSIDEBAR)) -+ break; -+ -+ if ((dirp = opendir (path)) == NULL) -+ break; -+ tmp->msgcount = 0; -+ while ((de = readdir (dirp))) -+ { -+ if (mh_valid_message (de->d_name)) -+ { -+ tmp->msgcount++; -+ tmp->new = 1; -+ } -+ } -+ closedir (dirp); -+ break; - } - } ---- buffy.h -+++ buffy.h 2009-06-26 12:47:59.000000000 +0200 -@@ -27,7 +27,6 @@ typedef struct buffy_t - struct buffy_t *next; - struct buffy_t *prev; - short new; /* mailbox has new mail */ -- short has_new; /* set it new if new and not read */ - int msgcount; /* total number of messages */ - int msg_unread; /* number of unread messages */ - int msg_flagged; /* number of flagged messages */ ++++++ mutt-1.5.20.tar.bz2 -> mutt-1.5.21.tar.bz2 ++++++ ++++ 190728 lines of diff (skipped) ++++++ patch-1.5.21.sidebar-aa6aa.txt.bz2 ++++++ ++++ 1334 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de