Index: debian-mutt/init.h
===================================================================
---- debian-mutt.orig/init.h 2007-03-21 21:58:13.000000000 +0100
-+++ debian-mutt/init.h 2007-03-21 22:10:38.000000000 +0100
+--- debian-mutt.orig/init.h 2007-03-24 17:54:00.000000000 +0100
++++ debian-mutt/init.h 2007-03-24 18:00:57.000000000 +0100
@@ -289,6 +289,9 @@ struct option_t MuttVars[] = {
** .pp
** When this variable is set, mutt will include Delivered-To headers when
*/
#endif
-@@ -2626,6 +2635,9 @@ struct option_t MuttVars[] = {
+@@ -1843,6 +1852,10 @@ struct option_t MuttVars[] = {
+ ** This variable contains the name of either a directory, or a file which
+ ** contains trusted certificates for use with OpenSSL.
+ ** (S/MIME only)
++ ** .pp
++ ** \fBNote:\fP On Debian systems, this defaults to the first existing file in
++ ** the following list: ~/.smime/ca-certificates.crt ~/.smime/ca-bundle.crt
++ ** /etc/ssl/certs/ca-certificates.crt.
+ */
+ { "smime_certificates", DT_PATH, R_NONE, UL &SmimeCertificates, 0 },
+ /*
+@@ -2049,6 +2062,9 @@ struct option_t MuttVars[] = {
+ ** certificates are also automatically accepted.
+ ** .pp
+ ** Example: set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt
++ ** .pp
++ ** \fBNote:\fP On Debian systems, this variable defaults to the example
++ ** mentioned. This file is managed by the ``ca-certificates'' package.
+ */
+ # endif /* USE_SSL_GNUTLS */
+ #endif /* defined(USE_SSL) */
+@@ -2626,6 +2642,9 @@ struct option_t MuttVars[] = {
** .pp
** You may optionally use the reverse- prefix to specify reverse sorting
** order (example: set sort=reverse-date-sent).
*/
{ "sort_alias", DT_SORT|DT_SORT_ALIAS, R_NONE, UL &SortAlias, SORT_ALIAS },
/*
-@@ -3022,6 +3034,9 @@ struct option_t MuttVars[] = {
+@@ -3022,6 +3041,9 @@ struct option_t MuttVars[] = {
** is set to deliver directly via SMTP (see ``$$smtp_url''), this
** option does nothing: mutt will never write out the BCC header
** in this case.
- removed a spurious const in add_folder() definition.
- added a $maildir_mtime option to allow this patch to be disabled at
runtime (see Bug#253261, comments from Zephaniah E. Hull).
+ - 2007-04-03 myon: resolved conflict in browser.c
== END PATCH
---- maildir-mtime/PATCHES Dec 2002 17:44:54 -0000 3.6
-+++ maildir-mtime/PATCHES Feb 2004 13:19:42 -0000
-@@ -0,0 +1 @@
-+patch-1.5.6.dw.maildir-mtime.1
---- maildir-mtime/browser.c Sep 2003 13:03:25 -0000 3.9
-+++ maildir-mtime/browser.c Feb 2004 13:19:42 -0000
-@@ -29,2 +29,3 @@
- #endif
-+#include "mx.h"
-
-@@ -304,4 +305,6 @@ folder_format_str (char *dest, size_t de
- static void add_folder (MUTTMENU *m, struct browser_state *state,
-- const char *name, const struct stat *s, int new)
-+ const char *name, /*DEB const IAN*/ struct stat *s, BUFFY *mbuf)
- {
-+ int new = (mbuf) ? mbuf->new : 0;
-+
- if (state->entrylen == state->entrymax)
-@@ -317,2 +320,5 @@ static void add_folder (MUTTMENU *m, str
-
-+ if (mbuf && mbuf->magic == M_MAILDIR && mbuf->mtime)
-+ s->st_mtime = mbuf->mtime;
-+
- if (s != NULL)
-@@ -411,3 +417,3 @@ static int examine_directory (MUTTMENU *
- tmp = tmp->next;
-- add_folder (menu, state, de->d_name, &s, (tmp) ? tmp->new : 0);
-+ add_folder (menu, state, de->d_name, &s, tmp);
- }
-@@ -435,3 +441,3 @@ static int examine_mailboxes (MUTTMENU *
- {
-- add_folder (menu, state, tmp->path, NULL, tmp->new);
-+ add_folder (menu, state, tmp->path, NULL, tmp);
- continue;
-@@ -442,3 +448,3 @@ static int examine_mailboxes (MUTTMENU *
- {
-- add_folder (menu, state, tmp->path, NULL, tmp->new);
-+ add_folder (menu, state, tmp->path, NULL, tmp);
- continue;
-@@ -456,3 +462,3 @@ static int examine_mailboxes (MUTTMENU *
-
-- add_folder (menu, state, buffer, &s, tmp->new);
-+ add_folder (menu, state, buffer, &s, tmp);
- }
---- maildir-mtime/buffy.c Feb 2004 17:50:43 -0000 3.9
-+++ maildir-mtime/buffy.c Feb 2004 13:19:42 -0000
-@@ -229,2 +229,3 @@ int mutt_parse_mailboxes (BUFFER *path,
+Index: debian-mutt/buffy.c
+===================================================================
+--- debian-mutt.orig/buffy.c 2007-04-03 19:17:22.000000000 +0200
++++ debian-mutt/buffy.c 2007-04-03 19:20:31.000000000 +0200
+@@ -226,6 +226,7 @@ int mutt_parse_mailboxes (BUFFER *path,
+ (*tmp)->new = 0;
+ (*tmp)->notified = 1;
(*tmp)->newly_created = 0;
+ (*tmp)->mtime = 0;
-@@ -260,2 +261,3 @@ int mutt_buffy_check (int force)
+ /* for check_mbox_size, it is important that if the folder is new (tested by
+ * reading it), the size is set to 0 so that later when we check we see
+@@ -254,6 +255,7 @@ int mutt_buffy_check (int force)
+ {
+ BUFFY *tmp;
struct stat sb;
+ struct stat smd;
struct dirent *de;
-@@ -299,2 +301,3 @@ int mutt_buffy_check (int force)
+ DIR *dirp;
+ char path[_POSIX_PATH_MAX];
+@@ -298,6 +300,7 @@ int mutt_buffy_check (int force)
+ if (tmp->magic != M_IMAP)
+ #endif
tmp->new = 0;
+ tmp->mtime = 0;
-@@ -383,6 +386,13 @@ int mutt_buffy_check (int force)
+ #ifdef USE_IMAP
+ if (tmp->magic != M_IMAP)
+@@ -380,10 +383,20 @@ int mutt_buffy_check (int force)
+ if (*de->d_name != '.' &&
+ (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
{
- /* one new and undeleted message is enough */
- BuffyCount++;
+ /* one new and undeleted message is enough */
+ BuffyCount++;
+ tmp->new = 1;
++
++ if (! option (OPTMAILDIRMTIME)) /* prevent stat calls */
++ break;
+ }
+ snprintf (path, sizeof (path), "%s/new/%s", tmp->path, de->d_name);
+ if (!stat (path, &smd) && smd.st_mtime > tmp->mtime)
+ tmp->mtime = smd.st_mtime;
+ }
}
---- maildir-mtime/buffy.h Dec 2002 11:19:39 -0000 3.2
-+++ maildir-mtime/buffy.h Feb 2004 13:19:42 -0000
-@@ -29,2 +29,3 @@ typedef struct buffy_t
- struct buffy_t *next;
-+ time_t mtime; /* for maildirs...time of newest entry */
- short new; /* mailbox has new mail */
---- DEBIAN/buffy.c
-+++ DEBIAN/buffy.c.new
-@@ -389,6 +389,9 @@
- /* one new and undeleted message is enough */
- BuffyCount++;
- tmp->new = 1;
-+
-+ if (! option (OPTMAILDIRMTIME)) /* prevent stat calls */
-+ break;
- }
- snprintf (path, sizeof (path), "%s/new/%s", tmp->path, de->d_name);
- if (!stat (path, &smd) && smd.st_mtime > tmp->mtime)
---- DEBIAN/init.h
-+++ DEBIAN/init.h.new
-@@ -1022,6 +1022,16 @@
+ }
+ closedir (dirp);
+Index: debian-mutt/init.h
+===================================================================
+--- debian-mutt.orig/init.h 2007-04-03 19:20:27.000000000 +0200
++++ debian-mutt/init.h 2007-04-03 19:20:31.000000000 +0200
+@@ -1086,6 +1086,16 @@ struct option_t MuttVars[] = {
** \fBDON'T CHANGE THIS SETTING UNLESS YOU ARE REALLY SURE WHAT YOU ARE
** DOING!\fP
*/
+ **
+ */
#ifdef USE_HCACHE
-
{ "header_cache", DT_PATH, R_NONE, UL &HeaderCache, 0 },
---- DEBIAN/mutt.h
-+++ DEBIAN/mutt.h.new
-@@ -396,6 +396,7 @@
+ /*
+Index: debian-mutt/mutt.h
+===================================================================
+--- debian-mutt.orig/mutt.h 2007-04-03 19:20:27.000000000 +0200
++++ debian-mutt/mutt.h 2007-04-03 19:20:31.000000000 +0200
+@@ -400,6 +400,7 @@ enum
OPTINCLUDEONLYFIRST,
OPTKEEPFLAGGED,
OPTMAILCAPSANITIZE,
OPTMAILDIRTRASH,
OPTMARKERS,
OPTMARKOLD,
+Index: debian-mutt/PATCHES
+===================================================================
+--- debian-mutt.orig/PATCHES 2007-04-03 19:20:27.000000000 +0200
++++ debian-mutt/PATCHES 2007-04-03 19:20:31.000000000 +0200
+@@ -1,2 +1,3 @@
++patch-1.5.6.dw.maildir-mtime.1
+ patch-1.5.13.cd.ifdef.2
+ patch-1.5.14.rr.compressed.1
+Index: debian-mutt/browser.c
+===================================================================
+--- debian-mutt.orig/browser.c 2007-04-03 19:20:17.000000000 +0200
++++ debian-mutt/browser.c 2007-04-03 19:24:32.000000000 +0200
+@@ -32,6 +32,7 @@
+ #ifdef USE_IMAP
+ #include "imap.h"
+ #endif
++#include "mx.h"
+
+ #include <stdlib.h>
+ #include <dirent.h>
+@@ -307,8 +308,10 @@ folder_format_str (char *dest, size_t de
+ }
+
+ static void add_folder (MUTTMENU *m, struct browser_state *state,
+- const char *name, const struct stat *s, int new)
++ const char *name, /*DEB const IAN*/ struct stat *s, BUFFY *mbuf)
+ {
++ int new = (mbuf) ? mbuf->new : 0;
++
+ if (state->entrylen == state->entrymax)
+ {
+ /* need to allocate more space */
+@@ -320,6 +323,9 @@ static void add_folder (MUTTMENU *m, str
+ m->data = state->entry;
+ }
+
++ if (mbuf && mbuf->magic == M_MAILDIR && mbuf->mtime)
++ s->st_mtime = mbuf->mtime;
++
+ if (s != NULL)
+ {
+ (state->entry)[state->entrylen].mode = s->st_mode;
+@@ -414,7 +420,7 @@ static int examine_directory (MUTTMENU *
+ tmp = Incoming;
+ while (tmp && mutt_strcmp (buffer, tmp->path))
+ tmp = tmp->next;
+- add_folder (menu, state, de->d_name, &s, (tmp) ? tmp->new : 0);
++ add_folder (menu, state, de->d_name, &s, tmp);
+ }
+ closedir (dp);
+ browser_sort (state);
+@@ -442,14 +448,14 @@ static int examine_mailboxes (MUTTMENU *
+ if (mx_is_imap (tmp->path))
+ {
+ imap_mailbox_state (tmp->path, &mbox);
+- add_folder (menu, state, tmp->path, NULL, mbox.new);
++ add_folder (menu, state, tmp->path, NULL, &mbox);
+ continue;
+ }
+ #endif
+ #ifdef USE_POP
+ if (mx_is_pop (tmp->path))
+ {
+- add_folder (menu, state, tmp->path, NULL, tmp->new);
++ add_folder (menu, state, tmp->path, NULL, tmp);
+ continue;
+ }
+ #endif
+@@ -463,7 +469,7 @@ static int examine_mailboxes (MUTTMENU *
+ strfcpy (buffer, NONULL(tmp->path), sizeof (buffer));
+ mutt_pretty_mailbox (buffer);
+
+- add_folder (menu, state, buffer, &s, tmp->new);
++ add_folder (menu, state, buffer, &s, tmp);
+ }
+ while ((tmp = tmp->next));
+ browser_sort (state);
+Index: debian-mutt/buffy.h
+===================================================================
+--- debian-mutt.orig/buffy.h 2007-04-03 19:17:22.000000000 +0200
++++ debian-mutt/buffy.h 2007-04-03 19:20:31.000000000 +0200
+@@ -25,6 +25,7 @@ typedef struct buffy_t
+ char *path;
+ long size;
+ struct buffy_t *next;
++ time_t mtime; /* for maildirs...time of newest entry */
+ short new; /* mailbox has new mail */
+ short notified; /* user has been notified */
+ short magic; /* mailbox type */
projects / software / mutt-debian.git / commitdiff