rpm/mutt
1
0
Fork 1
forked from pool/mutt
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutt?expand=0&rev=15

Browse Source
This commit is contained in:
OBS User unknown 2009-07-03 14:33:22 +00:00 committed by Git OBS Bridge
parent ed3deacaaf
commit e8174418c2
13 changed files with 209 additions and 712 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
mutt-1.5.19-msgcount.dif
View File

@ -1,109 +0,0 @@
--- buffy.c
+++ buffy.c 2009-04-21 11:10:21.738987896 +0200
@@ -181,7 +181,6 @@ int mutt_parse_mailboxes (BUFFER *path,
{
for (tmp = &Incoming; *tmp;)
{
- FREE (&((*tmp)->path));
tmp1=(*tmp)->next;
FREE (tmp); /* __FREE_CHECKED__ */
*tmp=tmp1;
@@ -216,7 +215,7 @@ int mutt_parse_mailboxes (BUFFER *path,
if (!*tmp)
{
*tmp = (BUFFY *) safe_calloc (1, sizeof (BUFFY));
- (*tmp)->path = safe_strdup (buf);
+ strfcpy ((*tmp)->path, buf, sizeof ((*tmp)->path));
(*tmp)->next = NULL;
/* it is tempting to set magic right here */
(*tmp)->magic = 0;
@@ -554,59 +553,31 @@ int mutt_buffy_notify (void)
* mutt_buffy() -- incoming folders completion routine
*
* given a folder name, this routine gives the next incoming folder with new
- * new mail.
+ * mail.
*/
void mutt_buffy (char *s, size_t slen)
{
- int count;
BUFFY *tmp = Incoming;
+ int pass, found = 0;
- mutt_expand_path (s, _POSIX_PATH_MAX);
- switch (mutt_buffy_check (0))
- {
- case 0:
-
- *s = '\0';
- break;
+ mutt_expand_path (s, slen);
- case 1:
-
- while (tmp && !tmp->new)
- tmp = tmp->next;
- if (!tmp)
- {
- *s = '\0';
- mutt_buffy_check (1); /* buffy was wrong - resync things */
- break;
- }
- strfcpy (s, tmp->path, slen);
- mutt_pretty_mailbox (s, slen);
- break;
-
- default:
-
- count = 0;
- while (count < 3)
- {
- if (mutt_strcmp (s, tmp->path) == 0)
- count++;
- else if (count && tmp->new)
- break;
- tmp = tmp->next;
- if (!tmp)
- {
- tmp = Incoming;
- count++;
+ if (mutt_buffy_check (0)) {
+ for (pass = 0; pass < 2; pass++)
+ for (tmp = Incoming; tmp; tmp = tmp->next) {
+ mutt_expand_path (tmp->path, sizeof (tmp->path));
+ if ((found || pass) && tmp->new) {
+ strfcpy (s, tmp->path, slen);
+ mutt_pretty_mailbox (s, slen);
+ return;
+ }
+ if (mutt_strcmp (s, tmp->path) == 0)
+ found = 1;
}
- }
- if (count >= 3)
- {
- *s = '\0';
- mutt_buffy_check (1); /* buffy was wrong - resync things */
- break;
- }
- strfcpy (s, tmp->path, slen);
- mutt_pretty_mailbox (s, slen);
- break;
+
+ mutt_buffy_check (1); /* buffy was wrong - resync things */
}
+
+ /* no folders with new mail */
+ *s = '\0';
}
--- buffy.h
+++ buffy.h 2009-04-21 11:10:21.738987896 +0200
@@ -22,7 +22,7 @@
typedef struct buffy_t
{
- char *path;
+ char path[_POSIX_PATH_MAX];
off_t size;
struct buffy_t *next;
struct buffy_t *prev;

140
mutt-1.5.19.sidebar-fix.dif
View File

@ -1,140 +0,0 @@
--- buffy.c
+++ buffy.c 2009-03-03 16:56:53.886429226 +0100
@@ -259,7 +259,7 @@ int mutt_buffy_check (int force)
char path[_POSIX_PATH_MAX];
struct stat contex_sb;
time_t t;
- CONTEXT *ctx;
+
#ifdef USE_IMAP
/* update postponed count as well, on force */
if (force)
@@ -294,8 +294,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
@@ -347,13 +345,18 @@ int mutt_buffy_check (int force)
)
{
+ int check;
+
switch (tmp->magic)
{
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;
@@ -368,11 +371,11 @@ int mutt_buffy_check (int force)
*tmp = b;
tmp->msgcount = msgcount;
tmp->msg_unread = msg_unread;
- if (STAT_CHECK)
+ }
+ if (check)
{
- tmp->has_new = tmp->new = 1;
BuffyCount++;
- }
+ tmp->new = 1;
}
else if (option(OPTCHECKMBOXSIZE))
{
@@ -403,7 +406,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))
+ {
+ BuffyCount++;
+ tmp->new = 1;
+ break;
+ }
+ tmp->new = 1;
tmp->msgcount++;
tmp->msg_unread++;
}
@@ -413,6 +422,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
@@ -430,8 +442,7 @@ int mutt_buffy_check (int force)
(!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
{
tmp->msgcount++;
- if (p && strchr(p + 3, 'F'))
- {
+ if (p && strchr(p + 3, 'F')) {
tmp->msg_flagged++;
}
}
@@ -440,26 +451,25 @@ int mutt_buffy_check (int force)
break;
case M_MH:
+
if ((tmp->new = mh_buffy (tmp->path)) > 0)
- {
- DIR *dp;
- struct dirent *de;
- if ((tmp->new = mh_buffy (tmp->path)) > 0)
BuffyCount++;
+ if (!option(OPTSIDEBAR))
+ break;
- if ((dp = opendir (path)) == NULL)
- break;
- tmp->msgcount = 0;
- while ((de = readdir (dp)))
+ if ((dirp = opendir (path)) == NULL)
+ break;
+ tmp->msgcount = 0;
+ while ((de = readdir (dirp)))
+ {
+ if (mh_valid_message (de->d_name))
{
- if (mh_valid_message (de->d_name))
- {
- tmp->msgcount++;
- tmp->has_new = tmp->new = 1;
- }
+ tmp->msgcount++;
+ tmp->new = 1;
}
- closedir (dp);
}
+ closedir (dirp);
+
break;
}
}
--- buffy.h
+++ buffy.h 2009-03-03 16:47:06.444002194 +0100
@@ -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 */

3
mutt-1.5.19.tar.bz2
View File

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

32
mutt-1.5.9i-sendgroupreplyto.diff → mutt-1.5.20-sendgroupreplyto.diff
View File

@ -1,8 +1,8 @@
--- mutt-1.5.9/init.h --- mutt-1.5.20/init.h
+++ mutt-1.5.9/init.h +++ mutt-1.5.20/init.h 2009-06-26 00:00:00.000000000 +0200
@@ -2305,6 +2305,13 @@ @@ -2399,6 +2399,13 @@ struct option_t MuttVars[] = {
** .pp ** .pp
** Also see the ``$$force_name'' variable. ** Also see the $$force_name variable.
*/ */
+ { "send_group_reply_to", DT_BOOL, R_NONE, OPTSENDGROUPREPLYTO, 0 }, + { "send_group_reply_to", DT_BOOL, R_NONE, OPTSENDGROUPREPLYTO, 0 },
+ /* + /*
@ -14,9 +14,9 @@
{ "score", DT_BOOL, R_NONE, OPTSCORE, 1 }, { "score", DT_BOOL, R_NONE, OPTSCORE, 1 },
/* /*
** .pp ** .pp
--- mutt-1.5.9/mutt.h --- mutt-1.5.20/mutt.h
+++ mutt-1.5.9/mutt.h +++ mutt-1.5.20/mutt.h 2009-06-26 00:00:00.000000000 +0200
@@ -419,6 +419,7 @@ @@ -417,6 +417,7 @@ enum
OPTSAVEADDRESS, OPTSAVEADDRESS,
OPTSAVEEMPTY, OPTSAVEEMPTY,
OPTSAVENAME, OPTSAVENAME,
@ -24,21 +24,21 @@
OPTSCORE, OPTSCORE,
OPTSIGDASHES, OPTSIGDASHES,
OPTSIGONTOP, OPTSIGONTOP,
--- mutt-1.5.9/send.c --- mutt-1.5.20/send.c
+++ mutt-1.5.9/send.c +++ mutt-1.5.20/send.c 2009-06-26 12:24:12.832816460 +0200
@@ -545,8 +545,16 @@ @@ -558,8 +558,16 @@ int mutt_fetch_recips (ENVELOPE *out, EN
if ((flags & SENDGROUPREPLY) && (!in->mail_followup_to || hmfupto != M_YES)) if ((flags & SENDGROUPREPLY) && (!in->mail_followup_to || hmfupto != M_YES))
{ {
/* if(!mutt_addr_is_user(in->to)) */ /* if(!mutt_addr_is_user(in->to)) */
+ if (option (OPTSENDGROUPREPLYTO)) + if (option (OPTSENDGROUPREPLYTO))
+ { + {
+ rfc822_append (&out->to, in->to); + rfc822_append (&out->to, in->to, 0);
+ rfc822_append (&out->cc, in->cc); + rfc822_append (&out->cc, in->cc, 1);
+ } + }
+ else + else
+ { + {
rfc822_append (&out->cc, in->to); rfc822_append (&out->cc, in->to, 1);
rfc822_append (&out->cc, in->cc); rfc822_append (&out->cc, in->cc, 1);
+ } + }
} }
} }

55
mutt-1.5.19.dif → mutt-1.5.20.dif
View File

@ -9,7 +9,7 @@
CPPFLAGS="$CPPFLAGS -I${withval}/include" CPPFLAGS="$CPPFLAGS -I${withval}/include"
fi fi
LDFLAGS="$LDFLAGS -L${withval}/lib" LDFLAGS="$LDFLAGS -L${withval}/lib"
@@ -656,8 +656,12 @@ AC_ARG_WITH(ssl, AC_HELP_STRING([--with- @@ -657,8 +657,12 @@ AC_ARG_WITH(ssl, AC_HELP_STRING([--with-
else else
if test "$with_ssl" != "yes" if test "$with_ssl" != "yes"
then then
@ -22,7 +22,7 @@
fi fi
saved_LIBS="$LIBS" saved_LIBS="$LIBS"
@@ -717,8 +721,12 @@ AC_ARG_WITH(sasl, AC_HELP_STRING([--with @@ -727,8 +731,12 @@ AC_ARG_WITH(sasl, AC_HELP_STRING([--with
if test "$with_sasl" != "yes" if test "$with_sasl" != "yes"
then then
@ -36,20 +36,20 @@
saved_LIBS="$LIBS" saved_LIBS="$LIBS"
--- init.h --- init.h
+++ init.h 2006-08-17 19:07:25.000000000 +0200 +++ init.h 2009-06-25 17:52:10.018401728 +0200
@@ -2138,6 +2138,9 @@ struct option_t MuttVars[] = { @@ -2929,6 +2929,9 @@ struct option_t MuttVars[] = {
** since it would otherwise have to abort the connection anyway. This ** the default from the GNUTLS library.
** option supersedes $$ssl_starttls. */
*/ # endif /* USE_SSL_GNUTLS */
+#if defined(USE_IMAP) && defined(SUSE_IMAP_FORCE_SSL) +#if defined(USE_IMAP) && defined(SUSE_IMAP_FORCE_SSL)
+ { "imap_force_ssl", DT_SYN, R_NONE, UL "ssl_force_tls", 0 }, + { "imap_force_ssl", DT_SYN, R_NONE, UL "ssl_force_tls", 0 },
+#endif +#endif
{ "ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, M_YES }, { "ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, M_YES },
/* /*
** .pp ** .pp
--- doc/Makefile.in --- doc/Makefile.in
+++ doc/Makefile.in 2009-03-03 15:58:09.281410456 +0100 +++ doc/Makefile.in 2009-03-03 15:58:09.281410456 +0100
@@ -547,7 +547,7 @@ uninstall-local: @@ -572,7 +572,7 @@ uninstall-local:
check: check:
manual.txt: manual.html manual.txt: manual.html
@ -69,9 +69,9 @@
# show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" # 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" macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
@@ -348,9 +348,9 @@ attachments -I message/external-body @@ -364,9 +364,9 @@ attachments -I message/external-body
# in a reply. For a full listing of defined printf(3)-like sequences see # unset, you must first use the <tag-prefix> function (bound to ``;''
# the section on $index_format. # by default) to make the next function apply to all tagged messages.
# #
-# -#
-# set autoedit=no -# set autoedit=no
@ -82,9 +82,9 @@
# Name: autoedit # Name: autoedit
# Type: boolean # Type: boolean
# Default: no # Default: no
@@ -437,9 +437,9 @@ attachments -I message/external-body @@ -482,9 +482,9 @@ attachments -I message/external-body
# follow these menus. The option is unset by default because many # Note: It should only be set in case Mutt isn't abled to determine the
# visual terminals don't permit making the cursor invisible. # character set used correctly.
# #
-# -#
-# set check_mbox_size=no -# set check_mbox_size=no
@ -95,7 +95,7 @@
# Name: check_mbox_size # Name: check_mbox_size
# Type: boolean # Type: boolean
# Default: no # Default: no
@@ -750,11 +750,11 @@ attachments -I message/external-body @@ -870,11 +870,11 @@ attachments -I message/external-body
# filtered message is read from the standard output. # filtered message is read from the standard output.
# #
# #
@ -109,7 +109,7 @@
# #
# #
# Contains the path of the mutt_dotlock(8) binary to be used by # Contains the path of the mutt_dotlock(8) binary to be used by
@@ -2108,9 +2108,9 @@ attachments -I message/external-body @@ -2271,9 +2271,9 @@ attachments -I message/external-body
# directly from the pager, and screen resizes cause lines longer than # directly from the pager, and screen resizes cause lines longer than
# the screen width to be badly formatted in the help menu. # the screen width to be badly formatted in the help menu.
# #
@ -122,7 +122,7 @@
# Name: pager_context # Name: pager_context
# Type: number # Type: number
# Default: 0 # Default: 0
@@ -2134,9 +2134,9 @@ attachments -I message/external-body @@ -2301,9 +2301,9 @@ attachments -I message/external-body
# pager. The valid sequences are listed in the $index_format # pager. The valid sequences are listed in the $index_format
# section. # section.
# #
@ -135,7 +135,7 @@
# Name: pager_index_lines # Name: pager_index_lines
# Type: number # Type: number
# Default: 0 # Default: 0
@@ -2154,9 +2154,9 @@ attachments -I message/external-body @@ -2321,9 +2321,9 @@ attachments -I message/external-body
# is less than $pager_index_lines, then the index will only use as # is less than $pager_index_lines, then the index will only use as
# many lines as it needs. # many lines as it needs.
# #
@ -148,7 +148,7 @@
# Name: pager_stop # Name: pager_stop
# Type: boolean # Type: boolean
# Default: no # Default: no
@@ -3678,9 +3678,9 @@ attachments -I message/external-body @@ -3286,9 +3286,9 @@ attachments -I message/external-body
# (possibly undeleted) message whenever a command that modifies the # (possibly undeleted) message whenever a command that modifies the
# current message is executed. # current message is executed.
# #
@ -161,7 +161,7 @@
# Name: reverse_alias # Name: reverse_alias
# Type: boolean # Type: boolean
# Default: no # Default: no
@@ -3812,6 +3812,18 @@ attachments -I message/external-body @@ -3420,6 +3420,18 @@ attachments -I message/external-body
# Also see the $force_name variable. # Also see the $force_name variable.
# #
# #
@ -180,7 +180,7 @@
# set score=yes # set score=yes
# #
# Name: score # Name: score
@@ -4071,9 +4083,9 @@ attachments -I message/external-body @@ -3991,9 +4003,9 @@ attachments -I message/external-body
# Setting this variable overrides the value of the $sendmail # Setting this variable overrides the value of the $sendmail
# variable. # variable.
# #
@ -193,9 +193,9 @@
# Name: sort # Name: sort
# Type: sort order # Type: sort order
# Default: date # Default: date
@@ -4382,9 +4394,9 @@ attachments -I message/external-body @@ -4437,9 +4449,9 @@ attachments -I message/external-body
# raw message received (for example quoted-printable encoded or with encoded # When set, mutt uses the date received rather than the date sent
# headers) which may lead to incorrect search results. # to thread messages by subject.
# #
-# -#
-# set tilde=no -# set tilde=no
@ -206,7 +206,7 @@
# Name: tilde # Name: tilde
# Type: boolean # Type: boolean
# Default: no # Default: no
@@ -4678,3 +4690,39 @@ attachments -I message/external-body @@ -4733,6 +4745,42 @@ attachments -I message/external-body
# in this case. # in this case.
# #
# #
@ -246,6 +246,9 @@
+# to the one used by ``$status_format''. +# to the one used by ``$status_format''.
+# +#
+# +#
# set write_inc=10
#
# Name: write_inc
--- doc/Muttrc.head --- doc/Muttrc.head
+++ doc/Muttrc.head 2007-06-01 12:51:03.642800000 +0200 +++ doc/Muttrc.head 2007-06-01 12:51:03.642800000 +0200
@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\ @@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\

144
mutt-1.5.20.sidebar-fix.dif Normal file
View File

@ -0,0 +1,144 @@
--- 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;
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)
{
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;
- }
+
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)
break;
case M_MH:
- {
- DIR *dp;
- struct dirent *de;
+
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 */

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

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

5
mutt.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jun 26 13:12:09 CEST 2009 - werner@suse.de
- Update to mutt version 1.5.20 which include last fix
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 21 11:20:19 CEST 2009 - werner@suse.de Tue Apr 21 11:20:19 CEST 2009 - werner@suse.de

418
mutt.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package mutt (Version 1.5.19) # spec file for package mutt (Version 1.5.20)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -31,8 +31,8 @@ Requires: smtp_daemon
# desktop selections. # desktop selections.
#Requires: desktop-data-SuSE #Requires: desktop-data-SuSE
AutoReqProv: on AutoReqProv: on
Version: 1.5.19 Version: 1.5.20
Release: 2 Release: 1
Summary: Mail Program Summary: Mail Program
# ftp://ftp.mutt.org/mutt/devel/ # ftp://ftp.mutt.org/mutt/devel/
Source0: %name-%version.tar.bz2 Source0: %name-%version.tar.bz2
@ -46,14 +46,13 @@ Patch: %name-%version.dif
# http://www.spinnaker.de/mutt/compressed/ # http://www.spinnaker.de/mutt/compressed/
Patch1: patch-%version.rr.compressed.1.bz2 Patch1: patch-%version.rr.compressed.1.bz2
Patch2: %name-1.5.9i-pgpewrap.diff Patch2: %name-1.5.9i-pgpewrap.diff
Patch3: %name-1.5.9i-sendgroupreplyto.diff Patch3: %name-1.5.20-sendgroupreplyto.diff
Patch4: %name-1.5.15-wrapcolumn.diff Patch4: %name-1.5.15-wrapcolumn.diff
Patch5: patch-1.5.5.1.nt.xtitles.3.ab.1 Patch5: patch-1.5.5.1.nt.xtitles.3.ab.1
# http://lunar-linux.org/index.php?page=mutt-sidebar # http://lunar-linux.org/index.php?page=mutt-sidebar
Patch6: patch-%version.sidebar.20080611.txt.bz2 Patch6: patch-%version.sidebar.20090619.txt.bz2
Patch7: mutt-1.5.19.sidebar-fix.dif Patch7: mutt-1.5.20.sidebar-fix.dif
Patch8: mutt-1.5.19-opennfs.dif Patch8: mutt-1.5.19-opennfs.dif
Patch9: mutt-1.5.19-msgcount.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir %{_sysconfdir} %global _sysconfdir %{_sysconfdir}
@ -80,7 +79,6 @@ Authors:
%patch6 -p1 %patch6 -p1
%patch7 -p0 %patch7 -p0
%patch8 -p0 %patch8 -p0
%patch9 -p0
cp doc/Muttrc Muttrc.SuSE cp doc/Muttrc Muttrc.SuSE
cp %{S:2} . cp %{S:2} .
@ -169,407 +167,3 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/Muttrc %config(noreplace) %{_sysconfdir}/Muttrc
%changelog %changelog
* Tue Apr 21 2009 werner@suse.de
- Upstream fix to make mutt showing new message count (bnc#487718)
* Tue Mar 03 2009 werner@suse.de
- updated to mutt version 1.5.19 mostly a bugfix release
- updated sidebar patch to 1.5.18.sidebar.20080611
* make it work with 1.5.19
* make sidebar-fix also work
- updated compression patch to patch-1.5.19.rr.compressed
- enable smtp support
- enable mixmaster support
- use regex(7) of glibc
* Thu Apr 10 2008 werner@suse.de
- Avoid trouble with krb5-config
* Thu Dec 20 2007 bwalle@suse.de
- updated to mutt version 1.5.17 the bug fix release
- updated sidebar patch to 1.5.17.sidebar.20071102
- updated compression patch to 1.5.17.rr.compressed.1
* Wed Dec 05 2007 ro@suse.de
- moved /etc/skel/.muttrc to this package
* Thu Sep 20 2007 werner@suse.de
- Replace handmade sidebar patch with oringnal one
- Set check_mbox_sizes to make mutt backward compatible (#326697)
- Use imap_force_ssl alias for ssl_force_tls even in 10.3
* 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
- Overflow: don't compare signed with unsigned (bug #275069)
* Fri Mar 23 2007 rguenther@suse.de
- add gdbm-devel and ncurses-devel BuildRequires
* Mon Feb 26 2007 stbinner@suse.de
- fix build by including icon and .desktop into package
* Thu Nov 16 2006 werner@suse.de
- Make sidebar fix smarter by not breaking new status (bug #221599)
* Thu Nov 09 2006 werner@suse.de
- Do security check for opening files on NFS file systems (#210159)
- Reenable SASL and GSSAPI
- Make LOGIN work even if SASL is enabled
- Make mutt use ispell again
- Update the sidebar patch
- Avoid reads of mailboxes if no sidebar is enabled (#215261)
* Fri Sep 15 2006 werner@suse.de
- Enable libgpgme (bug #203486)
* Mon Aug 28 2006 werner@suse.de
- Add sidebar patch to mutt to have the mailboxes around
- Make the old variable imap_force_ssl an alias to ssl_force_tls
for older SuSE distributions
* Thu Aug 17 2006 werner@suse.de
- Update to mutt 1.5.13
* Various fixes in imap handling
* Mon Jul 17 2006 werner@suse.de
- Update to mutt 1.5.12
* Include previous security fixes
* Fix bug in curses handling
* Better caching of mail bodies
* Remove memory leaks
* Thu Jun 29 2006 werner@suse.de
- Update to mutt 1.5.11
* Wed Jun 28 2006 werner@suse.de
- Fix mutt IMAP buffer overflow in namespace parsing (bug #188872)
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Mon Jan 16 2006 mmj@suse.de
- Compile with -fstack-protector
* Tue Nov 29 2005 sbrabec@suse.cz
- Don't package icon already present in desktop-data-SuSE.
Cleans rpm -V output.
* Mon Oct 10 2005 mmj@suse.de
- Readd -fno-strict-aliasing
* Mon Oct 03 2005 mmj@suse.de
- Signatures with no newline should not cause mutt to think
it's a changed message [#117451]
* Thu Jul 28 2005 mmj@suse.de
- Add patch to set term window title bar with the mbox name [#98557]
* Sun Jul 24 2005 mmj@suse.de
- Fix segfault with S/Mime [#87177]
* Fri Jul 08 2005 mmj@suse.de
- Remove bogus hunk from imap race fix patch
* Mon Jun 27 2005 mmj@suse.de
- Add patch from Thomas Glanzmann to fix imap crashes
* Mon May 09 2005 mmj@suse.de
- Add patch for wrapcolumn by Manfred Hollstein
* Tue Mar 15 2005 mmj@suse.de
- Update to 1.5.9
* Mon Feb 28 2005 mmj@suse.de
- Make sure a pointer is not NULL before we start referencing it
* Mon Feb 14 2005 mmj@suse.de
- Update to 1.5.8
* Fri Feb 11 2005 mmj@suse.de
- Disable inode sort due to recommendations from the header
cache developer
* Fri Feb 04 2005 mmj@suse.de
- Update header cache patch and fix build in PLUS
* Wed Feb 02 2005 mmj@suse.de
- Rename mmdf.5 -> mmdf_mutt.5 to not conflict with tin
* Tue Feb 01 2005 mmj@suse.de
- Update to 1.5.7
* Wed Jan 12 2005 mmj@suse.de
- Fix plain auth for sasl with patch from HEAD [#49573]
- Update header cache patch to latest
* Wed Nov 17 2004 mmj@suse.de
- Package pixmaps
* Sat Oct 23 2004 mmj@suse.de
- Switch heimdal-* to kerberos-devel-packages in #nfb as pr. requst
of Mr. Carsten Höger
* Tue Aug 31 2004 mmj@suse.de
- Update to a new version with bugfixes of the header cache patch
* Wed Aug 18 2004 mmj@suse.de
- Apply a new version of the header cache patch that also supports
IMAP.
* Fri Jul 02 2004 mmj@suse.de
- Using upstream fix for problem with stat() on source files
which could contain extra chars such as pipe [#42658]
* Sat Jun 05 2004 mmj@suse.de
- Enable idn support [#41456]
* Thu May 13 2004 mmj@suse.de
- Add maildir header cache patch from
Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
- Don't remove buildroot in %%install
- Don't strip when installing
* Wed Apr 21 2004 mmj@suse.de
- When requiring postfix, don't install sendmail
* Thu Apr 15 2004 mmj@suse.de
- Add the contrib/ directory to the documentation [#38955]
* Fri Mar 26 2004 mmj@suse.de
- Add # postfix to neededforbuild
* Mon Feb 16 2004 mmj@suse.de
- People are going to ask over and over again about the alternates
error, even though it's documented in the manual page, so install
/usr/share/doc/packages/mutt/README.alternates
* Wed Feb 04 2004 mmj@suse.de
- Readd cast that got lost when 99%% of a patch was merged upstream
* Wed Feb 04 2004 mmj@suse.de
- Update to 1.5.6
- Include patch from Joël Riou <joel.riou@normalesup.org> which
adds a variable config_charset that one may define in a rc file
that contains non ascii characters (aliases files for
instance). Where a rc file is sourced, the commands are
converted from this encoding, so that it works well if you are
used to working in UTF8 xterms but sometimes have to use a
latin-encoded terminal.
* Mon Nov 17 2003 mmj@suse.de
- Use rr.compressed for 1.5.5.1 from the author
* Wed Nov 05 2003 mmj@suse.de
- Update to mutt-1.5.5.1i which includes the missing files
* Wed Nov 05 2003 mmj@suse.de
- Update to mutt-1.5.5i which is the last planned development snap-
shot.
- Remove included/obsoleted patches
- Don't strip explicitly
- For now include snprintf.c and regex.c, they were forgotten in the
mutt tarball.
* Wed Oct 15 2003 mmj@suse.de
- Don't build as root
- Cleanup specfile a bit
* Thu Sep 18 2003 mmj@suse.de
- Fix head syntax [#31228]
* Tue Sep 09 2003 pthomas@suse.de
- Fix for real :(
* Tue Sep 09 2003 pthomas@suse.de
- Fix the type-punning patch.
* Thu Sep 04 2003 sndirsch@suse.de
- fixed attaching signature; ".signature" must be "~/.signature"
* Sat Aug 16 2003 adrian@suse.de
- install desktop file from kappfinder
* Fri Aug 15 2003 ro@suse.de
- changed neededforbuild: cyrus-sasl
* Wed Aug 13 2003 pthomas@suse.de
- Fix all cases of (unnecessary) type-punning, thus no need for
-fno-strict-aliasing.
- Include stdlib.h in lib.h for declaration of exit.
- Fix permissions for mutt-1.4.1i-authsasl.diff
* Wed Aug 13 2003 mmj@suse.de
- Add a better fix from Brendan Cully to fix [#25026]
- Add -fno-strict-aliasing
* Sat Jul 26 2003 kukuk@suse.de
- cryus-sasl2 was renamed to cyrus-sasl
* Wed Jul 16 2003 mmj@suse.de
- Add patch from Brendan Cully to fix DIGEST-MD5 sasl
authentication. [#25026]
* Wed Jun 11 2003 mmj@suse.de
- Rename mbox.5 to mbox_mutt.5 to avoid conflict with tin
- Use %%find_lang macro
* Mon Jun 02 2003 mmj@suse.de
- Add script from Mike Fabian to handle UTF-8 encodings back and
forth [#27140]
* Tue May 13 2003 mmj@suse.de
- Use %%defattr
- Package muttbug
* Tue Apr 15 2003 ro@suse.de
- fixed neededforbuild
* Fri Mar 21 2003 mmj@suse.de
- Update to 1.4.1 which primarily fixes the imap/utf7.c buffer-
overflow.
* Fri Jan 24 2003 mmj@suse.de
- Add --enable-buffy-size which got lost because the maintainer
kept several versions around
* Fri Jan 24 2003 mmj@suse.de
- Add patch to use sasl2 instead og sasl
* Mon Jan 06 2003 mmj@suse.de
- Below action was not A Good Thing[tm] for all, so made it a
configure option again.
* Fri Nov 15 2002 mmj@suse.de
- Fold the group reply patch in to always be default behaviour
* Fri Nov 08 2002 mmj@suse.de
- Apply fresh 1.4 compressed folder patch instead of 1.3.99 repatch
* Sat Nov 02 2002 mmj@suse.de
- Better version from ME of longline patch
* Fri Nov 01 2002 mmj@suse.de
- Add patch from Michael Elkins to allow lines > 255 [#16030]
- Make patches have a unique name
- Trim the neededforbuild
* Fri May 31 2002 ro@suse.de
- changed neededforbuild <slang> to <slang slang-devel>
* Fri May 31 2002 mmj@suse.de
- Disabled patches that broke IMAP support.
* Wed May 29 2002 mmj@suse.de
- Updated to the next STABLE Mutt release 1.4, which includes
improved IMAP and POP support. Better maildir handling,
improved threading. And lots more, which is better summarized
on http://www.mutt.org
* Tue May 28 2002 mmj@suse.de
- Added a patch to allow longer lines [Bug #16030]
- Added a patch to allow mailboxes > 2 GB [Bug #16356]
* Tue May 14 2002 mmj@suse.de
- Added a patch from Matthias Eckermann to include the original
To: field in the new To: when doing group reply, and the boolean
'send_group_reply_to' is set.
* Fri May 03 2002 mmj@suse.de
- Update to 1.3.99 which is just bugfix release towards 1.4
* Wed Apr 03 2002 mmj@suse.de
- automake/autoconf fix. Use AC_LIBOBJ instead of LIBOBJS.
* Wed Mar 20 2002 mmj@suse.de
- Fix segfault in pgpewrap when invoked with incorrect arguments.
Fixes Bug #15213, patch from axboe@
* Wed Mar 13 2002 mmj@suse.de
- Make /etc/Muttrc %%config(noreplace)
* Wed Mar 13 2002 mmj@suse.de
- Updated to 1.3.28
* Sun Feb 24 2002 mmj@suse.de
- Re-added patches known to work very well, but that was left out
to evaluate vanilla 1.3.27i:
- Compressed folder support
- Iconv patch that fixes qp problems in multibyte locales
* Thu Feb 14 2002 schwab@suse.de
- Don't add /usr/include to include search path.
* Mon Feb 04 2002 mmj@suse.de
- Updated to newest beta-release 1.3.27
* Wed Jan 02 2002 poeml@suse.de
- add patch-1.2,3.rfc822_terminate.1 which fixes a remote
exploitable string buffer overflow
(minus hunks #8 and #10 which are already in 1.3.22.1)
* Tue Sep 18 2001 bjacke@suse.de
- fix a possible segfault for a certain search pattern
- fix a possible crash scenario when using gpg and attachments
* Tue Sep 04 2001 bjacke@suse.de
- fix some memory leaks in imap code
- fix bug where non-regular files could be attached
- po updates
* Sun Sep 02 2001 bjacke@suse.de
- update to 1.3.22.1
* Fri Aug 24 2001 bjacke@suse.de
- update to 1.3.21 which fixes some MH bugs and others
* Mon Aug 13 2001 ro@suse.de
- changed neededforbuild <sp_libs> to <sp-devel>
* Thu Jul 26 2001 bjacke@suse.de
- update to 1.3.20
- patched to speed up mbox-sort from n^2 to n*log(n)
* Sat Apr 28 2001 bjacke@suse.de
- another l10n fix
- save manuals gzipped
* Wed Apr 25 2001 mfabian@suse.de
- remove "fuzzy" in header of ja.po. When the header is marked
as "fuzzy", the charset will not be written to the .mo file
and mutt will not show Japanese messages correctly.
- don't convert string received from gettext again, the new
version of gettext already does the conversion to the charset
of the current locale.
* Thu Apr 19 2001 bjacke@suse.de
- fixed a buffer underrun
- fixed possible segfault (#6979)
- redisabled buffy fix
* Sun Mar 25 2001 bjacke@suse.de
- update to 1.3.16i
- dropped superfluous additional options patch
- add compressed folder patch
- activated buffy fix to circumvent recent NFS a-time problems
* Wed Jan 31 2001 bjacke@suse.de
- fixed version in specfile
* Thu Jan 25 2001 bjacke@suse.de
- dropped tmp patch wich did more bad than good
* Wed Jan 10 2001 bjacke@suse.de
- fixed latest fix
* Tue Jan 09 2001 bjacke@suse.de
- applied tmp file patch
- added smtp_daemon to requires
* Mon Dec 18 2000 bjacke@suse.de
- merged muttssl and mutt
* Mon Dec 11 2000 bjacke@suse.de
- enable fcntl and disable flock locking
* Tue Nov 28 2000 bjacke@suse.de
- update to 1.3.12i due to glibc 2.2 locale issues
- fixed neededforbuild (bug 4254)
- minor specfile changes
* Mon Sep 04 2000 vinil@suse.cz
- czech po file corrected
* Mon Jul 31 2000 werner@suse.de
- Update to 1.2.5i due bug fixes (IMAP, SIGSEGV in curs_main.c)
* Fri Jul 07 2000 werner@suse.de
- Update to 1.2.4i due to fixes (IMAP, SSL, ...) done in 1.2.3
and 1.2.4
* Thu Jun 29 2000 werner@suse.de
- Split spec of mutt and muttssl to avoid conflicts during build
- Use different build root to avoid mixed versions
- Update to 1.2.2i to avoid bugs in SSL code, core dumps, and
mailbox corruption
* Mon May 15 2000 werner@suse.de
- Update to new version 1.2i
* move changes to 1.2i
* enable SSL for imap
* add *.rc from contrib path to doc (samples for pgp using)
- Split mutt into mutt and muttssl
* Wed Mar 08 2000 werner@suse.de
- Disable --enable-exact-address because it fools the users by
asking questions for nothing.
* Tue Feb 22 2000 werner@suse.de
- Fix programming bug: ncurses now does what the docu says.
Therefore use_default_color() should be called only once
after start_color().
* Tue Jan 25 2000 werner@suse.de
- New version 1.0.1i with some minor bug fixes
* Tue Jan 25 2000 kasal@suse.de
- urlview moved to a new package
* Tue Jan 18 2000 werner@suse.de
- /usr/man -> /usr/share/man
- target is ${RPM_ARCH}-suse-linux and nothing more
* Tue Jan 18 2000 werner@suse.de
- New mutt version 1.0i
* patch for two letter year (e.g. 00)
- New urlview version
* A SuSE url_handler.sh script
* A SuSE urlview.conf
* Mon Oct 18 1999 garloff@suse.de
- highlight_unread sometimes didn't work. Fixed.
* Thu Oct 14 1999 garloff@suse.de
- Added contrib/Pine.rc and Mush.rc to as %%docs
* Wed Oct 13 1999 garloff@suse.de
- Two new options: "delete_tilde" and "highlight_unread".
The meaning is obvious ...
* Fri Oct 01 1999 werner@suse.de
- Added gpg in neededforbuild to get both pgp and gpg
path included into mutt.
* Tue Sep 28 1999 werner@suse.de
- Put urlview into mutt package
- Use changes Muttrc instead of my.Muttrc
* there is no variable web_browser anymore
- Require ispell to get spell feature
- A few sample muttrc and urlview(rc) for aaa_skel
* Tue Sep 28 1999 ro@suse.de
- update to 1.0pre3
* Mon Sep 13 1999 bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
* Tue Jul 20 1999 florian@suse.de
- update to 0.95.6i
* Wed Apr 14 1999 ro@suse.de
- use gettext in neededforbuilt (builtin won't work)
* Tue Apr 06 1999 ro@suse.de
- update to 0.95.4i
* Thu Dec 03 1998 bs@suse.de
- added sp and sp_libs to neededforbuild
* Wed Dec 02 1998 bs@suse.de
- use sgmtools instead of linuxdoc for build
* Wed Jul 29 1998 florian@suse.de
- add security patch
* Sun Jul 19 1998 florian@suse.de
- update to version 0.93.1i
* Thu Feb 05 1998 florian@suse.de
- update to version 0.89.1
* Thu Oct 09 1997 florian@suse.de
- update to version 0.85
* Tue May 20 1997 florian@suse.de
- update to version 0.74
* Sun Apr 13 1997 florian@suse.de
- update to new version 0.69
* Tue Jan 28 1997 florian@suse.de
- update to new version 0.59
- pgp-support is enabled
* Thu Jan 02 1997 florian@suse.de
- update to version 0.52
* Thu Jan 02 1997 florian@suse.de
- update to version 0.51
* Thu Jan 02 1997 florian@suse.de
- update to version 0.50
* Thu Jan 02 1997 florian@suse.de
- update to version 0.49
* Thu Jan 02 1997 florian@suse.de
- Neue Version 0.48.1 mit vielen Veraenderungen.
- Anpassungen fuer eine korrekte Host-Absenderadresse.
- Umstieg auf non-sgid-mail spool-Verzeichnis.
* Thu Jan 02 1997 florian@suse.de
- update to newer version
Mon Sep 2 03:06:07 MET DST 1996
new version.

3
patch-1.5.19.rr.compressed.1.bz2
View File

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

3
patch-1.5.19.sidebar.20080611.txt.bz2
View File

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

3
patch-1.5.20.rr.compressed.1.bz2 Normal file
View File

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

3
patch-1.5.20.sidebar.20090619.txt.bz2 Normal file
View File

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