OBS User unknown 2007-06-03 19:54:37 +00:00 committed by Git OBS Bridge
parent 0b1899d15d
commit cffaf89114
13 changed files with 129 additions and 280 deletions

View File

@ -1,162 +0,0 @@
2005-05-09 12:27:44 Manfred Hollstein <mh@novell.com>
* globals.h (WrapColumn): Add new global variable.
* init.h (MuttVars): Likewise.
* init.c (mutt_init): Add warning message about deprecation of
wrapmargin variable in favour of new wrapcolumn. Map uses of
wrapmargin onto corresponding settings for wrapcolumn.
* handler.c (text_enriched_handler): Initialize .WrapMargin field
under consideration of the new variable WrapColumn.
(text_plain_flowed_handler): Likewise for flowed_max.
* pager.c (format_line): Likewise for wrap_cols.
* Muttrc, doc/manual.sgml: Add documentation for new variable.
* doc/manual*.html, doc/manual.txt, doc/muttrc.man: Regenerate.
--- mutt-1.5.11/Muttrc
+++ mutt-1.5.11/Muttrc 2006-06-28 19:52:05.000000000 +0200
@@ -4103,6 +4103,21 @@ set tilde=yes
# unset, searches will not wrap.
#
#
+# set wrapcolumn=0
+#
+# Name: wrapcolumn
+# Type: number
+# Default: 0
+#
+#
+# Controls at which column mutt's pager does smart wrapping. If
+# set to 0, no smart wrapping is done. If set to a negative value,
+# mutt's pager wraps at screen width - absolute value (wrapcolumn);
+# if set to a positive value, it'll wrap at that column. If the
+# absolute value of wrapcolumn is larger than what the current
+# display can handle, this value is ignored.
+#
+#
# set wrapmargin=0
#
# Name: wrapmargin
@@ -4112,6 +4127,8 @@ set tilde=yes
#
# Controls the size of the margin remaining at the right side of
# the terminal when mutt's pager does smart wrapping.
+#
+# Note, this variable will be replaced by wrapcolumn in future releases.
#
#
# set write_inc=10
--- mutt-1.5.11/globals.h
+++ mutt-1.5.11/globals.h 2006-06-28 19:52:05.000000000 +0200
@@ -177,6 +177,7 @@ WHERE short ReadInc;
WHERE short SendmailWait;
WHERE short SleepTime INITVAL (1);
WHERE short Timeout;
+WHERE short WrapColumn;
WHERE short WrapMargin;
WHERE short WriteInc;
--- mutt-1.5.11/handler.c
+++ mutt-1.5.11/handler.c 2006-06-28 19:52:05.000000000 +0200
@@ -780,7 +780,12 @@ int text_enriched_handler (BODY *a, STAT
memset (&stte, 0, sizeof (stte));
stte.s = s;
- stte.WrapMargin = ((s->flags & M_DISPLAY) ? (COLS-4) : ((COLS-4)<72)?(COLS-4):72);
+ if (WrapColumn > 0)
+ stte.WrapMargin = ((s->flags & M_DISPLAY) ? (MIN (COLS-4, WrapColumn)) : ((MIN (COLS-4, WrapColumn))<72)?(MIN (COLS-4, WrapColumn)):72);
+ else if (WrapColumn < 0)
+ stte.WrapMargin = ((s->flags & M_DISPLAY) ? (COLS-WrapColumn) : ((COLS-WrapColumn)<72)?(COLS-WrapColumn):72);
+ if (WrapColumn == 0 || stte.WrapMargin < 0)
+ stte.WrapMargin = ((s->flags & M_DISPLAY) ? (COLS-4) : ((COLS-4)<72)?(COLS-4):72);
stte.line_max = stte.WrapMargin * 4;
stte.line = (char *) safe_calloc (1, stte.line_max + 1);
stte.param = (char *) safe_calloc (1, STRING);
@@ -996,8 +1001,15 @@ static int text_plain_flowed_handler (BO
if ((flowed_max = FLOWED_MAX) > COLS - 3)
flowed_max = COLS - 3;
- if (flowed_max > COLS - WrapMargin)
- flowed_max = COLS - WrapMargin;
+ if (WrapColumn > 0)
+ {
+ if (flowed_max > WrapColumn)
+ flowed_max = WrapColumn;
+ }
+ else if (WrapColumn < 0)
+ {
+ flowed_max = COLS + WrapColumn;
+ }
if (flowed_max <= 0)
flowed_max = COLS;
--- mutt-1.5.11/init.c
+++ mutt-1.5.11/init.c 2006-06-28 19:52:05.000000000 +0200
@@ -2476,6 +2476,25 @@ void mutt_init (int skip_sys_rc, LIST *c
exit (1);
}
+ if (WrapMargin != 0)
+ {
+ fputs ("wrapmargin: Usage of this variable is deprecated. It will be replaced by\n", stderr);
+ fputs (" ``wrapcolumn'' in future releases. Please read the documentation and change\n", stderr);
+ fputs (" your muttrc files accordingly.\n", stderr);
+ if (WrapColumn != 0)
+ {
+ fputs (" You defined both ``wrapmargin'' and ``wrapcolumn'' in your muttrc files.\n", stderr);
+ fputs (" The setting of ``wrapmargin'' will be ignored.\n", stderr);
+ }
+ need_pause = 1;
+
+ if (WrapColumn == 0) /* Map wrapmargin's settings onto wrapcolumn. */
+ WrapColumn = -WrapMargin;
+ /* Ignore any wrap-points outside of the display's width. */
+ if (WrapColumn > COLS || -WrapColumn > COLS)
+ WrapColumn = 0;
+ }
+
if (mutt_execute_commands (commands) != 0)
need_pause = 1;
--- mutt-1.5.11/init.h
+++ mutt-1.5.11/init.h 2006-06-28 19:52:05.000000000 +0200
@@ -2876,11 +2876,23 @@ struct option_t MuttVars[] = {
** When set, searches will wrap around the first (or last) message. When
** unset, searches will not wrap.
*/
+ { "wrapcolumn", DT_NUM, R_PAGER, UL &WrapColumn, 0 },
+ /*
+ ** .pp
+ ** Controls at which column mutt's pager does smart wrapping. If
+ ** set to 0, no smart wrapping is done. If set to a negative value,
+ ** mutt's pager wraps at screen width - absolute value (wrapcolumn);
+ ** if set to a positive value, it'll wrap at that column. If the
+ ** absolute value of wrapcolumn is larger than what the current
+ ** display can handle, this value is ignored.
+ */
{ "wrapmargin", DT_NUM, R_PAGER, UL &WrapMargin, 0 },
/*
** .pp
** Controls the size of the margin remaining at the right side of
** the terminal when mutt's pager does smart wrapping.
+ ** .pp
+ ** Note, wrapmargin will be replaced by wrapcolumn in future releases.
*/
{ "write_inc", DT_NUM, R_NONE, UL &WriteInc, 10 },
/*
--- mutt-1.5.11/pager.c
+++ mutt-1.5.11/pager.c 2006-06-28 19:52:05.000000000 +0200
@@ -1065,8 +1065,12 @@ static int format_line (struct line_t **
int ch, vch, k, last_special = -1, special = 0, t;
wchar_t wc;
mbstate_t mbstate;
-
- int wrap_cols = COLS - WrapMargin;
+ int wrap_cols;
+
+ if (WrapColumn <= 0)
+ wrap_cols = COLS + WrapColumn;
+ else if (WrapColumn > 0)
+ wrap_cols = MIN (WrapColumn, COLS);
if (wrap_cols <= 0)
wrap_cols = COLS;

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d86a22066701a6840ab7dfe2cce4d0812748f17d2fc175ffc3a72d9c77e35088
size 2397908

View File

@ -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)

View File

@ -0,0 +1,12 @@
--- init.h
+++ init.h 2007-06-01 13:18:51.045205100 +0200
@@ -2959,7 +2959,8 @@ struct option_t MuttVars[] = {
** When set, mutt will weed headers when displaying, forwarding,
** printing, or replying to messages.
*/
- { "wrap", DT_NUM, R_PAGER, UL &Wrap, 0 },
+ { "wrap", DT_NUM, R_PAGER, UL &Wrap, 0 },
+ { "wrapcolumn", DT_SYN, R_NONE, UL "wrap", 0 },
/*
** .pp
** When set to a positive value, mutt will wrap text at $$wrap characters.

View File

@ -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-
@@ -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"
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

View File

@ -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 */

3
mutt-1.5.15.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f60f40aee3543ff31617534bfeec51de51044eac5b1ac96339fe297dd8dae45c
size 2340986

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jun 1 14:03:12 CEST 2007 - werner@suse.de
- Update to mutt version 1.5.15 due CVE-2007-1558 (bug #279843)
-------------------------------------------------------------------
Wed May 16 11:29:09 CEST 2007 - werner@suse.de

View File

@ -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 @@ Requires: smtp_daemon
# 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 @@ Source3: mutt.png
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 @@ Authors:
%patch1 -p1
%patch2 -p0
%patch3 -p1
%patch4 -p1
%patch4 -p0
%patch5 -p1
%patch6 -p1
%patch7 -p0
@ -159,6 +159,8 @@ rm -rf $RPM_BUILD_ROOT
%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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9b2277cc35b9ba3fcca913ccf919e8896ccf540b17348218a6d2c41ceed976fb
size 10151

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:65f683c9cf0367408a9181ce407203a6b78747c32947597af3f7935f92d15eb0
size 11552

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e14f6fc50381bb40cd673f12426baaf8d6096687ac7038cfb88d7924aaf49f51
size 10182

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:250e630a02013c5b162976e7f3c9c01cbc92b92f6c43cfba5678564f199c597e
size 11416