]> granicus.if.org Git - mutt/log
mutt
6 years agoFix comparison of flags with multiple bits set.
Kevin McCarthy [Fri, 23 Mar 2018 03:04:46 +0000 (20:04 -0700)]
Fix comparison of flags with multiple bits set.

PGPENCRYPT, PGPKEY, SMIMEENCRYPT, and SMIMEOPAQUE are all combination
flags, with multiple bits set.  In a few places these flags were
bitwise-and'ed incorrectly: expecting a non-zero result to indicate
all the bits in the flag were set.  Change those to explicitly compare
the result against the original flag.

6 years agoUpdated French translation.
Vincent Lefevre [Fri, 23 Mar 2018 01:59:38 +0000 (02:59 +0100)]
Updated French translation.

6 years agoChange prompt string for $crypt_verify_sig
Kevin McCarthy [Thu, 22 Mar 2018 19:29:59 +0000 (12:29 -0700)]
Change prompt string for $crypt_verify_sig

Thanks to Michael Tatge for pointing out that the prompt is used for
both PGP and S/MIME.

6 years agoMerge branch 'stable'
Kevin McCarthy [Thu, 22 Mar 2018 16:39:49 +0000 (09:39 -0700)]
Merge branch 'stable'

6 years agoFix s/mime non-detached signature handling.
Kevin McCarthy [Thu, 22 Mar 2018 16:32:31 +0000 (09:32 -0700)]
Fix s/mime non-detached signature handling.

This fix is based on stbuehler's patch from
https://dev.gnupg.org/T2919.

Recent versions of gpgme seem to terminate the connection for a
protocol error.  stbuehler's analysis is that this is actually a
gpgme bug, but recreating the context works around the problem.

6 years agoChange mutt_error call in mutt_gpgme_set_sender() to dprint.
Kevin McCarthy [Thu, 15 Mar 2018 17:24:35 +0000 (10:24 -0700)]
Change mutt_error call in mutt_gpgme_set_sender() to dprint.

The message is not an error message, and flies by so quickly it has
little informative content.  Change it to use dprint instead.

Thanks to Darac Marjal for reporting the issue.

6 years agoUpdated French translation.
Vincent Lefevre [Wed, 14 Mar 2018 03:28:20 +0000 (04:28 +0100)]
Updated French translation.

6 years agoImprove the error message when a signature is missing.
Kevin McCarthy [Wed, 14 Mar 2018 02:09:45 +0000 (19:09 -0700)]
Improve the error message when a signature is missing.

Thanks to Vincent Lefèvre for reporting the issue and for the wording
suggestion!

6 years agoUpdated French translation.
Vincent Lefevre [Mon, 12 Mar 2018 11:24:24 +0000 (12:24 +0100)]
Updated French translation.

6 years agoAdd $abort_noattach and $abort_noattach_regexp options.
Kevin McCarthy [Sun, 11 Mar 2018 19:48:46 +0000 (12:48 -0700)]
Add $abort_noattach and $abort_noattach_regexp options.

$abort_noattach_regexp is matched against the body of a message.  If
so, the $abort_noattach quadoption is used to prompt whether to abort
sending.

Thanks to Antonio Radici for bringing the original version of the
patch to our attention, which he pulled from
https://github.com/tlvince/pkgbuild/blob/master/mutt-kiss/mutt-attach.patch

This version was rewritten to use a regexp, to fix a few issues, and
to better fit in with Mutt styles and conventions.

6 years agoMerge branch 'stable'
Kevin McCarthy [Sat, 3 Mar 2018 21:44:12 +0000 (13:44 -0800)]
Merge branch 'stable'

6 years agoautomatic post-release commit for mutt-1.9.4 mutt-1-9-4-rel
Kevin McCarthy [Sat, 3 Mar 2018 21:40:27 +0000 (13:40 -0800)]
automatic post-release commit for mutt-1.9.4

6 years agoMerge branch 'stable'
Kevin McCarthy [Wed, 28 Feb 2018 23:21:50 +0000 (15:21 -0800)]
Merge branch 'stable'

6 years agoAdd subjectrx section to the muttrc man page.
Kevin McCarthy [Wed, 28 Feb 2018 23:20:59 +0000 (15:20 -0800)]
Add subjectrx section to the muttrc man page.

6 years agoFix subjectrx example in the manual.
Kevin McCarthy [Wed, 28 Feb 2018 23:20:19 +0000 (15:20 -0800)]
Fix subjectrx example in the manual.

6 years agoAvoid a potential integer overflow if a Content-Length value is huge.
Vincent Lefevre [Wed, 14 Feb 2018 09:33:41 +0000 (10:33 +0100)]
Avoid a potential integer overflow if a Content-Length value is huge.

6 years agoMerge branch 'stable'
Kevin McCarthy [Thu, 22 Feb 2018 02:32:12 +0000 (18:32 -0800)]
Merge branch 'stable'

6 years agoFix is_from() year parsing to abort on year overflow.
Kevin McCarthy [Thu, 22 Feb 2018 02:25:37 +0000 (18:25 -0800)]
Fix is_from() year parsing to abort on year overflow.

Unlike mutt_parse_date(), is_from() was not checking for overflow, and
could end up passing a negative year to mutt_mktime().

It should perhaps be changed to use mutt_atoi(), which does better
range checking, but that requires mutt_atoi() being changed to allow
trailing characters and its callers return value checks being
updated.  I'll put that on the todo list.

6 years agoCap parsed years at 9999 when converting to time_t.
Kevin McCarthy [Thu, 22 Feb 2018 02:18:53 +0000 (18:18 -0800)]
Cap parsed years at 9999 when converting to time_t.

Large year values, even those less than INT_MAX, apparently can cause
gmtime() and localtime() to return NULL.  Mutt needs larger changes
checking and handling those errors, but this will prevent the
immediately triggerable issue.

6 years agoImprove index color cache flushing behavior.
Kevin McCarthy [Wed, 21 Feb 2018 03:09:16 +0000 (19:09 -0800)]
Improve index color cache flushing behavior.

Flush when redefining the colors for an existing color line, in
addition to when defining a new color line.

Flush only when uncoloring the index.

6 years agoAvoid a potential integer overflow if a Content-Length value is huge.
Vincent Lefevre [Wed, 14 Feb 2018 09:33:41 +0000 (10:33 +0100)]
Avoid a potential integer overflow if a Content-Length value is huge.

6 years agoChange mkreldate.sh to use the UTC date with git, so that it is increasing.
Vincent Lefevre [Thu, 8 Feb 2018 11:20:02 +0000 (12:20 +0100)]
Change mkreldate.sh to use the UTC date with git, so that it is increasing.

6 years agoFix document version and date for git build.
Kevin McCarthy [Tue, 6 Feb 2018 22:42:40 +0000 (14:42 -0800)]
Fix document version and date for git build.

Change mkreldate.sh to output just the date, so it can be used in the
manual too.

6 years agoUse git to generate the release date if available.
Kevin McCarthy [Tue, 6 Feb 2018 02:43:12 +0000 (18:43 -0800)]
Use git to generate the release date if available.

For now, fall back to the ChangeLog.  Perhaps the release date should
be generated from a file, similar to VERSION, for those cases instead.

6 years agoAdd a blank line between the compile options and the contact info for mutt -v
Vincent Lefevre [Tue, 6 Feb 2018 00:57:48 +0000 (01:57 +0100)]
Add a blank line between the compile options and the contact info for mutt -v

6 years agoUpdated French translation.
Vincent Lefevre [Mon, 5 Feb 2018 12:19:40 +0000 (13:19 +0100)]
Updated French translation.

6 years agoPut gitlab issues url on a separate line.
Kevin McCarthy [Sun, 4 Feb 2018 23:24:59 +0000 (15:24 -0800)]
Put gitlab issues url on a separate line.

This removes the need to use brackets, and makes it easier for
translations to fit within 80 columns.

Thanks to Derek Martin for the suggested wording, and to Vincent
Lefèvre for proofreading and noticing a small error.

6 years agoFix history menu title.
Kevin McCarthy [Sun, 4 Feb 2018 23:15:55 +0000 (15:15 -0800)]
Fix history menu title.

Remove an accidental leading space.  Thanks to Vincent Lefèvre for
noticing the problem and providing a patch!

6 years agoUpdated French translation.
Vincent Lefevre [Sun, 4 Feb 2018 17:29:52 +0000 (18:29 +0100)]
Updated French translation.

6 years agoAdd history-search function, bound to ctrl-r.
Kevin McCarthy [Sun, 4 Feb 2018 02:08:28 +0000 (18:08 -0800)]
Add history-search function, bound to ctrl-r.

Create a very basic "search history" functionality in the line editor.
It uses the current input, and searches backward through history.  If
there is one match, it immediately uses that otherwise it pops up a
simple menu of matches.

6 years agoMerge branch 'stable'
Kevin McCarthy [Thu, 1 Feb 2018 19:14:11 +0000 (11:14 -0800)]
Merge branch 'stable'

6 years agoAdd stub flea and muttbug scripts back.
Kevin McCarthy [Thu, 1 Feb 2018 19:10:01 +0000 (11:10 -0800)]
Add stub flea and muttbug scripts back.

It was rightfully pointed out that the removal was too abrupt.  These
programs have been around for a long time, and many internet searches
still say to use them for reporting bugs.

Add stub versions which inform to use the gitlab url instead.

6 years agoMerge branch 'stable'
Kevin McCarthy [Wed, 31 Jan 2018 23:01:18 +0000 (15:01 -0800)]
Merge branch 'stable'

6 years agoAdd more delimiters for gitlab url in the po files.
Kevin McCarthy [Wed, 31 Jan 2018 22:57:57 +0000 (14:57 -0800)]
Add more delimiters for gitlab url in the po files.

Some of them hid from me in my wgrep session because they were marked
as binary.

6 years agoMerge branch 'stable'
Kevin McCarthy [Wed, 31 Jan 2018 22:22:07 +0000 (14:22 -0800)]
Merge branch 'stable'

6 years agoAdd delimiters around gitlab issues URL.
Kevin McCarthy [Wed, 31 Jan 2018 22:13:42 +0000 (14:13 -0800)]
Add delimiters around gitlab issues URL.

Without the delimiters, the period can be easily inadvertantly copied
as part of the URL.

6 years agoMerge branch 'stable'
Kevin McCarthy [Sat, 27 Jan 2018 19:58:12 +0000 (11:58 -0800)]
Merge branch 'stable'

6 years agoautomatic post-release commit for mutt-1.9.3 mutt-1-9-3-rel
Kevin McCarthy [Sat, 27 Jan 2018 19:20:21 +0000 (11:20 -0800)]
automatic post-release commit for mutt-1.9.3

6 years agoRemove useless assignments in add_to_list functions.
Kevin McCarthy [Mon, 22 Jan 2018 03:41:47 +0000 (19:41 -0800)]
Remove useless assignments in add_to_list functions.

The code was probably pulled from some of the header processing
functions, which were in a loop.  In those versions, "last" pointed to
a collection of new entries appended, but in these two functions,
updating last just obfuscates the code.

6 years agoAdd a blurb about $new_mail_command in the mailboxes section.
Kevin McCarthy [Mon, 22 Jan 2018 02:56:12 +0000 (18:56 -0800)]
Add a blurb about $new_mail_command in the mailboxes section.

6 years agoMerge branch 'stable'
Kevin McCarthy [Mon, 22 Jan 2018 02:34:45 +0000 (18:34 -0800)]
Merge branch 'stable'

6 years agoFix the ftp site url in the manual.
Kevin McCarthy [Mon, 22 Jan 2018 02:33:16 +0000 (18:33 -0800)]
Fix the ftp site url in the manual.

Also fix the urlview link to point to sigpipe's github account.

6 years agoMerge branch 'stable'
Kevin McCarthy [Thu, 18 Jan 2018 03:20:04 +0000 (19:20 -0800)]
Merge branch 'stable'

6 years agoFix one more dev site reference in the manual.
Kevin McCarthy [Thu, 18 Jan 2018 03:19:01 +0000 (19:19 -0800)]
Fix one more dev site reference in the manual.

6 years agoMerge branch 'stable'
Kevin McCarthy [Thu, 18 Jan 2018 03:00:50 +0000 (19:00 -0800)]
Merge branch 'stable'

6 years agoFix a couple memory leaks in pattern.c
Kevin McCarthy [Thu, 18 Jan 2018 02:57:49 +0000 (18:57 -0800)]
Fix a couple memory leaks in pattern.c

BUFFER.data was not being freed in a couple cases.

The pattern and simple search were not being freed if imap_search()
failed.

6 years agoMerge branch 'stable'
Kevin McCarthy [Thu, 18 Jan 2018 02:18:20 +0000 (18:18 -0800)]
Merge branch 'stable'

6 years agoChange bug reporting URL to gitlab issues.
Kevin McCarthy [Thu, 18 Jan 2018 02:05:28 +0000 (18:05 -0800)]
Change bug reporting URL to gitlab issues.

6 years agoPull latest Polish translation from master.
Kevin McCarthy [Thu, 18 Jan 2018 02:01:31 +0000 (18:01 -0800)]
Pull latest Polish translation from master.

6 years agoUpdate manual to point to gitlab.com as development site.
Kevin McCarthy [Thu, 18 Jan 2018 00:21:53 +0000 (16:21 -0800)]
Update manual to point to gitlab.com as development site.

6 years agoRemove muttbug and flea.
Kevin McCarthy [Thu, 18 Jan 2018 00:16:10 +0000 (16:16 -0800)]
Remove muttbug and flea.

We have pretty much transitioned over to gitlab.com.

6 years agoUpdate po
Olaf Hering [Tue, 16 Jan 2018 08:40:11 +0000 (09:40 +0100)]
Update po

Followup for untranslate Copyright list.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
6 years agoSplit Copyright and Thanks in help output.
Olaf Hering [Tue, 16 Jan 2018 08:40:06 +0000 (09:40 +0100)]
Split Copyright and Thanks in help output.

The Copyright string is changing often, and its content is obvious.
It does not need translation. The remaining string can be translated.
This change avoids a stale translation once one of the years change.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
6 years agoUpdate po
Olaf Hering [Tue, 16 Jan 2018 08:39:57 +0000 (09:39 +0100)]
Update po

Preparation for following changes.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
6 years agoadd clang static analysis to builds brendan/gitlab-ci
Brendan Cully [Tue, 16 Jan 2018 04:20:17 +0000 (20:20 -0800)]
add clang static analysis to builds

6 years agogitlab-ci: build against openssl and gnutls
Brendan Cully [Tue, 16 Jan 2018 02:40:20 +0000 (18:40 -0800)]
gitlab-ci: build against openssl and gnutls

6 years agoAdd pgp_default_key and smime_sign_as info to contrib rc files.
Kevin McCarthy [Tue, 16 Jan 2018 00:06:30 +0000 (16:06 -0800)]
Add pgp_default_key and smime_sign_as info to contrib rc files.

Explain $pgp_default_key vs $pgp_sign_as in gpg.rc.

Explain $smime_default_key vs $smime_sign_as in smime.rc.

6 years agoAdd pages to .gitlab-ci.yml
Kevin McCarthy [Mon, 15 Jan 2018 22:20:28 +0000 (14:20 -0800)]
Add pages to .gitlab-ci.yml

Use this to regenerate the manual and store it in the pages for the
project.

6 years agoUpdate smime.rc: Typo fix, consistent headings
Konstantin Stephan [Mon, 15 Jan 2018 14:43:53 +0000 (14:43 +0000)]
Update smime.rc: Typo fix, consistent headings

6 years agouse mutt/ubuntu build image, build with everything on
Brendan Cully [Sun, 14 Jan 2018 23:50:34 +0000 (15:50 -0800)]
use mutt/ubuntu build image, build with everything on

6 years agoskeleton .gitlab-ci.yml to compile commits
Brendan Cully [Sat, 13 Jan 2018 22:49:35 +0000 (14:49 -0800)]
skeleton .gitlab-ci.yml to compile commits

6 years agoFixed GPGME translations that weren’t shown but affected the keyboard
Grzegorz Szymaszek [Sat, 13 Jan 2018 20:21:35 +0000 (21:21 +0100)]
Fixed GPGME translations that weren’t shown but affected the keyboard

6 years agoUpdate pl.po
Grzegorz Szymaszek [Sat, 13 Jan 2018 19:27:11 +0000 (20:27 +0100)]
Update pl.po

6 years agoFix typo in de.po
Olaf Hering [Sat, 13 Jan 2018 08:47:09 +0000 (09:47 +0100)]
Fix typo in de.po

Signed-off-by: Olaf Hering <olaf@aepfle.de>
6 years agoexamine_directory: set directory/symlink size to zero
Olaf Hering [Tue, 3 Dec 2013 15:42:39 +0000 (16:42 +0100)]
examine_directory: set directory/symlink size to zero

The size of a directory or symlink in the folder browser is not meaningful.
For directories it means just how many blocks were allocated to hold all
entries. It does not mean that the entries are still present in the directory.
For symlinks its the size of the target.
Set both to zero to simplify the folder browser output.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
6 years agomutt_pretty_size: show real number for small files
Olaf Hering [Tue, 3 Dec 2013 15:43:49 +0000 (16:43 +0100)]
mutt_pretty_size: show real number for small files

If a file is smaller than a certain size it is unfriendly to print 0K or
0,1K as number of mails or as file size. Instead use the real number.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
6 years agoMerge branch 'stable'
Kevin McCarthy [Thu, 11 Jan 2018 23:16:07 +0000 (15:16 -0800)]
Merge branch 'stable'

6 years agoAdd missing setup calls when resuming encrypted drafts.
Kevin McCarthy [Thu, 11 Jan 2018 23:08:30 +0000 (15:08 -0800)]
Add missing setup calls when resuming encrypted drafts.

Calls to get the passphrase were missing for app/pgp and app/smime.
App/smime was also missing a call to crypt_smime_getkeys().

If a failure occurs, report it back, rather than just continuing.
Otherwise, postponed messages could be completely lost.

6 years agoCreate pgp and s/mime default and sign_as key vars. (see #3983)
Kevin McCarthy [Thu, 11 Jan 2018 21:24:30 +0000 (13:24 -0800)]
Create pgp and s/mime default and sign_as key vars. (see #3983)

The $postpone_encrypt and $(pgp/smime)_self_encrypt configuration
variables have created a somewhat messier situation for users.  Many
of them now have to specify their keys across multiple configuration
variables.

(Trac) Ticket #3983 had a reasonable request: "if my encrypt and
signing keys are the same, why can't I just specify my key once in my
.muttrc?"

The problem currently is that $smime_default_key and $pgp_sign_as are
both used to specify signing keys, and are set by the "sign (a)s"
security menu choice.  So we can't store encryption keys there because
some users have separate sign-only capability keys.

Create $pgp_default_key to store the default encryption key.  Change
signing to use $pgp_default_key, unless overridden by $pgp_sign_as.
The pgp "sign (a)s" will continue setting $pgp_sign_as.

Create $smime_sign_as.  Change signing to use $smime_default_key
unless overridden by $smime_sign_as.  Change s/mime "sign (a)s" menu
to set $smime_sign_as instead.

Change $postpone_encrypt and $(pgp/smime)_self_encrypt to use
$(pgp/smime)_default_key by default.

Mark $(pgp/smime)_self_encrypt_as deprecated.  They are now aliases
for the $(pgp/smime)_default_key config vars.

Change $(pgp/smime)_self_encrypt default to set.

The intent is that most users now need only set
$(pgp/smime)_default_key.  If they have a sign-only key, or have
separate signing and encryption keys, they can put that in
$(pgp/smime)_sign_as.  This also enables to default self_encrypt on
and solve a very common request.

Thanks to Michele Marcionelli and Vincent Lefèvre for gently pushing
me towards a solution.

6 years agoUpdated French translation.
Vincent Lefevre [Tue, 9 Jan 2018 03:09:11 +0000 (04:09 +0100)]
Updated French translation.

6 years agoChange the default of NewMailCmd to 0.
Kevin McCarthy [Tue, 9 Jan 2018 02:07:24 +0000 (18:07 -0800)]
Change the default of NewMailCmd to 0.

This is so the documentation is generated consistently for unset
strings.

6 years agoNewMailCmd: optionally execute a command upon new mail arrival
Yoshiki Vázquez Baeza [Sun, 7 Jan 2018 13:49:45 +0000 (14:49 +0100)]
NewMailCmd: optionally execute a command upon new mail arrival

This setting allows to run any external program to e.g. produce a
notification on the desktop when Mutt finds new mail.

Signed-off-by: Fabian Groffen <grobian@gentoo.org>
6 years agocmd_handle_fatal: make error message a bit more descriptive
Fabian Groffen [Sun, 7 Jan 2018 12:06:56 +0000 (13:06 +0100)]
cmd_handle_fatal: make error message a bit more descriptive

When there are multiple IMAP connections available, "Mailbox closed"
doesn't give a hint as to which one.  Use account info to identify which
mailbox was closed.

6 years agoMerge branch 'stable'
Kevin McCarthy [Sun, 7 Jan 2018 20:18:37 +0000 (12:18 -0800)]
Merge branch 'stable'

6 years agoFix imap status count range check.
Kevin McCarthy [Sun, 7 Jan 2018 20:12:42 +0000 (12:12 -0800)]
Fix imap status count range check.

The strtoul() call for parsing the STATUS count wasn't checking the
range properly, because it was assigning to an unsigned int.

Change to assign to a unsigned long, and also add the conversion check
from mutt_atoui().

Thanks to Charles (@chdiza) for quickly noticing the problem!

6 years agoMerge branch 'stable'
Kevin McCarthy [Sun, 7 Jan 2018 00:15:39 +0000 (16:15 -0800)]
Merge branch 'stable'

6 years agoChange imap literal counts to parse and store unsigned ints.
Kevin McCarthy [Sat, 6 Jan 2018 23:55:17 +0000 (15:55 -0800)]
Change imap literal counts to parse and store unsigned ints.

IMAP literals are of type number.  Change imap_get_literal_count() to
use mutt_atoui() instead of atoi().  Change the return type variables
used to store the count to type unsigned int.

It's doubtful this was a real issue, but as long as we're cleaning up
incorrect atoi() usage, we should fix this too.

6 years agoFix improper signed int conversion of IMAP uid and msn values.
Kevin McCarthy [Sat, 6 Jan 2018 04:39:50 +0000 (20:39 -0800)]
Fix improper signed int conversion of IMAP uid and msn values.

Several places in the imap code, when parsing "number" and "nz-number"
values from the IMAP data, use atoi() and strtol().  This is
incorrect, and can result in failures when a uid value happens to be
larger than 2^31.

Create a helper function, mutt_atoui() and use that instead.  One
place was using strtol() and relying on the endptr parameter, and so
was changed to use strtoul() instead.

Thanks to Paul Saunders for the bug report and original patch, which
this commit is based on.

6 years agoUpdated French translation.
Vincent Lefevre [Thu, 4 Jan 2018 16:59:20 +0000 (17:59 +0100)]
Updated French translation.

6 years agoDisable message security if the backend is not available.
Kevin McCarthy [Sun, 31 Dec 2017 03:10:16 +0000 (19:10 -0800)]
Disable message security if the backend is not available.

Gitlab issue #3 exposed an awkward corner case: if mutt is configured
without PGP or S/MIME, and with GPGME, but $crypt_use_gpgme is unset.
In this case, no backend will be available, but WithCrypto will be set
with both APPLICATION_PGP and APPLICATION_SMIME bits.

That will allow various config vars to enable encryption or signing,
even though there will be no backend available to perform them.  The
message security flag might then be set, but when the user hits send,
will end up back at the compose menu due to the error.

The pgp or smime menu might not even be available to clear the
security setting!

Add a check in send.c before the compose menu is invoked, and give a
warning message for the menu ops inside the compose menu.

I believe this should prevent the issue.  However this is a corner
case combined with user misconfiguration, so I don't believe is worth
a large effort to completely eradicate.

6 years agoConverted po/pl.po from ISO-8859-2 to UTF-8
Grzegorz Szymaszek [Fri, 29 Dec 2017 14:20:38 +0000 (15:20 +0100)]
Converted po/pl.po from ISO-8859-2 to UTF-8

I’ve converted the Polish translation file to UTF-8 using iconv 2.25.

7 years agoMention self_encrypt options in the documentation. (closes #3983)
Kevin McCarthy [Thu, 28 Dec 2017 21:07:21 +0000 (13:07 -0800)]
Mention self_encrypt options in the documentation. (closes #3983)

Add a paragraph to the "Sending Cryptographically Signed/Encrypted
Messages" section of the manual.

7 years agoMerge branch 'stable'
Kevin McCarthy [Tue, 26 Dec 2017 23:09:28 +0000 (15:09 -0800)]
Merge branch 'stable'

7 years agoUpdate wiki link in manual.
Kevin McCarthy [Tue, 26 Dec 2017 23:09:07 +0000 (15:09 -0800)]
Update wiki link in manual.

7 years agoMerge branch 'stable'
Kevin McCarthy [Mon, 18 Dec 2017 21:02:17 +0000 (13:02 -0800)]
Merge branch 'stable'

7 years agoDetermine latest tag using git describe.
Kevin McCarthy [Mon, 18 Dec 2017 20:55:20 +0000 (12:55 -0800)]
Determine latest tag using git describe.

Commit 8648db83 relies on `sort -V` which is unavailable on some
platforms.  Instead just use `git describe` with --abbrev=0 to only
output the tag.  We still manually compute the distance to avoid the
problem mentioned in that commit.

Additionally, add Vincent's fix from commit 3b142cea to the stable
branch.

7 years agoFixed git repo detection: for worktrees, .git is a plain file.
Vincent Lefevre [Mon, 18 Dec 2017 02:01:07 +0000 (03:01 +0100)]
Fixed git repo detection: for worktrees, .git is a plain file.

7 years agomanually touch atime when reading a mbox file
Adam Borowski [Sun, 17 Dec 2017 12:36:21 +0000 (13:36 +0100)]
manually touch atime when reading a mbox file

The only common use of atime left is local mail agents leaving a mark on
mbox file after the mail has been read.  And, since POSIX-2008, it is
possible to use futimens() to alter atime even on filesystems mounted with
noatime.

There's no extra cost for doing this on when atime updates are enabled:
the inode will be dirty already.

7 years agoAdd config.cache to .gitignore file.
Kevin McCarthy [Sun, 17 Dec 2017 20:16:10 +0000 (12:16 -0800)]
Add config.cache to .gitignore file.

7 years agoMerge branch 'stable'
Kevin McCarthy [Fri, 15 Dec 2017 23:56:39 +0000 (15:56 -0800)]
Merge branch 'stable'

7 years agoautomatic post-release commit for mutt-1.9.2 mutt-1-9-2-rel
Kevin McCarthy [Fri, 15 Dec 2017 23:31:23 +0000 (15:31 -0800)]
automatic post-release commit for mutt-1.9.2

7 years agoMerge branch 'stable'
Kevin McCarthy [Fri, 15 Dec 2017 20:18:12 +0000 (12:18 -0800)]
Merge branch 'stable'

7 years agoFix s/mime certificate deletion bug. (closes #3982)
Kevin McCarthy [Fri, 15 Dec 2017 20:09:42 +0000 (12:09 -0800)]
Fix s/mime certificate deletion bug. (closes #3982)

Commit c1bcf4ba exposed a bug in the s/mime encryption code.  It was
errorneously calling unlink on the list of generated cert files to
use.

Prior to that commit, the list had an initial space, which apparently
made the unlink fail.  After that commit, encrypting to a single
certificate would end up deleting the certificate.

Remove the calls to unlink the cert file.  Add some missing cleanup if
the call to openssl fails.

7 years agoMerge branch 'stable'
Kevin McCarthy [Fri, 15 Dec 2017 00:21:04 +0000 (16:21 -0800)]
Merge branch 'stable'

7 years agoUpdate mkchangelog.sh to use git.
Kevin McCarthy [Fri, 15 Dec 2017 00:16:27 +0000 (16:16 -0800)]
Update mkchangelog.sh to use git.

The output isn't quite as nice as the hg generated version, but is
close.

With Mercurial, and now Git, I'm not sure of the usefulness of
maintaining a ChangeLog file in the repos, but that is another
discussion.

7 years agoRemove hg-commit and Makefile commit target.
Kevin McCarthy [Wed, 13 Dec 2017 03:09:42 +0000 (19:09 -0800)]
Remove hg-commit and Makefile commit target.

I haven't ever used this script, and we only update the ChangeLog
during releases now.

doc/devel-notes already mentions running check_sec.sh.  Add a mention
of the 'make validate' target too.

7 years agoMerge branch 'stable'
Kevin McCarthy [Wed, 13 Dec 2017 02:27:24 +0000 (18:27 -0800)]
Merge branch 'stable'

7 years agoMinor tweaks to the version.sh fixes from last commit.
Kevin McCarthy [Wed, 13 Dec 2017 02:17:10 +0000 (18:17 -0800)]
Minor tweaks to the version.sh fixes from last commit.

Add back a check for whether the git program exists.

Don't show distance if it is zero.

Remove the dirty flag.

Remove the initial "g" prefix from the commitid.  This is added by git
describe, but I don't think we need to preserve it.

7 years agoChange version.sh to manually compute version and distance.
Aaron Schrab [Tue, 12 Dec 2017 02:46:30 +0000 (21:46 -0500)]
Change version.sh to manually compute version and distance.

In some cases `git describe` gives bizarre results (see URL below),
instead get the highest version-numbered tag contained in HEAD then
count the number of commits that aren't included in it.

https://public-inbox.org/git/20161205232712.GA23868@pug.qqx.org/

7 years agoMerge branch 'stable'
Kevin McCarthy [Mon, 11 Dec 2017 04:06:05 +0000 (20:06 -0800)]
Merge branch 'stable'