From: Christoph Berg Date: Tue, 3 Apr 2007 18:54:35 +0000 (+0200) Subject: mutt (1.5.14+cvs20070403-1) experimental; urgency=low X-Git-Tag: 1.5.14+cvs20070403-1 X-Git-Url: https://git.llucax.com/software/mutt-debian.git/commitdiff_plain/ddf8a9dd6bbabd3ba3716abb794ac965877405d4?hp=--cc mutt (1.5.14+cvs20070403-1) experimental; urgency=low * set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt". * Use /etc/ssl/certs/ca-certificates.crt as smime_ca_location if there is none in ~/.smime/ (Closes: #255653). * New snapshot: + Make mutt_edit_file display error if editor return is non-zero (Closes: #209244). + Use ~/.muttrc as the default alias_file if no user muttrc exists (Closes: #226500). + Reset list.name before each list response in folder browser (Mutt: #2444, Closes: #377783). + Fix segfault when trying to read header cache if cwd does not exist (Mutt: #2714, Closes: #387560). + Make message cache write to temporary location until file is complete (Closes: #394383). + Use RECENT for first mailbox check if header cache check fails (Closes: #372512). * Patches: + maildir-mtime: refreshed. --- ddf8a9dd6bbabd3ba3716abb794ac965877405d4 diff --git a/debian/changelog b/debian/changelog index bbc185b..91470e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +mutt (1.5.14+cvs20070403-1) experimental; urgency=low + + * set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt". + * Use /etc/ssl/certs/ca-certificates.crt as smime_ca_location if there is + none in ~/.smime/ (Closes: #255653). + * New snapshot: + + Make mutt_edit_file display error if editor return is non-zero + (Closes: #209244). + + Use ~/.muttrc as the default alias_file if no user muttrc exists + (Closes: #226500). + + Reset list.name before each list response in folder browser + (Mutt: #2444, Closes: #377783). + + Fix segfault when trying to read header cache if cwd does not exist + (Mutt: #2714, Closes: #387560). + + Make message cache write to temporary location until file is complete + (Closes: #394383). + + Use RECENT for first mailbox check if header cache check fails + (Closes: #372512). + * Patches: + + maildir-mtime: refreshed. + + -- Christoph Berg Tue, 3 Apr 2007 20:54:35 +0200 + mutt (1.5.14+cvs20070321-1) experimental; urgency=low * Move source package to http://hg.debian.org/hg/pkg-mutt/debian-mutt. diff --git a/debian/extra/rc/smime-paths.rc b/debian/extra/rc/smime-paths.rc index 4541846..36ebd44 100644 --- a/debian/extra/rc/smime-paths.rc +++ b/debian/extra/rc/smime-paths.rc @@ -1,5 +1,5 @@ # S/MIME configuration -set smime_ca_location="~/.smime/ca-bundle.crt" +set smime_ca_location=`for f in $HOME/.smime/ca-certificates.crt $HOME/.smime/ca-bundle.crt /etc/ssl/certs/ca-certificates.crt ; do if [ -f $f ] ; then echo $f ; exit ; fi ; done` set smime_certificates="~/.smime/certificates" set smime_keys="~/.smime/keys" set smime_pk7out_command="openssl smime -verify -in %f -noverify -pk7out" @@ -11,7 +11,7 @@ set smime_encrypt_command="openssl smime -encrypt %a -outform DER -in %f %c" set smime_sign_command="openssl smime -sign -signer %c -inkey %k -passin stdin -in %f -certfile %i -outform DER" # This alternative command does not include the full certificates chain. # Be sure to understand RFC 2315 section 9.1 before using it. -# set smime_sign_command="openssl smime -sign -signer %c -inkey %k -passin stdin -in %f -outform DER" +#set smime_sign_command="openssl smime -sign -signer %c -inkey %k -passin stdin -in %f -outform DER" set smime_decrypt_command="openssl smime -decrypt -passin stdin -inform DER -in %f -inkey %k -recip %c" set smime_verify_command="openssl smime -verify -inform DER -in %s %C -content %f" set smime_verify_opaque_command="openssl smime -verify -inform DER -in %s %C" diff --git a/debian/patches/debian-specific/Muttrc b/debian/patches/debian-specific/Muttrc index 72906b3..12a7e93 100644 --- a/debian/patches/debian-specific/Muttrc +++ b/debian/patches/debian-specific/Muttrc @@ -1,8 +1,8 @@ -Index: trunk/Muttrc.head +Index: debian-mutt/Muttrc.head =================================================================== ---- trunk.orig/Muttrc.head 2007-03-15 16:33:18.000000000 +0100 -+++ trunk/Muttrc.head 2007-03-15 16:35:15.000000000 +0100 -@@ -6,6 +6,33 @@ +--- debian-mutt.orig/Muttrc.head 2007-03-24 16:53:09.000000000 +0100 ++++ debian-mutt/Muttrc.head 2007-03-24 17:53:19.000000000 +0100 +@@ -6,6 +6,36 @@ # ignore "from " received content- mime-version status x-status message-id ignore sender references return-path lines @@ -33,10 +33,13 @@ Index: trunk/Muttrc.head +unset bounce_delivered + +set mixmaster="mixmaster-filter" ++ ++# System-wide CA file managed by the ca-certificates package ++set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt" # imitate the old search-body function macro index \eb "~b " "search in message bodies" -@@ -15,14 +42,14 @@ macro index,pager \cb " ur +@@ -15,14 +45,14 @@ macro index,pager \cb " ur macro attach,compose \cb " urlview" "call urlview to extract URLs out of a message" # Show documentation when pressing F1 @@ -53,7 +56,7 @@ Index: trunk/Muttrc.head # # set hostname=cs.hmc.edu -@@ -84,6 +111,9 @@ attachments +I text/plain +@@ -84,6 +114,9 @@ attachments +I text/plain attachments -A message/external-body attachments -I message/external-body diff --git a/debian/patches/debian-specific/document_debian_defaults b/debian/patches/debian-specific/document_debian_defaults index 3726953..1f06d81 100644 --- a/debian/patches/debian-specific/document_debian_defaults +++ b/debian/patches/debian-specific/document_debian_defaults @@ -1,7 +1,7 @@ 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 @@ -32,7 +32,28 @@ Index: debian-mutt/init.h */ #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). @@ -42,7 +63,7 @@ Index: debian-mutt/init.h */ { "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. diff --git a/debian/patches/features/maildir-mtime b/debian/patches/features/maildir-mtime index 7998982..a07635d 100644 --- a/debian/patches/features/maildir-mtime +++ b/debian/patches/features/maildir-mtime @@ -13,67 +13,40 @@ The home page for this patch is: - 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++; @@ -84,6 +57,9 @@ The home page for this patch is: + /* 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) @@ -91,27 +67,13 @@ The home page for this patch is: + 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 */ @@ -126,11 +88,13 @@ The home page for this patch is: + ** + */ #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, @@ -138,3 +102,92 @@ The home page for this patch is: 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 + #include +@@ -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 */