| 1 |
grobian 09/06/28 10:44:22 |
| 2 |
|
| 3 |
Added: mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch |
| 4 |
mutt-1.5.18-bdb-prefix.patch |
| 5 |
mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch |
| 6 |
mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch |
| 7 |
mutt-1.5.18-interix.patch |
| 8 |
mutt-1.5.13-prefix-mailcap.patch |
| 9 |
mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch |
| 10 |
mutt-1.5.18-solaris-ncurses-chars.patch |
| 11 |
mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch |
| 12 |
mutt-1.5.20-header-weeding-f40de578e8ed.patch |
| 13 |
Log: |
| 14 |
Version bump to 1.5.20, with a bunch of post release regression fixes from upstream. The pgp_timeout patch has been dropped for this release, since it no longer applies. |
| 15 |
(Portage version: 2.2.00.13629-prefix/cvs/Darwin powerpc) |
| 16 |
|
| 17 |
Revision Changes Path |
| 18 |
1.1 mail-client/mutt/files/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch |
| 19 |
|
| 20 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch?rev=1.1&view=markup |
| 21 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch?rev=1.1&content-type=text/plain |
| 22 |
|
| 23 |
Index: mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch |
| 24 |
=================================================================== |
| 25 |
http://dev.mutt.org/trac/changeset/5899%3Ad6f88fbf8387 |
| 26 |
|
| 27 |
Don't parse URL port as signed short, but to int and cast to unsigned |
| 28 |
short. Closes #3264. |
| 29 |
|
| 30 |
Index: url.c |
| 31 |
=================================================================== |
| 32 |
--- url.c (revision 5845:0698e8195545) |
| 33 |
+++ url.c (revision 5899:d6f88fbf8387) |
| 34 |
@@ -144,7 +144,9 @@ |
| 35 |
if ((p = strchr (t, ':'))) |
| 36 |
{ |
| 37 |
+ int t; |
| 38 |
*p++ = '\0'; |
| 39 |
- if (mutt_atos (p, (short*) &ciss->port) < 0) |
| 40 |
+ if (mutt_atoi (p, &t) < 0 || t < 0 || t > 0xffff) |
| 41 |
return NULL; |
| 42 |
+ ciss->port = (unsigned short)t; |
| 43 |
} |
| 44 |
else |
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
1.1 mail-client/mutt/files/mutt-1.5.18-bdb-prefix.patch |
| 49 |
|
| 50 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.18-bdb-prefix.patch?rev=1.1&view=markup |
| 51 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.18-bdb-prefix.patch?rev=1.1&content-type=text/plain |
| 52 |
|
| 53 |
Index: mutt-1.5.18-bdb-prefix.patch |
| 54 |
=================================================================== |
| 55 |
* berkely db check is completely broken, but mess with it just enough |
| 56 |
such that it works for Gentoo Prefix |
| 57 |
|
| 58 |
--- configure.ac |
| 59 |
+++ configure.ac |
| 60 |
@@ -891,7 +891,7 @@ |
| 61 |
then |
| 62 |
if test x$ac_bdb_prefix = xyes || test x$ac_bdb_prefix = x |
| 63 |
then |
| 64 |
- ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr" |
| 65 |
+ ac_bdb_prefix="$mutt_cv_prefix" |
| 66 |
fi |
| 67 |
for d in $ac_bdb_prefix; do |
| 68 |
bdbpfx="$bdbpfx $d" |
| 69 |
@@ -899,7 +899,7 @@ |
| 70 |
bdbpfx="$bdbpfx $d/$v" |
| 71 |
done |
| 72 |
done |
| 73 |
- BDB_VERSIONS="db-4 db4 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''" |
| 74 |
+ BDB_VERSIONS="db db-4 db4 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 ''" |
| 75 |
AC_MSG_CHECKING([for BerkeleyDB > 4.0]) |
| 76 |
for d in $bdbpfx; do |
| 77 |
BDB_INCLUDE_DIR="" |
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
1.1 mail-client/mutt/files/mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch |
| 82 |
|
| 83 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch?rev=1.1&view=markup |
| 84 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch?rev=1.1&content-type=text/plain |
| 85 |
|
| 86 |
Index: mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch |
| 87 |
=================================================================== |
| 88 |
http://dev.mutt.org/trac/changeset/5908%3A7f37d0a57d83?format=diff&new=5908:7f37d0a57d83 |
| 89 |
|
| 90 |
Display unsigned part of traditional PGP messages. |
| 91 |
Unbreaks [e2780a423d96], closes #3269 |
| 92 |
|
| 93 |
Index: crypt-gpgme.c |
| 94 |
=================================================================== |
| 95 |
--- crypt-gpgme.c (revision 5801:19e62bd1549b) |
| 96 |
+++ crypt-gpgme.c (revision 5908:7f37d0a57d83) |
| 97 |
@@ -2372,8 +2372,7 @@ |
| 98 |
} |
| 99 |
} |
| 100 |
-#if 0 |
| 101 |
else |
| 102 |
{ |
| 103 |
- /* why would we want to display this at all? */ |
| 104 |
+ /* A traditional PGP part may mix signed and unsigned content */ |
| 105 |
/* XXX - we may wish to recode here */ |
| 106 |
if (s->prefix) |
| 107 |
@@ -2381,5 +2380,4 @@ |
| 108 |
state_puts (buf, s); |
| 109 |
} |
| 110 |
-#endif |
| 111 |
} |
| 112 |
|
| 113 |
Index: pgp.c |
| 114 |
=================================================================== |
| 115 |
--- pgp.c (revision 5827:776ef9dbe4d2) |
| 116 |
+++ pgp.c (revision 5908:7f37d0a57d83) |
| 117 |
@@ -483,8 +483,7 @@ |
| 118 |
} |
| 119 |
} |
| 120 |
-#if 0 |
| 121 |
else |
| 122 |
{ |
| 123 |
- /* why would we want to display this at all? */ |
| 124 |
+ /* A traditional PGP part may mix signed and unsigned content */ |
| 125 |
/* XXX - we may wish to recode here */ |
| 126 |
if (s->prefix) |
| 127 |
@@ -492,5 +491,4 @@ |
| 128 |
state_puts (buf, s); |
| 129 |
} |
| 130 |
-#endif |
| 131 |
} |
| 132 |
|
| 133 |
|
| 134 |
|
| 135 |
|
| 136 |
1.1 mail-client/mutt/files/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch |
| 137 |
|
| 138 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch?rev=1.1&view=markup |
| 139 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch?rev=1.1&content-type=text/plain |
| 140 |
|
| 141 |
Index: mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch |
| 142 |
=================================================================== |
| 143 |
http://dev.mutt.org/trac/changeset/25e46aad362b#file0 |
| 144 |
|
| 145 |
Do not free statically-allocated buffy buffer. |
| 146 |
Unbreaks unmailboxes, closes #3273. |
| 147 |
|
| 148 |
Index: buffy.c |
| 149 |
=================================================================== |
| 150 |
--- buffy.c (revision 5851:8b2af5b64981) |
| 151 |
+++ buffy.c (revision 5914:25e46aad362b) |
| 152 |
@@ -237,5 +237,4 @@ |
| 153 |
if(*tmp) |
| 154 |
{ |
| 155 |
- FREE (&((*tmp)->path)); |
| 156 |
tmp1=(*tmp)->next; |
| 157 |
FREE (tmp); /* __FREE_CHECKED__ */ |
| 158 |
|
| 159 |
|
| 160 |
|
| 161 |
1.1 mail-client/mutt/files/mutt-1.5.18-interix.patch |
| 162 |
|
| 163 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.18-interix.patch?rev=1.1&view=markup |
| 164 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.18-interix.patch?rev=1.1&content-type=text/plain |
| 165 |
|
| 166 |
Index: mutt-1.5.18-interix.patch |
| 167 |
=================================================================== |
| 168 |
* Interix doesn't have btowc, but it does have mbtowc. Linux manpage |
| 169 |
also discourages the use of btowc. |
| 170 |
|
| 171 |
--- regex.c |
| 172 |
+++ regex.c |
| 173 |
@@ -2212,6 +2212,7 @@ |
| 174 |
boolean is_lower = STREQ (str, "lower"); |
| 175 |
boolean is_upper = STREQ (str, "upper"); |
| 176 |
wctype_t wt; |
| 177 |
+ wchar_t twt; |
| 178 |
int ch; |
| 179 |
|
| 180 |
wt = wctype (str); |
| 181 |
@@ -2226,7 +2227,7 @@ |
| 182 |
|
| 183 |
for (ch = 0; ch < 1 << BYTEWIDTH; ++ch) |
| 184 |
{ |
| 185 |
- if (iswctype (btowc (ch), wt)) |
| 186 |
+ if (mbtowc (&twt, (char *)&ch, 1) >= 0 && iswctype (twt, wt)) |
| 187 |
SET_LIST_BIT (ch); |
| 188 |
|
| 189 |
if (translate && (is_upper || is_lower) |
| 190 |
|
| 191 |
|
| 192 |
|
| 193 |
1.1 mail-client/mutt/files/mutt-1.5.13-prefix-mailcap.patch |
| 194 |
|
| 195 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.13-prefix-mailcap.patch?rev=1.1&view=markup |
| 196 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.13-prefix-mailcap.patch?rev=1.1&content-type=text/plain |
| 197 |
|
| 198 |
Index: mutt-1.5.13-prefix-mailcap.patch |
| 199 |
=================================================================== |
| 200 |
--- Makefile.am |
| 201 |
+++ Makefile.am |
| 202 |
@@ -51,7 +51,7 @@ |
| 203 |
|
| 204 |
DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \ |
| 205 |
-DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \ |
| 206 |
- -DHAVE_CONFIG_H=1 |
| 207 |
+ -DHAVE_CONFIG_H=1 -DPREFIX=\"$(prefix)/..\" |
| 208 |
|
| 209 |
AM_CPPFLAGS=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(LIBGPGME_CFLAGS) -Iintl |
| 210 |
|
| 211 |
--- init.c |
| 212 |
+++ init.c |
| 213 |
@@ -2862,7 +2862,7 @@ |
| 214 |
else |
| 215 |
{ |
| 216 |
/* Default search path from RFC1524 */ |
| 217 |
- MailcapPath = safe_strdup ("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR "/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap"); |
| 218 |
+ MailcapPath = safe_strdup ("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR "/mailcap:" PREFIX "/etc/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap"); |
| 219 |
} |
| 220 |
|
| 221 |
Tempdir = safe_strdup ((p = getenv ("TMPDIR")) ? p : "/tmp"); |
| 222 |
|
| 223 |
|
| 224 |
|
| 225 |
1.1 mail-client/mutt/files/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch |
| 226 |
|
| 227 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch?rev=1.1&view=markup |
| 228 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch?rev=1.1&content-type=text/plain |
| 229 |
|
| 230 |
Index: mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch |
| 231 |
=================================================================== |
| 232 |
http://dev.mutt.org/trac/changeset/9ae13dedb5ed |
| 233 |
|
| 234 |
Fixup atime for mbox/mmdf also when mailbox is unchanged but has new |
| 235 |
mail. See #1362. |
| 236 |
|
| 237 |
Index: mbox.c |
| 238 |
=================================================================== |
| 239 |
--- mbox.c (revision 5921:bd59be56c6b0) |
| 240 |
+++ mbox.c (revision 5922:9ae13dedb5ed) |
| 241 |
@@ -682,5 +682,5 @@ |
| 242 |
/* if mailbox has at least 1 new message, sets mtime > atime of mailbox |
| 243 |
* so buffy check reports new mail */ |
| 244 |
-static void reset_atime (CONTEXT *ctx, struct stat *st) |
| 245 |
+void mbox_reset_atime (CONTEXT *ctx, struct stat *st) |
| 246 |
{ |
| 247 |
struct utimbuf utimebuf; |
| 248 |
@@ -992,5 +992,5 @@ |
| 249 |
|
| 250 |
/* Restore the previous access/modification times */ |
| 251 |
- reset_atime (ctx, &statbuf); |
| 252 |
+ mbox_reset_atime (ctx, &statbuf); |
| 253 |
|
| 254 |
/* reopen the mailbox in read-only mode */ |
| 255 |
Index: mx.c |
| 256 |
=================================================================== |
| 257 |
--- mx.c (revision 5907:a2a868fc40ea) |
| 258 |
+++ mx.c (revision 5922:9ae13dedb5ed) |
| 259 |
@@ -927,4 +927,6 @@ |
| 260 |
if (!ctx->quiet) |
| 261 |
mutt_message _("Mailbox is unchanged."); |
| 262 |
+ if (ctx->magic == M_MBOX || ctx->magic == M_MMDF) |
| 263 |
+ mbox_reset_atime (ctx, NULL); |
| 264 |
mx_fastclose_mailbox (ctx); |
| 265 |
return 0; |
| 266 |
Index: mx.h |
| 267 |
=================================================================== |
| 268 |
--- mx.h (revision 4343:2bccf51eedac) |
| 269 |
+++ mx.h (revision 5922:9ae13dedb5ed) |
| 270 |
@@ -57,4 +57,5 @@ |
| 271 |
void mbox_unlock_mailbox (CONTEXT *); |
| 272 |
int mbox_check_empty (const char *); |
| 273 |
+void mbox_reset_atime (CONTEXT *, struct stat *); |
| 274 |
|
| 275 |
int mh_read_dir (CONTEXT *, const char *); |
| 276 |
|
| 277 |
|
| 278 |
|
| 279 |
1.1 mail-client/mutt/files/mutt-1.5.18-solaris-ncurses-chars.patch |
| 280 |
|
| 281 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.18-solaris-ncurses-chars.patch?rev=1.1&view=markup |
| 282 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.18-solaris-ncurses-chars.patch?rev=1.1&content-type=text/plain |
| 283 |
|
| 284 |
Index: mutt-1.5.18-solaris-ncurses-chars.patch |
| 285 |
=================================================================== |
| 286 |
--- menu.c |
| 287 |
+++ menu.c |
| 288 |
@@ -58,7 +58,7 @@ |
| 289 |
if (option (OPTASCIICHARS)) |
| 290 |
addch ('`'); |
| 291 |
else if (Charset_is_utf8) |
| 292 |
- addstr ("\342\224\224"); /* WACS_LLCORNER */ |
| 293 |
+ add_wch (WACS_LLCORNER); |
| 294 |
else |
| 295 |
addch (ACS_LLCORNER); |
| 296 |
break; |
| 297 |
@@ -66,7 +66,7 @@ |
| 298 |
if (option (OPTASCIICHARS)) |
| 299 |
addch (','); |
| 300 |
else if (Charset_is_utf8) |
| 301 |
- addstr ("\342\224\214"); /* WACS_ULCORNER */ |
| 302 |
+ add_wch (WACS_ULCORNER); |
| 303 |
else |
| 304 |
addch (ACS_ULCORNER); |
| 305 |
break; |
| 306 |
@@ -74,7 +74,7 @@ |
| 307 |
if (option (OPTASCIICHARS)) |
| 308 |
addch ('|'); |
| 309 |
else if (Charset_is_utf8) |
| 310 |
- addstr ("\342\224\234"); /* WACS_LTEE */ |
| 311 |
+ add_wch (WACS_LTEE); |
| 312 |
else |
| 313 |
addch (ACS_LTEE); |
| 314 |
break; |
| 315 |
@@ -82,7 +82,7 @@ |
| 316 |
if (option (OPTASCIICHARS)) |
| 317 |
addch ('-'); |
| 318 |
else if (Charset_is_utf8) |
| 319 |
- addstr ("\342\224\200"); /* WACS_HLINE */ |
| 320 |
+ add_wch (WACS_HLINE); |
| 321 |
else |
| 322 |
addch (ACS_HLINE); |
| 323 |
break; |
| 324 |
@@ -90,7 +90,7 @@ |
| 325 |
if (option (OPTASCIICHARS)) |
| 326 |
addch ('|'); |
| 327 |
else if (Charset_is_utf8) |
| 328 |
- addstr ("\342\224\202"); /* WACS_VLINE */ |
| 329 |
+ add_wch (WACS_VLINE); |
| 330 |
else |
| 331 |
addch (ACS_VLINE); |
| 332 |
break; |
| 333 |
@@ -98,7 +98,7 @@ |
| 334 |
if (option (OPTASCIICHARS)) |
| 335 |
addch ('-'); |
| 336 |
else if (Charset_is_utf8) |
| 337 |
- addstr ("\342\224\254"); /* WACS_TTEE */ |
| 338 |
+ add_wch (WACS_TTEE); |
| 339 |
else |
| 340 |
addch (ACS_TTEE); |
| 341 |
break; |
| 342 |
@@ -106,7 +106,7 @@ |
| 343 |
if (option (OPTASCIICHARS)) |
| 344 |
addch ('-'); |
| 345 |
else if (Charset_is_utf8) |
| 346 |
- addstr ("\342\224\264"); /* WACS_BTEE */ |
| 347 |
+ add_wch (WACS_BTEE); |
| 348 |
else |
| 349 |
addch (ACS_BTEE); |
| 350 |
break; |
| 351 |
--- mutt_curses.h |
| 352 |
+++ mutt_curses.h |
| 353 |
@@ -43,6 +43,7 @@ |
| 354 |
#else /* USE_SLANG_CURSES */ |
| 355 |
|
| 356 |
#if HAVE_NCURSESW_NCURSES_H |
| 357 |
+# define _XOPEN_SOURCE_EXTENDED |
| 358 |
# include <ncursesw/ncurses.h> |
| 359 |
#elif HAVE_NCURSES_NCURSES_H |
| 360 |
# include <ncurses/ncurses.h> |
| 361 |
|
| 362 |
|
| 363 |
|
| 364 |
1.1 mail-client/mutt/files/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch |
| 365 |
|
| 366 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch?rev=1.1&view=markup |
| 367 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch?rev=1.1&content-type=text/plain |
| 368 |
|
| 369 |
Index: mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch |
| 370 |
=================================================================== |
| 371 |
http://dev.mutt.org/trac/changeset/bd59be56c6b0 |
| 372 |
|
| 373 |
Don't mangle atime/mtime for mbox folders without new mail upon sync. |
| 374 |
Closes #1362, #3271. |
| 375 |
|
| 376 |
Index: mbox.c |
| 377 |
=================================================================== |
| 378 |
--- mbox.c (revision 5916:508bfe4a2e23) |
| 379 |
+++ mbox.c (revision 5921:bd59be56c6b0) |
| 380 |
@@ -682,20 +682,28 @@ |
| 381 |
/* if mailbox has at least 1 new message, sets mtime > atime of mailbox |
| 382 |
* so buffy check reports new mail */ |
| 383 |
-static void reset_atime (CONTEXT *ctx) |
| 384 |
+static void reset_atime (CONTEXT *ctx, struct stat *st) |
| 385 |
{ |
| 386 |
struct utimbuf utimebuf; |
| 387 |
- int i; |
| 388 |
- time_t now = time (NULL); |
| 389 |
- |
| 390 |
- for (i = 0; i < ctx->msgcount; i++) |
| 391 |
- { |
| 392 |
+ int i, found = 0; |
| 393 |
+ struct stat _st; |
| 394 |
+ |
| 395 |
+ if (!st) |
| 396 |
+ { |
| 397 |
+ if (stat (ctx->path, &_st) < 0) |
| 398 |
+ return; |
| 399 |
+ st = &_st; |
| 400 |
+ } |
| 401 |
+ |
| 402 |
+ utimebuf.actime = st->st_atime; |
| 403 |
+ utimebuf.modtime = st->st_mtime; |
| 404 |
+ |
| 405 |
+ for (i = 0; !found && i < ctx->msgcount; i++) |
| 406 |
if (!ctx->hdrs[i]->deleted && !ctx->hdrs[i]->read && !ctx->hdrs[i]->old) |
| 407 |
- { |
| 408 |
- utimebuf.actime = now - 1; |
| 409 |
- utimebuf.modtime = now; |
| 410 |
- utime (ctx->path, &utimebuf); |
| 411 |
- return; |
| 412 |
- } |
| 413 |
- } |
| 414 |
+ found = 1; |
| 415 |
+ |
| 416 |
+ if (found && utimebuf.actime >= utimebuf.modtime) |
| 417 |
+ utimebuf.actime = utimebuf.modtime - 1; |
| 418 |
+ |
| 419 |
+ utime (ctx->path, &utimebuf); |
| 420 |
} |
| 421 |
|
| 422 |
@@ -713,4 +721,5 @@ |
| 423 |
int first = -1; /* first message to be written */ |
| 424 |
LOFF_T offset; /* location in mailbox to write changed messages */ |
| 425 |
+ struct stat statbuf; |
| 426 |
struct m_update_t *newOffset = NULL; |
| 427 |
struct m_update_t *oldOffset = NULL; |
| 428 |
@@ -904,4 +913,13 @@ |
| 429 |
fp = NULL; |
| 430 |
|
| 431 |
+ /* Save the state of this folder. */ |
| 432 |
+ if (stat (ctx->path, &statbuf) == -1) |
| 433 |
+ { |
| 434 |
+ mutt_perror (ctx->path); |
| 435 |
+ mutt_sleep (5); |
| 436 |
+ unlink (tempfile); |
| 437 |
+ goto bail; |
| 438 |
+ } |
| 439 |
+ |
| 440 |
if ((fp = fopen (tempfile, "r")) == NULL) |
| 441 |
{ |
| 442 |
@@ -973,4 +991,7 @@ |
| 443 |
} |
| 444 |
|
| 445 |
+ /* Restore the previous access/modification times */ |
| 446 |
+ reset_atime (ctx, &statbuf); |
| 447 |
+ |
| 448 |
/* reopen the mailbox in read-only mode */ |
| 449 |
if ((ctx->fp = fopen (ctx->path, "r")) == NULL) |
| 450 |
@@ -998,9 +1019,4 @@ |
| 451 |
unlink (tempfile); /* remove partial copy of the mailbox */ |
| 452 |
mutt_unblock_signals (); |
| 453 |
- |
| 454 |
- /* if mailbox has new mail, mangle atime+mtime to make buffy check |
| 455 |
- * report new mail for it */ |
| 456 |
- if (!option (OPTCHECKMBOXSIZE)) |
| 457 |
- reset_atime (ctx); |
| 458 |
|
| 459 |
return (0); /* signal success */ |
| 460 |
|
| 461 |
|
| 462 |
|
| 463 |
1.1 mail-client/mutt/files/mutt-1.5.20-header-weeding-f40de578e8ed.patch |
| 464 |
|
| 465 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-header-weeding-f40de578e8ed.patch?rev=1.1&view=markup |
| 466 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-header-weeding-f40de578e8ed.patch?rev=1.1&content-type=text/plain |
| 467 |
|
| 468 |
Index: mutt-1.5.20-header-weeding-f40de578e8ed.patch |
| 469 |
=================================================================== |
| 470 |
http://dev.mutt.org/trac/changeset/5904%3Af40de578e8ed |
| 471 |
|
| 472 |
Unbreak header weeding for message/rfc822 parts. Closes #3265. |
| 473 |
|
| 474 |
Index: handler.c |
| 475 |
=================================================================== |
| 476 |
--- handler.c (revision 5882:536771b4e085) |
| 477 |
+++ handler.c (revision 5904:f40de578e8ed) |
| 478 |
@@ -1091,5 +1091,5 @@ |
| 479 |
(((s->flags & M_WEED) || ((s->flags & (M_DISPLAY|M_PRINTING)) && option (OPTWEED))) ? (CH_WEED | CH_REORDER) : 0) | |
| 480 |
(s->prefix ? CH_PREFIX : 0) | CH_DECODE | CH_FROM | |
| 481 |
- (s->flags & M_DISPLAY) ? CH_DISPLAY : 0, s->prefix); |
| 482 |
+ ((s->flags & M_DISPLAY) ? CH_DISPLAY : 0), s->prefix); |
| 483 |
|
| 484 |
if (s->prefix) |
Archives