Hello community,
here is the log from the commit of package mutt
checked in at Sun Jun 3 21:54:36 CEST 2007.
--------
--- mutt/mutt.changes 2007-05-16 11:30:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/mutt/mutt.changes 2007-06-01 14:03:56.538772000 +0200
@@ -1,0 +2,5 @@
+Fri Jun 1 14:03:12 CEST 2007 - werner@suse.de
+
+- Update to mutt version 1.5.15 due CVE-2007-1558 (bug #279843)
+
+-------------------------------------------------------------------
Old:
----
mutt-1.5.11-wrapcolumn.diff
mutt-1.5.13.dif
mutt-1.5.13-opennfs.dif
mutt-1.5.13.sidebar-fix.dif
mutt-1.5.13.tar.bz2
patch-1.5.13.rr.compressed.1.bz2
patch-1.5.13.sidebar.20061023.txt.bz2
New:
----
mutt-1.5.15.dif
mutt-1.5.15-opennfs.dif
mutt-1.5.15.sidebar-fix.dif
mutt-1.5.15.tar.bz2
mutt-1.5.15-wrapcolumn.diff
patch-1.5.15.rr.compressed.2.bz2
patch-1.5.15.sidebar.20070408.txt.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mutt.spec ++++++
--- /var/tmp/diff_new_pack.y28775/_old 2007-06-03 21:52:23.000000000 +0200
+++ /var/tmp/diff_new_pack.y28775/_new 2007-06-03 21:52:23.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package mutt (Version 1.5.13)
+# spec file for package mutt (Version 1.5.15)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -23,8 +23,8 @@
# desktop selections.
#Requires: desktop-data-SuSE
Autoreqprov: on
-Version: 1.5.13
-Release: 66
+Version: 1.5.15
+Release: 1
Summary: Mail Program
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# ftp://ftp.mutt.org/mutt/devel/
@@ -35,15 +35,15 @@
Source4: mutt.desktop
Patch: %name-%version.dif
# http://www.spinnaker.de/mutt/compressed/
-Patch1: patch-%version.rr.compressed.1.bz2
+Patch1: patch-%version.rr.compressed.2.bz2
Patch2: %name-1.5.9i-pgpewrap.diff
Patch3: %name-1.5.9i-sendgroupreplyto.diff
-Patch4: %name-1.5.11-wrapcolumn.diff
+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-1.5.13.sidebar.20061023.txt.bz2
-Patch7: mutt-1.5.13.sidebar-fix.dif
-Patch8: mutt-1.5.13-opennfs.dif
+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
@@ -64,7 +64,7 @@
%patch1 -p1
%patch2 -p0
%patch3 -p1
-%patch4 -p1
+%patch4 -p0
%patch5 -p1
%patch6 -p1
%patch7 -p0
@@ -159,6 +159,8 @@
%config(noreplace) /etc/Muttrc
%changelog
+* 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
- Overflow: don't compare signed with unsigned (bug #275069)
* Fri Mar 23 2007 - rguenther@suse.de
++++++ mutt-1.5.13.dif -> mutt-1.5.15.dif ++++++
--- mutt/mutt-1.5.13.dif 2006-11-09 16:20:01.000000000 +0100
+++ /mounts/work_src_done/STABLE/mutt/mutt-1.5.15.dif 2007-06-01 12:58:20.641322000 +0200
@@ -1,26 +1,15 @@
---- Makefile.am
-+++ Makefile.am 2006-08-17 18:34:10.000000000 +0200
-@@ -54,7 +54,7 @@ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSY
-
- AM_CPPFLAGS=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(LIBGPGME_CFLAGS) -Iintl
-
--CPPFLAGS=@CPPFLAGS@ -I$(includedir)
-+CPPFLAGS=@CPPFLAGS@
-
-
- EXTRA_mutt_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
--- Muttrc
-+++ Muttrc 2006-08-17 19:01:01.000000000 +0200
++++ Muttrc 2007-06-01 12:55:02.004189493 +0200
@@ -15,7 +15,7 @@ macro index,pager \cb "<pipe-message> ur
macro attach,compose \cb "<pipe-entry> urlview<Enter>" "call urlview to extract URLs out of a message"
# Show documentation when pressing F1
--macro generic,pager <F1> "<shell-escape> less ${prefix}/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"
+-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"
-@@ -287,9 +287,9 @@ attachments -I message/external-body
+@@ -330,9 +330,9 @@ attachments -I message/external-body
# in a reply. For a full listing of defined printf()-like sequences see
# the section on ``$index_format''.
#
@@ -33,7 +22,7 @@
# Name: autoedit
# Type: boolean
# Default: no
-@@ -641,11 +641,11 @@ attachments -I message/external-body
+@@ -706,11 +706,11 @@ attachments -I message/external-body
# filtered message is read from the standard output.
#
#
@@ -47,21 +36,7 @@
#
#
# Contains the path of the mutt_dotlock (8) binary to be used by
-@@ -1438,11 +1438,11 @@ attachments -I message/external-body
- # See also: ``$to_chars''.
- #
- #
--# set ispell="/usr/bin/ispell"
-+# set ispell="ispell"
- #
- # Name: ispell
- # Type: path
--# Default: "/usr/bin/ispell"
-+# Default: "ispell"
- #
- #
- # How to invoke ispell (GNU's spell-checking software).
-@@ -1890,9 +1890,9 @@ attachments -I message/external-body
+@@ -1965,9 +1965,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.
#
@@ -74,7 +49,7 @@
# Name: pager_context
# Type: number
# Default: 0
-@@ -1916,9 +1916,9 @@ attachments -I message/external-body
+@@ -1991,9 +1991,9 @@ attachments -I message/external-body
# pager. The valid sequences are listed in the ``$index_format''
# section.
#
@@ -87,7 +62,7 @@
# Name: pager_index_lines
# Type: number
# Default: 0
-@@ -1936,9 +1936,9 @@ attachments -I message/external-body
+@@ -2011,9 +2011,9 @@ attachments -I message/external-body
# is less than pager_index_lines, then the index will only use as
# many lines as it needs.
#
@@ -100,7 +75,7 @@
# Name: pager_stop
# Type: boolean
# Default: no
-@@ -3357,9 +3357,9 @@ attachments -I message/external-body
+@@ -3434,9 +3434,9 @@ attachments -I message/external-body
# (possibly undeleted) message whenever a command that modifies the
# current message is executed.
#
@@ -113,7 +88,7 @@
# Name: reverse_alias
# Type: boolean
# Default: no
-@@ -3479,6 +3479,18 @@ attachments -I message/external-body
+@@ -3567,6 +3567,18 @@ attachments -I message/external-body
# Also see the ``$force_name'' variable.
#
#
@@ -132,9 +107,9 @@
# set score=yes
#
# Name: score
-@@ -3684,9 +3696,9 @@ attachments -I message/external-body
- # messages from the current folder. The default is to pause one second, so
- # a value of zero for this option suppresses the pause.
+@@ -3806,9 +3818,9 @@ attachments -I message/external-body
+ #
+ # Example: set smtp_authenticators="digest-md5:cram-md5"
#
-#
-# set sort=date
@@ -145,7 +120,7 @@
# Name: sort
# Type: sort order
# Default: date
-@@ -3980,9 +3992,9 @@ attachments -I message/external-body
+@@ -4104,9 +4116,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.
#
@@ -158,8 +133,8 @@
# Name: tilde
# Type: boolean
# Default: no
-@@ -4236,3 +4248,39 @@ attachments -I message/external-body
- # messages to be sent. Exim users may wish to unset this.
+@@ -4374,3 +4386,39 @@ attachments -I message/external-body
+ # in this case.
#
#
+# set xterm_icon="M%?n?AIL&ail?"
@@ -198,8 +173,8 @@
+# to the one used by ``$status_format''.
+#
+#
---- Muttrc.head.in
-+++ Muttrc.head.in 2006-08-17 18:46:05.000000000 +0200
+--- Muttrc.head
++++ Muttrc.head 2007-06-01 12:51:03.642800558 +0200
@@ -15,7 +15,7 @@ macro index,pager \cb "<pipe-message> ur
macro attach,compose \cb "<pipe-entry> urlview<Enter>" "call urlview to extract URLs out of a message"
@@ -209,9 +184,9 @@
# 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.in
-+++ configure.in 2006-08-17 18:34:10.000000000 +0200
-@@ -222,7 +222,7 @@ main ()
+--- configure.ac
++++ configure.ac 2007-06-01 12:57:38.328822596 +0200
+@@ -225,7 +225,7 @@ main ()
mutt_cv_slang=$withval
if test -d $withval/include/slang; then
CPPFLAGS="$CPPFLAGS -I${withval}/include/slang"
@@ -220,20 +195,20 @@
CPPFLAGS="$CPPFLAGS -I${withval}/include"
fi
LDFLAGS="$LDFLAGS -L${withval}/lib"
-@@ -633,8 +633,12 @@ AC_ARG_WITH(ssl, AC_HELP_STRING([--with-
-
- 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"
+@@ -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"
-@@ -688,8 +692,12 @@ AC_ARG_WITH(sasl, AC_HELP_STRING([--with
+@@ -698,8 +702,12 @@ AC_ARG_WITH(sasl, AC_HELP_STRING([--with
if test "$with_sasl" != "yes"
then
@@ -248,7 +223,7 @@
saved_LIBS="$LIBS"
--- init.h
+++ init.h 2006-08-17 19:07:25.000000000 +0200
-@@ -1951,6 +1951,9 @@ struct option_t MuttVars[] = {
+@@ -1952,6 +1952,9 @@ struct option_t MuttVars[] = {
** since it would otherwise have to abort the connection anyway. This
** option supersedes ``$$ssl_starttls''.
*/
@@ -260,7 +235,7 @@
** .pp
--- doc/Makefile.in
+++ doc/Makefile.in 2006-08-17 18:34:10.000000000 +0200
-@@ -431,7 +431,7 @@ uninstall-local:
+@@ -435,7 +435,7 @@ uninstall-local:
check:
manual.txt: manual.html
++++++ mutt-1.5.13-opennfs.dif -> mutt-1.5.15-opennfs.dif ++++++
--- mutt/mutt-1.5.13-opennfs.dif 2006-10-10 14:29:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/mutt/mutt-1.5.15-opennfs.dif 2007-06-01 13:47:55.424705000 +0200
@@ -7,9 +7,9 @@
- 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 \
+ rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
score.c send.c sendlib.c signal.c sort.c \
-@@ -86,7 +86,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c
+@@ -87,7 +87,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c
mutt_dotlock_LDADD = @LIBOBJS@
mutt_dotlock_DEPENDENCIES = @LIBOBJS@
@@ -20,7 +20,7 @@
--- Makefile.in
+++ Makefile.in 2006-10-06 18:28:50.000000000 +0200
-@@ -80,7 +80,7 @@ am_mutt_OBJECTS = $(am__objects_1) addrb
+@@ -81,7 +81,7 @@ am_mutt_OBJECTS = $(am__objects_1) addrb
group.$(OBJEXT) handler.$(OBJEXT) hash.$(OBJEXT) \
hdrline.$(OBJEXT) headers.$(OBJEXT) help.$(OBJEXT) \
hook.$(OBJEXT) keymap.$(OBJEXT) main.$(OBJEXT) mbox.$(OBJEXT) \
@@ -29,7 +29,7 @@
parse.$(OBJEXT) pattern.$(OBJEXT) postpone.$(OBJEXT) \
query.$(OBJEXT) recvattach.$(OBJEXT) recvcmd.$(OBJEXT) \
rfc822.$(OBJEXT) rfc1524.$(OBJEXT) rfc2047.$(OBJEXT) \
-@@ -101,7 +101,7 @@ pgpewrap_LDADD = $(LDADD)
+@@ -103,7 +103,7 @@ pgpewrap_LDADD = $(LDADD)
pgpewrap_DEPENDENCIES = @LIBOBJS@
am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) \
lib.$(OBJEXT) extlib.$(OBJEXT) sha1.$(OBJEXT) md5c.$(OBJEXT) \
@@ -38,37 +38,48 @@
pgpring_OBJECTS = $(am_pgpring_OBJECTS)
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(bin_SCRIPTS)
-@@ -301,7 +301,7 @@ mutt_SOURCES = $(BUILT_SOURCES) \
+@@ -307,7 +307,7 @@ mutt_SOURCES = $(BUILT_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 \
+ rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
score.c send.c sendlib.c signal.c sort.c \
--- lib.c
-+++ lib.c 2006-10-06 18:06:57.000000000 +0200
-@@ -46,6 +46,7 @@
++++ lib.c 2007-06-01 13:42:16.024606624 +0200
+@@ -48,6 +48,7 @@
#define EX_OK 0
#endif
+#include "mutt.h"
#include "lib.h"
- static struct sysexits
-@@ -486,7 +487,7 @@ int safe_open (const char *path, int fla
+
+@@ -562,6 +563,10 @@ int safe_open (const char *path, int fla
struct stat osb, nsb;
int fd;
-- if ((fd = open (path, flags, 0600)) < 0)
++#if defined(__linux__)
+ if ((fd = opennfs (path, flags, 0600)) < 0)
- return fd;
++ return fd;
++#else
+ if (flags & O_EXCL)
+ {
+ char safe_file[_POSIX_PATH_MAX];
+@@ -585,7 +590,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 2006-10-06 18:09:47.000000000 +0200
-@@ -725,7 +725,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
+@@ -741,7 +741,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
/* Create a temporary file to write the new version of the mailbox in. */
mutt_mktemp (tempfile);
@@ -78,28 +89,35 @@
{
if (-1 != i)
--- mh.c
-+++ mh.c 2006-10-06 18:01:07.000000000 +0200
-@@ -206,7 +206,7 @@ static int mh_mkstemp (CONTEXT * dest, F
++++ mh.c 2007-06-01 13:47:48.892011435 +0200
+@@ -238,7 +238,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 ((fd = open (path, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1)
++#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)
{
-@@ -1137,7 +1137,7 @@ int maildir_open_new_message (MESSAGE *
+@@ -1208,8 +1212,11 @@ int maildir_open_new_message (MESSAGE *
+
dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n",
path));
-
-- if ((fd = open (path, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1)
+-
++#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)
{
--- mutt.h
+++ mutt.h 2006-10-06 17:58:56.000000000 +0200
-@@ -929,4 +929,5 @@ typedef struct
+@@ -971,4 +971,5 @@ typedef struct
#include "lib.h"
#include "globals.h"
@@ -232,8 +250,8 @@
+}
--- sendlib.c
+++ sendlib.c 2006-10-06 18:03:56.000000000 +0200
-@@ -1799,7 +1799,7 @@ send_msg (const char *path, char **args,
- if (SendmailWait >= 0)
+@@ -2022,7 +2022,7 @@ send_msg (const char *path, char **args,
+ if (SendmailWait >= 0 && tempfile)
{
/* *tempfile will be opened as stdout */
- if (open (*tempfile, O_WRONLY | O_APPEND | O_CREAT | O_EXCL, 0600) < 0)
++++++ mutt-1.5.13.sidebar-fix.dif -> mutt-1.5.15.sidebar-fix.dif ++++++
--- mutt/mutt-1.5.13.sidebar-fix.dif 2006-11-16 12:31:35.000000000 +0100
+++ /mounts/work_src_done/STABLE/mutt/mutt-1.5.15.sidebar-fix.dif 2007-06-01 13:37:57.605027000 +0200
@@ -1,6 +1,6 @@
--- buffy.c
-+++ buffy.c 2006-11-16 11:26:51.000000000 +0000
-@@ -267,7 +267,7 @@
++++ buffy.c 2007-06-01 13:37:02.671160950 +0200
+@@ -259,7 +259,7 @@ int mutt_buffy_check (int force)
char path[_POSIX_PATH_MAX];
struct stat contex_sb;
time_t t;
@@ -9,7 +9,7 @@
#ifdef USE_IMAP
/* update postponed count as well, on force */
if (force)
-@@ -302,8 +302,6 @@
+@@ -294,8 +294,6 @@ int mutt_buffy_check (int force)
for (tmp = Incoming; tmp; tmp = tmp->next)
{
@@ -18,7 +18,7 @@
#ifdef USE_IMAP
if (tmp->magic != M_IMAP)
#endif
-@@ -357,14 +355,18 @@
+@@ -347,14 +345,18 @@ int mutt_buffy_check (int force)
)
{
@@ -36,10 +36,10 @@
+ if (option(OPTSIDEBAR) && (check || tmp->msgcount == 0))
{
+ CONTEXT *ctx;
- BUFFY b = *tmp;
+ BUFFY b = *tmp;
int msgcount = 0;
int msg_unread = 0;
-@@ -379,10 +381,11 @@
+@@ -369,21 +371,22 @@ int mutt_buffy_check (int force)
*tmp = b;
tmp->msgcount = msgcount;
tmp->msg_unread = msg_unread;
@@ -53,12 +53,11 @@
+ BuffyCount++;
+ tmp->new = 1;
}
- #ifdef BUFFY_SIZE
- else
-@@ -391,11 +394,11 @@
+ else if (option(OPTCHECKMBOXSIZE))
+ {
+ /* some other program has deleted mail from the folder */
tmp->size = (long) sb.st_size;
}
- #endif
- if (tmp->newly_created &&
- (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime))
- tmp->newly_created = 0;
@@ -72,7 +71,7 @@
case M_MAILDIR:
-@@ -414,16 +417,25 @@
+@@ -402,16 +405,25 @@ int mutt_buffy_check (int force)
if (*de->d_name != '.' &&
(!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
{
@@ -100,7 +99,7 @@
/*
* count read messages (for folderlist (sidebar) we also need to count
* messages in cur so that we the total number of messages
-@@ -447,25 +459,25 @@
+@@ -435,25 +447,25 @@ int mutt_buffy_check (int force)
break;
case M_MH:
@@ -109,7 +108,7 @@
- struct dirent *de;
- if ((tmp->new = mh_buffy (tmp->path)) > 0)
- BuffyCount++;
--
+-
- if ((dp = opendir (path)) == NULL)
- break;
- tmp->msgcount = 0;
@@ -137,8 +136,8 @@
+ if (mh_valid_message (de->d_name))
+ {
+ tmp->msgcount++;
-+ tmp->new = 1;
-+ }
++ tmp->new = 1;
++ }
+ }
+ closedir (dirp);
+
@@ -146,8 +145,8 @@
}
}
--- buffy.h
-+++ buffy.h 2006-11-16 11:26:58.000000000 +0000
-@@ -29,7 +29,6 @@
++++ buffy.h 2006-11-16 12:26:58.000000000 +0100
+@@ -27,7 +27,6 @@ typedef struct buffy_t
struct buffy_t *next;
struct buffy_t *prev;
short new; /* mailbox has new mail */
++++++ mutt-1.5.13.tar.bz2 -> mutt-1.5.15.tar.bz2 ++++++
++++ 171405 lines of diff (skipped)
++++++ mutt-1.5.11-wrapcolumn.diff -> mutt-1.5.15-wrapcolumn.diff ++++++
--- mutt/mutt-1.5.11-wrapcolumn.diff 2006-06-28 19:53:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/mutt/mutt-1.5.15-wrapcolumn.diff 2007-06-01 13:19:24.484797000 +0200
@@ -1,162 +1,12 @@
-2005-05-09 12:27:44 Manfred Hollstein