pool/mutt
2
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

pulled

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=50
This commit is contained in:
Stephan Kulow 2010-11-10 08:48:26 +00:00 committed by Git OBS Bridge
parent 22344bd614
commit 75e037d5b9
16 changed files with 147 additions and 374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
mutt-1.5.20-bnc537141.dif
View File

@ -1,74 +0,0 @@
--- mutt_ssl.c
+++ mutt_ssl.c 2009-11-25 12:48:35.000000000 +0000
@@ -681,7 +681,8 @@ static int check_host (X509 *x509cert, c
subj_alt_name = sk_GENERAL_NAME_value(subj_alt_names, i);
if (subj_alt_name->type == GEN_DNS)
{
- if ((match_found = hostname_match(hostname_ascii,
+ if (mutt_strlen(subj_alt_name->d.ia5->data) == subj_alt_name->d.ia5->length &&
+ (match_found = hostname_match(hostname_ascii,
(char *)(subj_alt_name->d.ia5->data))))
{
break;
@@ -711,7 +712,9 @@ static int check_host (X509 *x509cert, c
strfcpy (err, _("cannot get certificate common name"), errlen);
goto out;
}
- match_found = hostname_match(hostname_ascii, buf);
+ if (mutt_strlen(buf) == bufsize - 1) {
+ match_found = hostname_match(hostname_ascii, buf);
+ }
}
if (!match_found)
@@ -745,6 +748,7 @@ static int ssl_cache_trusted_cert (X509
static int ssl_check_preauth (X509 *cert, const char* host)
{
char buf[SHORT_STRING];
+ int trusted = 0;
/* check session cache first */
if (check_certificate_cache (cert))
@@ -753,6 +757,13 @@ static int ssl_check_preauth (X509 *cert
return 1;
}
+ /* automatic check from user's database */
+ if (SslCertFile && check_certificate_by_digest (cert))
+ {
+ dprint (2, (debugfile, "ssl_check_preauth: digest check passed\n"));
+ trusted++;
+ }
+
buf[0] = 0;
if (host && option (OPTSSLVERIFYHOST) != M_NO)
{
@@ -760,24 +771,20 @@ static int ssl_check_preauth (X509 *cert
{
mutt_error (_("Certificate host check failed: %s"), buf);
mutt_sleep (2);
- return -1;
+ if (!trusted) /* don't fail if cert is manually trusted */
+ return -1;
}
dprint (2, (debugfile, "ssl_check_preauth: hostname check passed\n"));
}
+ if (trusted) return 1;
+
if (check_certificate_by_signer (cert))
{
dprint (2, (debugfile, "ssl_check_preauth: signer check passed\n"));
return 1;
}
- /* automatic check from user's database */
- if (SslCertFile && check_certificate_by_digest (cert))
- {
- dprint (2, (debugfile, "ssl_check_preauth: digest check passed\n"));
- return 1;
- }
-
return 0;
}

62
mutt-1.5.20-bnc559525.dif
View File

@ -1,62 +0,0 @@
--- sendlib.c
+++ sendlib.c 2009-12-02 11:35:43.095929251 +0000
@@ -1630,9 +1630,9 @@ static int fold_one_header (FILE *fp, co
dprint(4,(debugfile,"mwoh: pfx=[%s], tag=[%s], flags=%d value=[%s]\n",
pfx, tag, flags, value));
- if (fprintf (fp, "%s%s: ", NONULL (pfx), tag) < 0)
+ if (tag && *tag && fprintf (fp, "%s%s: ", NONULL (pfx), tag) < 0)
return -1;
- col = mutt_strlen (tag) + 2 + mutt_strlen (pfx);
+ col = mutt_strlen (tag) + (tag && *tag ? 2 : 0) + mutt_strlen (pfx);
while (p && *p)
{
@@ -1717,9 +1717,11 @@ static int write_one_header (FILE *fp, i
int flags)
{
char *tagbuf, *valbuf, *t;
+ int is_from = ((end - start) > 5 &&
+ ascii_strncasecmp (start, "from ", 5) == 0);
/* only pass through folding machinery if necessary for sending */
- if (!(flags & CH_DISPLAY) && pfxw + max <= wraplen)
+ if (!(flags & CH_DISPLAY) && (pfxw + max <= wraplen || is_from))
{
valbuf = mutt_substrdup (start, end);
dprint(4,(debugfile,"mwoh: buf[%s%s] short enough, "
@@ -1728,6 +1730,8 @@ static int write_one_header (FILE *fp, i
if (pfx && *pfx)
if (fputs (pfx, fp) == EOF)
return -1;
+ if (!(t = strchr (valbuf, ':')))
+ return 0;
if (print_val (fp, pfx, valbuf, flags) < 0)
{
FREE(&valbuf);
@@ -1738,10 +1742,22 @@ static int write_one_header (FILE *fp, i
else
{
t = strchr (start, ':');
- tagbuf = mutt_substrdup (start, t);
- valbuf = mutt_substrdup (t + 2, end);
+ if (t > end)
+ {
+ return 0;
+ }
+ if (is_from)
+ {
+ tagbuf = NULL;
+ valbuf = mutt_substrdup (start, end);
+ }
+ else
+ {
+ tagbuf = mutt_substrdup (start, t);
+ valbuf = mutt_substrdup (t + 2, end);
+ }
dprint(4,(debugfile,"mwoh: buf[%s%s] too long, "
- "max width = %d > %dn",
+ "max width = %d > %d\n",
NONULL(pfx), valbuf, max, wraplen));
if (fold_one_header (fp, tagbuf, valbuf, pfx, wraplen, flags) < 0)
return -1;

13
mutt-1.5.20-openssl_1.0.diff
View File

@ -1,13 +0,0 @@
Index: mutt-1.5.20/mutt_ssl.c
===================================================================
--- mutt-1.5.20.orig/mutt_ssl.c
+++ mutt-1.5.20/mutt_ssl.c
@@ -652,7 +652,7 @@ static int check_host (X509 *x509cert, c
char *buf = NULL;
int bufsize;
/* needed to get the DNS subjectAltNames: */
- STACK *subj_alt_names;
+ STACK_OF(GENERAL_NAME) *subj_alt_names;
int subj_alt_names_count;
GENERAL_NAME *subj_alt_name;
/* did we find a name matching hostname? */

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

@ -1,144 +0,0 @@
--- 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
View File

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

20
mutt-1.5.19-opennfs.dif → mutt-1.5.21-opennfs.dif
View File

@ -1,6 +1,6 @@
--- Makefile.am --- Makefile.am
+++ Makefile.am 2009-03-02 23:00:00.000000000 +0000 +++ 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 \ edit.c enter.c flags.c init.c filter.c from.c \
getdomain.c group.c \ getdomain.c group.c \
handler.c hash.c hdrline.c headers.c help.c hook.c keymap.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 \ postpone.c query.c recvattach.c recvcmd.c \
rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
score.c send.c sendlib.c signal.c sort.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_LDADD = @LIBOBJS@
mutt_dotlock_DEPENDENCIES = @LIBOBJS@ mutt_dotlock_DEPENDENCIES = @LIBOBJS@
@ -38,7 +38,7 @@
pgpring_OBJECTS = $(am_pgpring_OBJECTS) pgpring_OBJECTS = $(am_pgpring_OBJECTS)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \ 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 \ edit.c enter.c flags.c init.c filter.c from.c \
getdomain.c group.c \ getdomain.c group.c \
handler.c hash.c hdrline.c headers.c help.c hook.c keymap.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 || if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 ||
compare_stat(&osb, &nsb) == -1) compare_stat(&osb, &nsb) == -1)
--- mbox.c --- mbox.c
+++ mbox.c 2009-03-02 23:00:00.000000000 +0000 +++ mbox.c 2010-11-04 14:01:04.775926675 +0000
@@ -767,7 +767,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int @@ -782,7 +782,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
/* Create a temporary file to write the new version of the mailbox in. */ /* 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 = open (tempfile, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1 ||
+ if ((i = opennfs (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) (fp = fdopen (i, "w")) == NULL)
@ -90,7 +90,7 @@
if (-1 != i) if (-1 != i)
--- mh.c --- mh.c
+++ mh.c 2009-03-02 23:00:00.000000000 +0000 +++ 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", snprintf (path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%d",
dest->path, NONULL (Hostname), (int) getpid (), Counter++); dest->path, NONULL (Hostname), (int) getpid (), Counter++);
@ -102,7 +102,7 @@
{ {
if (errno != EEXIST) 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", dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n",
path)); path));
@ -117,7 +117,7 @@
{ {
--- mutt.h --- mutt.h
+++ mutt.h 2009-03-02 23:00:00.000000000 +0000 +++ 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 "lib.h"
#include "globals.h" #include "globals.h"
@ -250,7 +250,7 @@
+} +}
--- sendlib.c --- sendlib.c
+++ sendlib.c 2009-03-02 23:00:00.000000000 +0000 +++ 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) if (SendmailWait >= 0 && tempfile && *tempfile)
{ {
/* *tempfile will be opened as stdout */ /* *tempfile will be opened as stdout */

84
mutt-1.5.20.dif → mutt-1.5.21.dif
View File

@ -1,6 +1,6 @@
--- configure.ac --- configure.ac
+++ configure.ac 2007-06-01 12:57:38.328822000 +0200 +++ configure.ac 2007-06-01 10:57:38.000000000 +0000
@@ -234,7 +234,7 @@ main () @@ -235,7 +235,7 @@ main ()
mutt_cv_slang=$withval mutt_cv_slang=$withval
if test -d $withval/include/slang; then if test -d $withval/include/slang; then
CPPFLAGS="$CPPFLAGS -I${withval}/include/slang" CPPFLAGS="$CPPFLAGS -I${withval}/include/slang"
@ -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"
@@ -657,8 +657,12 @@ AC_ARG_WITH(ssl, AC_HELP_STRING([--with- @@ -660,8 +660,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"
@@ -727,8 +731,12 @@ AC_ARG_WITH(sasl, AC_HELP_STRING([--with @@ -730,8 +734,12 @@ AC_ARG_WITH(sasl, AC_HELP_STRING([--with
if test "$with_sasl" != "yes" if test "$with_sasl" != "yes"
then then
@ -35,31 +35,30 @@
fi fi
saved_LIBS="$LIBS" saved_LIBS="$LIBS"
--- init.h
+++ init.h 2009-06-25 17:52:10.018401728 +0200
@@ -2929,6 +2929,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
{ "ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, M_YES },
/*
** .pp
--- doc/Makefile.in --- doc/Makefile.in
+++ doc/Makefile.in 2009-03-03 15:58:09.281410456 +0100 +++ doc/Makefile.in 2010-11-04 13:01:17.839926726 +0000
@@ -572,7 +572,7 @@ uninstall-local: @@ -575,7 +575,7 @@ uninstall-local:
check: check:
manual.txt: manual.html manual.txt: manual.html
- -LC_ALL=C lynx -dump -nolist -with_backspaces 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 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 w3m -dump manual.html > $@ || \
LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@ 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
+++ doc/Muttrc 2009-03-03 15:56:32.904001949 +0100 +++ doc/Muttrc 2009-03-03 14:56:33.000000000 +0000
@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\ @@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
"call urlview to extract URLs out of a message" "call urlview to extract URLs out of a message"
@ -83,7 +82,7 @@
# Type: boolean # Type: boolean
# Default: no # Default: no
@@ -482,9 +482,9 @@ attachments -I message/external-body @@ -482,9 +482,9 @@ attachments -I message/external-body
# Note: It should only be set in case Mutt isn't abled to determine the # Note: It should only be set in case Mutt isn't able to determine the
# character set used correctly. # character set used correctly.
# #
-# -#
@ -109,7 +108,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
@@ -2271,9 +2271,9 @@ attachments -I message/external-body @@ -2288,9 +2288,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 +121,7 @@
# Name: pager_context # Name: pager_context
# Type: number # Type: number
# Default: 0 # Default: 0
@@ -2301,9 +2301,9 @@ attachments -I message/external-body @@ -2318,9 +2318,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 +134,7 @@
# Name: pager_index_lines # Name: pager_index_lines
# Type: number # Type: number
# Default: 0 # Default: 0
@@ -2321,9 +2321,9 @@ attachments -I message/external-body @@ -2338,9 +2338,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 +147,7 @@
# Name: pager_stop # Name: pager_stop
# Type: boolean # Type: boolean
# Default: no # Default: no
@@ -3286,9 +3286,9 @@ attachments -I message/external-body @@ -3306,9 +3306,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 +160,7 @@
# Name: reverse_alias # Name: reverse_alias
# Type: boolean # Type: boolean
# Default: no # Default: no
@@ -3420,6 +3420,18 @@ attachments -I message/external-body @@ -3440,6 +3440,18 @@ attachments -I message/external-body
# Also see the $force_name variable. # Also see the $force_name variable.
# #
# #
@ -180,7 +179,7 @@
# set score=yes # set score=yes
# #
# Name: score # Name: score
@@ -3991,9 +4003,9 @@ attachments -I message/external-body @@ -4011,9 +4023,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,7 +192,7 @@
# Name: sort # Name: sort
# Type: sort order # Type: sort order
# Default: date # Default: date
@@ -4437,9 +4449,9 @@ attachments -I message/external-body @@ -4457,9 +4469,9 @@ attachments -I message/external-body
# When set, mutt uses the date received rather than the date sent # When set, mutt uses the date received rather than the date sent
# to thread messages by subject. # to thread messages by subject.
# #
@ -206,7 +205,7 @@
# Name: tilde # Name: tilde
# Type: boolean # Type: boolean
# Default: no # Default: no
@@ -4733,6 +4745,42 @@ attachments -I message/external-body @@ -4770,6 +4782,42 @@ attachments -I message/external-body
# in this case. # in this case.
# #
# #
@ -249,19 +248,8 @@
# set write_inc=10 # set write_inc=10
# #
# Name: write_inc # Name: write_inc
--- doc/Muttrc.head
+++ doc/Muttrc.head 2007-06-01 12:51:03.642800000 +0200
@@ -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"
--- imap/auth.c --- imap/auth.c
+++ imap/auth.c 2006-11-09 16:19:56.000000000 +0100 +++ imap/auth.c 2006-11-09 15:19:56.000000000 +0000
@@ -72,6 +72,23 @@ int imap_authenticate (IMAP_DATA* idata) @@ -72,6 +72,23 @@ int imap_authenticate (IMAP_DATA* idata)
dprint (2, (debugfile, "imap_authenticate: Trying method %s\n", method)); dprint (2, (debugfile, "imap_authenticate: Trying method %s\n", method));
authenticator = imap_authenticators; authenticator = imap_authenticators;
@ -296,3 +284,15 @@
} }
FREE (&methods); 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
{ "ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, M_YES },
/*
** .pp

65
mutt-1.5.21.sidebar-fix.dif Normal file
View File

@ -0,0 +1,65 @@
--- 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
@@ -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:
- buffy_mbox_update (tmp);
+ if (option(OPTSIDEBAR))
+ buffy_mbox_update (tmp);
if (buffy_mbox_hasnew (tmp, &sb) > 0)
BuffyCount++;
break;
case M_MAILDIR:
- buffy_maildir_update (tmp);
+ if (option(OPTSIDEBAR))
+ buffy_maildir_update (tmp);
if (buffy_maildir_hasnew (tmp) > 0)
BuffyCount++;
break;
case M_MH:
- 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++;
break;

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

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

13
mutt.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Mon May 10 20:37:10 UTC 2010 - guido+opensuse.org@berhoerster.name
- add proper category to desktop file
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 19 11:46:56 UTC 2010 - lnussel@suse.de Mon Apr 19 11:46:56 UTC 2010 - lnussel@suse.de

2
mutt.desktop
View File

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Categories=ConsoleOnly;Email Categories=ConsoleOnly;Network;Email
Encoding=UTF-8 Encoding=UTF-8
Exec=mutt Exec=mutt
Icon=mutt Icon=mutt

26
mutt.spec
View File

@ -31,7 +31,7 @@ Requires: smtp_daemon
# desktop selections. # desktop selections.
#Requires: desktop-data-SuSE #Requires: desktop-data-SuSE
AutoReqProv: on AutoReqProv: on
Version: 1.5.20 Version: 1.5.21
Release: 7 Release: 7
Summary: Mail Program Summary: Mail Program
# ftp://ftp.mutt.org/mutt/devel/ # ftp://ftp.mutt.org/mutt/devel/
@ -50,13 +50,10 @@ 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.20090619.txt.bz2 Patch6: patch-1.5.21.sidebar-aa6aa.txt.bz2
Patch7: mutt-1.5.20.sidebar-fix.dif Patch7: mutt-1.5.21.sidebar-fix.dif
Patch8: mutt-1.5.19-opennfs.dif Patch8: mutt-1.5.21-opennfs.dif
Patch9: mutt-1.5.20-gpgme_set_locale.patch 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir %{_sysconfdir} %global _sysconfdir %{_sysconfdir}
@ -65,13 +62,6 @@ A very powerful mail user agent. It supports (among other nice things)
highlighting, threading, and PGP. It takes some time to get used to, highlighting, threading, and PGP. It takes some time to get used to,
however. however.
Authors:
--------
Michael Elkins <me@cs.hmc.edu>
Thomas Roessler <roessler@does-not-exist.org>
%prep %prep
%setup -q -n mutt-%version %setup -q -n mutt-%version
%patch %patch
@ -79,14 +69,11 @@ Authors:
%patch2 -p0 %patch2 -p0
%patch3 -p1 %patch3 -p1
%patch4 -p0 %patch4 -p0
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1
%patch7 -p0 %patch7 -p0
%patch8 -p0 %patch8 -p0
%patch9 -p1 %patch9 -p1
%patch10 -p0
%patch11 -p0
%patch12 -p1
cp doc/Muttrc Muttrc.SuSE cp doc/Muttrc Muttrc.SuSE
cp %{S:2} . cp %{S:2} .
@ -168,6 +155,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/*.desktop %{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/mutt.png %{_datadir}/pixmaps/mutt.png
%_mandir/man1/mutt.1.gz %_mandir/man1/mutt.1.gz
%_mandir/man1/smime_keys.1.gz
%_mandir/man5/mmdf_mutt.5.gz %_mandir/man5/mmdf_mutt.5.gz
%_mandir/man5/muttrc.5.gz %_mandir/man5/muttrc.5.gz
%_mandir/man5/mbox_mutt.5.gz %_mandir/man5/mbox_mutt.5.gz

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

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

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

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

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

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

3
patch-1.5.21.sidebar-aa6aa.txt.bz2 Normal file
View File

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