Hello community, here is the log from the commit of package mutt checked in at Thu Jun 21 22:44:14 CEST 2007. -------- --- mutt/mutt.changes 2007-06-01 14:03:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/mutt/mutt.changes 2007-06-21 14:05:55.188781000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 21 14:05:33 CEST 2007 - werner@suse.de + +- Update to mutt version 1.5.16 the bug fix version + +------------------------------------------------------------------- Old: ---- mutt-1.5.13-memmove.dif mutt-1.5.15.dif mutt-1.5.15.tar.bz2 patch-1.5.15.rr.compressed.2.bz2 patch-1.5.15.sidebar.20070408.txt.bz2 New: ---- mutt-1.5.16.dif mutt-1.5.16.tar.bz2 patch-1.5.16.rr.compressed.1.bz2 patch-1.5.16.sidebar.20070408.txt.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mutt.spec ++++++ --- /var/tmp/diff_new_pack.Z19226/_old 2007-06-21 22:43:58.000000000 +0200 +++ /var/tmp/diff_new_pack.Z19226/_new 2007-06-21 22:43:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package mutt (Version 1.5.15) +# spec file for package mutt (Version 1.5.16) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -23,7 +23,7 @@ # desktop selections. #Requires: desktop-data-SuSE Autoreqprov: on -Version: 1.5.15 +Version: 1.5.16 Release: 1 Summary: Mail Program BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,7 +35,7 @@ Source4: mutt.desktop Patch: %name-%version.dif # http://www.spinnaker.de/mutt/compressed/ -Patch1: patch-%version.rr.compressed.2.bz2 +Patch1: patch-%version.rr.compressed.1.bz2 Patch2: %name-1.5.9i-pgpewrap.diff Patch3: %name-1.5.9i-sendgroupreplyto.diff Patch4: %name-1.5.15-wrapcolumn.diff @@ -44,7 +44,6 @@ Patch6: patch-%version.sidebar.20070408.txt.bz2 Patch7: mutt-1.5.15.sidebar-fix.dif Patch8: mutt-1.5.15-opennfs.dif -Patch9: mutt-1.5.13-memmove.dif %description A very powerful mail user agent. It supports (among other nice things) @@ -69,12 +68,12 @@ %patch6 -p1 %patch7 -p0 %patch8 -p0 -%patch9 -p0 cp Muttrc Muttrc.SuSE cp %{S:2} . %build autoreconf -fi +CC=gcc CFLAGS="-Wall $RPM_OPT_FLAGS -I. -D_GNU_SOURCE -fno-strict-aliasing" %if %suse_version > 1000 CFLAGS="$CFLAGS -fstack-protector" @@ -159,6 +158,8 @@ %config(noreplace) /etc/Muttrc %changelog +* Thu Jun 21 2007 - werner@suse.de +- Update to mutt version 1.5.16 the bug fix version * Fri Jun 01 2007 - werner@suse.de - Update to mutt version 1.5.15 due CVE-2007-1558 (bug #279843) * Wed May 16 2007 - werner@suse.de ++++++ mutt-1.5.13-memmove.dif -> mutt-1.5.16.dif ++++++ --- mutt/mutt-1.5.13-memmove.dif 2007-05-16 11:27:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/mutt/mutt-1.5.16.dif 2007-06-12 12:05:04.468809000 +0200 @@ -1,13 +1,282 @@ ---- muttlib.c -+++ muttlib.c 2007-05-16 09:26:24.607110614 +0000 -@@ -537,8 +537,8 @@ char *mutt_gecos_name (char *dest, size_ - if (dest[idx] == '&') - { - memmove (&dest[idx + pwnl], &dest[idx + 1], -- MAX(destlen - idx - pwnl - 1, 0)); -- memcpy (&dest[idx], pw->pw_name, MIN(destlen - idx - 1, pwnl)); -+ MAX((ssize_t)(destlen - idx - pwnl - 1), 0)); -+ memcpy (&dest[idx], pw->pw_name, MIN((ssize_t)(destlen - idx - 1), pwnl)); - dest[idx] = toupper ((unsigned char) dest[idx]); +--- Muttrc ++++ Muttrc 2007-06-01 12:55:02.004189000 +0200 +@@ -18,7 +18,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/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" +@@ -333,9 +333,9 @@ attachments -I message/external-body + # in a reply. For a full listing of defined printf()-like sequences see + # the section on ``$index_format''. + # +-# +-# set autoedit=no +-# ++ ++set autoedit=yes ++ + # Name: autoedit + # Type: boolean + # Default: no +@@ -709,11 +709,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 +@@ -1981,9 +1981,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 +@@ -2007,9 +2007,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 +@@ -2027,9 +2027,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 +@@ -3450,9 +3450,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 +@@ -3583,6 +3583,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 +@@ -3837,9 +3849,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 +@@ -4135,9 +4147,9 @@ attachments -I message/external-body + # messages to be searched are decoded before searching. If unset, + # messages are searched as they appear in the folder. + # +-# +-# set tilde=no +-# ++ ++set tilde=yes ++ + # Name: tilde + # Type: boolean + # Default: no +@@ -4405,3 +4417,39 @@ 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''. ++# ++# +--- Muttrc.head ++++ Muttrc.head 2007-06-01 12:51:03.642800000 +0200 +@@ -18,7 +18,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" +--- configure.ac ++++ configure.ac 2007-06-01 12:57:38.328822000 +0200 +@@ -225,7 +225,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" +@@ -642,8 +642,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" + +@@ -698,8 +702,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" +--- init.h ++++ init.h 2006-08-17 19:07:25.000000000 +0200 +@@ -1960,6 +1960,9 @@ struct option_t MuttVars[] = { + ** since it would otherwise have to abort the connection anyway. This + ** option supersedes ``$$ssl_starttls''. + */ ++#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 +--- doc/Makefile.in ++++ doc/Makefile.in 2007-06-12 12:04:49.827249163 +0200 +@@ -436,7 +436,7 @@ uninstall-local: + + check: + manual.txt: manual.html +- -lynx -dump -nolist -with_backspaces $^ > $@ || \ ++ -lynx -dont_wrap_pre -center -dump -nolist -with_backspaces $^ > $@ || \ + w3m -dump $^ > $@ || \ + elinks -dump -no-numbering -no-references $^ > $@ + +--- imap/auth.c ++++ imap/auth.c 2006-11-09 16:19:56.000000000 +0100 +@@ -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 + while (authenticator->authenticate) + { + if (!authenticator->method || +@@ -85,6 +102,9 @@ int imap_authenticate (IMAP_DATA* idata) + + authenticator++; + } ++#ifdef USE_SASL ++ } ++#endif } - } + + FREE (&methods); ++++++ mutt-1.5.15.tar.bz2 -> mutt-1.5.16.tar.bz2 ++++++ ++++ 85708 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org