[mutt] 01/03: New upstream version 1.9.2
Antonio Radici
antonio at moszumanska.debian.org
Sat Dec 16 09:18:55 UTC 2017
This is an automated email from the git hooks/post-receive script.
antonio pushed a commit to branch master
in repository mutt.
commit acb7c96ea323b4219f93f536c216ab69b2458549
Author: Antonio Radici <antonio at debian.org>
Date: Sat Dec 16 09:12:55 2017 +0000
New upstream version 1.9.2
---
COPYRIGHT | 2 +-
ChangeLog | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 3 --
Makefile.in | 3 --
README | 6 +--
UPDATING | 4 ++
VERSION | 2 +-
configure | 20 +++----
doc/devel-notes.txt | 26 +++++-----
doc/index.html | 2 +-
doc/manual.html | 2 +-
doc/manual.txt | 2 +-
imap/imap.c | 6 ---
mkchangelog.sh | 16 +++++-
mx.c | 2 +-
po/mutt.pot | 32 ++++++------
rfc822.c | 4 +-
smime.c | 6 +--
version.sh | 66 ++++-------------------
19 files changed, 230 insertions(+), 121 deletions(-)
diff --git a/COPYRIGHT b/COPYRIGHT
index 0c15e56..b9bd479 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -5,7 +5,7 @@ Please note that this is by no means an exhaustive list of all the
persons who have been contributing to this program. Please see the
manual for a (probably still non complete) list of the persons who
have been helpful with the development of this program. Please also
-see our source code repository at http://dev.mutt.org/hg/mutt/ for
+see our source code repository at https://gitlab.com/muttmua/mutt for
the full history of commits.
Copyright (C) 1996-2016 Michael R. Elkins <me at cs.hmc.edu>
diff --git a/ChangeLog b/ChangeLog
index 7965a71..2422129 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,150 @@
+2017-12-15 12:09:42 -0800 Kevin McCarthy <kevin at 8t8.us> (9eedfd4e)
+
+ * 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.
+
+M smime.c
+
+2017-12-14 16:16:27 -0800 Kevin McCarthy <kevin at 8t8.us> (841f7101)
+
+ * 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.
+
+D hg-changelog-map
+M mkchangelog.sh
+
+2017-12-12 19:09:42 -0800 Kevin McCarthy <kevin at 8t8.us> (ecbd86c9)
+
+ * 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.
+
+M Makefile.am
+M doc/devel-notes.txt
+D hg-commit
+
+2017-12-12 18:17:10 -0800 Kevin McCarthy <kevin at 8t8.us> (a4d08d25)
+
+ * 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.
+
+M version.sh
+
+2017-12-11 21:46:30 -0500 Aaron Schrab <aaron+mutt at schrab.com> (8648db83)
+
+ * 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/
+
+M version.sh
+
+2017-12-10 20:03:30 -0800 Kevin McCarthy <kevin at 8t8.us> (7b65f780)
+
+ * Update some of the documentation to refer to git.
+
+ Also update the repos URL.
+
+M COPYRIGHT
+M README
+M doc/devel-notes.txt
+
+2017-12-03 17:55:59 -0800 Kevin McCarthy <kevin at 8t8.us> (6df931c8)
+
+ * Convert version.sh to work with git.
+
+ Use the built-in `git describe` to get the tag, distance, and
+ revision id.
+
+M version.sh
+
+2017-12-02 19:27:14 -0800 Kevin McCarthy <kevin at 8t8.us> (0ad4c11d)
+
+ * Convert to .gitignore file.
+
+A .gitignore
+D .hgignore
+
+2017-09-30 19:15:08 -0700 Kevin McCarthy <kevin at 8t8.us> (1f4a6c67)
+
+ * Fix address group terminator "exact address" printing to display trailing semicolon.
+
+ The exact-address handling for comma and colon are different because
+ those are added outside the exact-address printing.
+
+ The semicolon needs to be inside the address->val field of the address
+ group terminator.
+
+M rfc822.c
+
+2017-09-26 19:44:11 -0700 Kevin McCarthy <kevin at 8t8.us> (0bcb77a6)
+
+ * Fix uses of context->changed as a counter.
+
+ The first was in mx_update_tables(), but only when "not committing".
+ This is used by mh/maildir during an "occult" update, and in imap when
+ expunging the mailbox. It meant to simply turn on changed when a
+ single changed header is seen.
+
+ The second use was in imap_sync_message_for_copy(). Previously this
+ was used for a server side copy/save, but is now also used for
+ fast-trash copying. Remove the code that was trying to decrement the
+ counter: this function is not capable of properly setting a status
+ bit.
+
+M imap/imap.c
+M mx.c
+
+2017-09-23 11:40:44 -0700 Kevin McCarthy <kevin at 8t8.us> (b333df6d)
+
+ * mutt-1.9.1 signed
+
+M .hgsigs
+
+2017-09-23 11:39:54 -0700 Kevin McCarthy <kevin at 8t8.us> (5e007dac)
+
+ * Added tag mutt-1-9-1-rel for changeset 869633ef393e
+
+M .hgtags
+
+2017-09-23 11:39:45 -0700 Kevin McCarthy <kevin at 8t8.us> (8473efa7)
+
+ * automatic post-release commit for mutt-1.9.1
+
+M ChangeLog
+M UPDATING
+M VERSION
2017-09-22 11:14 -0700 Kevin McCarthy <kevin at 8t8.us> (19c81a140c6e)
* imap/imap.c: Add missing IMAP_CMD_POLL flag in imap buffy check.
diff --git a/Makefile.am b/Makefile.am
index 4bc2db4..88698b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -188,9 +188,6 @@ pclean:
check-security:
(cd $(top_srcdir) && ./check_sec.sh)
-commit:
- @echo "make commit is obsolete; use hg-commit"; false
-
update-changelog:
(cd $(top_srcdir); \
sh ./mkchangelog.sh | cat - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog; \
diff --git a/Makefile.in b/Makefile.in
index c6f093c..6229544 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1386,9 +1386,6 @@ pclean:
check-security:
(cd $(top_srcdir) && ./check_sec.sh)
-commit:
- @echo "make commit is obsolete; use hg-commit"; false
-
update-changelog:
(cd $(top_srcdir); \
sh ./mkchangelog.sh | cat - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog; \
diff --git a/README b/README
index 70ef0c2..d6ce560 100644
--- a/README
+++ b/README
@@ -5,9 +5,9 @@ When updating mutt from an earlier release or from Mercurial, please
make sure to read the compatibility notes in ``UPDATING''. Older changes
between mutt-1.2 and mutt-1.4 are listed in NEWS.
-If you got the mutt source code from the public Mercurial repository
-(http://dev.mutt.org/hg/mutt/), please read doc/devel-notes.txt to make
-sure that you have a complete development environment.
+If you got the mutt source code from the public source code
+repository, please read doc/devel-notes.txt to make sure that you have
+a complete development environment.
Installation instructions are detailed in ``INSTALL''. The user manual
is in doc/manual.txt. PGP users should read doc/PGP-Notes.txt.
diff --git a/UPDATING b/UPDATING
index b047e33..17fc388 100644
--- a/UPDATING
+++ b/UPDATING
@@ -8,6 +8,10 @@ http://www.mutt.org/doc/manual/
The keys used are:
!: modified feature, -: deleted feature, +: new feature
+1.9.2 (2017-12-15):
+
+ ! Bug fix release.
+
1.9.1 (2017-09-23):
! Bug fix release.
diff --git a/VERSION b/VERSION
index 9ab8337..8fdcf38 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.9.1
+1.9.2
diff --git a/configure b/configure
index 53aeaed..0b7f7be 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mutt 1.9.1.
+# Generated by GNU Autoconf 2.69 for mutt 1.9.2.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='mutt'
PACKAGE_TARNAME='mutt'
-PACKAGE_VERSION='1.9.1'
-PACKAGE_STRING='mutt 1.9.1'
+PACKAGE_VERSION='1.9.2'
+PACKAGE_STRING='mutt 1.9.2'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1391,7 +1391,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures mutt 1.9.1 to adapt to many kinds of systems.
+\`configure' configures mutt 1.9.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1462,7 +1462,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mutt 1.9.1:";;
+ short | recursive ) echo "Configuration of mutt 1.9.2:";;
esac
cat <<\_ACEOF
@@ -1607,7 +1607,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mutt configure 1.9.1
+mutt configure 1.9.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2255,7 +2255,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mutt $as_me 1.9.1, which was
+It was created by mutt $as_me 1.9.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3122,7 +3122,7 @@ fi
# Define the identity of the package.
PACKAGE='mutt'
- VERSION='1.9.1'
+ VERSION='1.9.2'
cat >>confdefs.h <<_ACEOF
@@ -13792,7 +13792,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mutt $as_me 1.9.1, which was
+This file was extended by mutt $as_me 1.9.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13858,7 +13858,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mutt config.status 1.9.1
+mutt config.status 1.9.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/doc/devel-notes.txt b/doc/devel-notes.txt
index 4eede0f..99bc0fa 100644
--- a/doc/devel-notes.txt
+++ b/doc/devel-notes.txt
@@ -7,8 +7,8 @@ majordomo at mutt.org). Announcements about recent development
versions go to that mailing list, as go technical discussions and
patches.
-Patches should, if possible, be made using Mercurial against
-the latest revision.
+Patches should, if possible, be made using Git against the latest
+revision.
You'll need several GNU development utilities for working on mutt:
@@ -121,13 +121,13 @@ to turn the HTML into text, so if that fails you may need to install
something else.
-Getting started from Mercurial
-------------------------------
+Getting started from Git
+------------------------
-The official Mercurial repository is located at:
-http://dev.mutt.org/hg/mutt/. You can get a fresh clone via:
+The official Git repository is located at:
+https://gitlab.com/muttmua/mutt. You can get a fresh clone via:
- $ hg clone http://dev.mutt.org/hg/mutt/ mutt
+ $ git clone https://gitlab.com/muttmua/mutt.git mutt
Once you've checked out a copy of the source, or changed your
automake version, you'll need to run the script called './prepare' that
@@ -138,16 +138,16 @@ magic that needs to be done with a fresh checkout.
Contributing patches
--------------------
-As Mercurial is a distributed version control system, it's easy to
+As Git is a distributed version control system, it's easy to
commit changes locally without impacting anybody else's work, starting
over again, or turn several commit and backouts into a new single patch
ready for submission.
These so-called "changesets" (a diff with a reasonable message
-describing the change) can be exported using Mercurial through the
-"patchbomb" extension shipped with Mercurial (please see the hg
-documentation for details) which also is the preferred format for
-submission to the mutt-dev mailing list for discussion and review.
+describing the change) can be exported using Git through the
+"send-email" command (please see the git documentation for details)
+which also is the preferred format for submission to the mutt-dev
+mailing list for discussion and review.
In order to ease later bisecting in case of bugs and code history,
changes should be grouped logically, feature by feature or bugfix by
@@ -156,6 +156,8 @@ should be avoided.
Before submitting patches, please make sure the check_sec.sh script
in the top-level source directory reports no errors/warnings.
+Documentation changes should be validated by running 'make validate'
+in the doc subdirectory.
A word about warnings
---------------------
diff --git a/doc/index.html b/doc/index.html
index db70e17..11088ac 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -26,7 +26,7 @@ div.note { margin-bottom: 5px; }
tr { vertical-align: top; }
.comment { color:#707070; }
- </style></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">The Mutt E-Mail Client</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="intro.html">Next</a></td></tr></table><hr /></div><div class="book"><div class="titlepage"><div><div><h1 class="title"><a id="idm1"></a>The Mutt E-Mail Client</h1></div><div><div class="author"><h3 c [...]
+ </style></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">The Mutt E-Mail Client</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="intro.html">Next</a></td></tr></table><hr /></div><div class="book"><div class="titlepage"><div><div><h1 class="title"><a id="idm1"></a>The Mutt E-Mail Client</h1></div><div><div class="author"><h3 c [...]
<span class="quote">“<span class="quote">All mail clients suck. This one just sucks less.</span>”</span> —
me, circa 1995
</p></div></div></div><hr /></div><div class="toc"><p><strong>Table of Contents</strong></p><dl class="toc"><dt><span class="chapter"><a href="intro.html">1. Introduction</a></span></dt><dd><dl><dt><span class="sect1"><a href="intro.html#homepage">1. Mutt Home Page</a></span></dt><dt><span class="sect1"><a href="intro.html#muttlists">2. Mailing Lists</a></span></dt><dt><span class="sect1"><a href="intro.html#distribution">3. Getting Mutt</a></span></dt><dt><span class="sect1"><a href="in [...]
\ No newline at end of file
diff --git a/doc/manual.html b/doc/manual.html
index b2d2771..ea2ec0e 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -26,7 +26,7 @@ div.note { margin-bottom: 5px; }
tr { vertical-align: top; }
.comment { color:#707070; }
- </style></head><body><div class="book"><div class="titlepage"><div><div><h1 class="title"><a id="idm1"></a>The Mutt E-Mail Client</h1></div><div><div class="author"><h3 class="author"><span class="firstname">Michael</span> <span class="surname">Elkins</span></h3><code class="email"><<a class="email" href="mailto:me at cs.hmc.edu">me at cs.hmc.edu</a>></code></div></div><div><p class="releaseinfo">version 1.9.1 (2017-09-22)</p></div><div><div class="abstract"><p class="title"><strong> [...]
+ </style></head><body><div class="book"><div class="titlepage"><div><div><h1 class="title"><a id="idm1"></a>The Mutt E-Mail Client</h1></div><div><div class="author"><h3 class="author"><span class="firstname">Michael</span> <span class="surname">Elkins</span></h3><code class="email"><<a class="email" href="mailto:me at cs.hmc.edu">me at cs.hmc.edu</a>></code></div></div><div><p class="releaseinfo">version 1.9.2 (2017-12-15)</p></div><div><div class="abstract"><p class="title"><strong> [...]
<span class="quote">“<span class="quote">All mail clients suck. This one just sucks less.</span>”</span> —
me, circa 1995
</p></div></div></div><hr /></div><div class="toc"><p><strong>Table of Contents</strong></p><dl class="toc"><dt><span class="chapter"><a href="#intro">1. Introduction</a></span></dt><dd><dl><dt><span class="sect1"><a href="#homepage">1. Mutt Home Page</a></span></dt><dt><span class="sect1"><a href="#muttlists">2. Mailing Lists</a></span></dt><dt><span class="sect1"><a href="#distribution">3. Getting Mutt</a></span></dt><dt><span class="sect1"><a href="#irc">4. Mutt Online Resources</a></ [...]
diff --git a/doc/manual.txt b/doc/manual.txt
index 9237ace..b1846d1 100644
--- a/doc/manual.txt
+++ b/doc/manual.txt
@@ -4,7 +4,7 @@ Michael Elkins
<[1]mmee@@ccss..hhmmcc..eedduu>
- version 1.9.1 (2017-09-22)
+ version 1.9.2 (2017-12-15)
_A_b_s_t_r_a_c_t
diff --git a/imap/imap.c b/imap/imap.c
index 0bb2d5f..b3e780c 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -1102,10 +1102,7 @@ int imap_sync_message_for_copy (IMAP_DATA *idata, HEADER *hdr, BUFFER *cmd,
if (!compare_flags_for_copy (hdr))
{
if (hdr->deleted == HEADER_DATA(hdr)->deleted)
- {
hdr->changed = 0;
- idata->ctx->changed--;
- }
return 0;
}
@@ -1172,10 +1169,7 @@ int imap_sync_message_for_copy (IMAP_DATA *idata, HEADER *hdr, BUFFER *cmd,
hdr->active = 1;
if (hdr->deleted == HEADER_DATA(hdr)->deleted)
- {
hdr->changed = 0;
- idata->ctx->changed--;
- }
return 0;
}
diff --git a/mkchangelog.sh b/mkchangelog.sh
index 2b610da..fc03a6f 100755
--- a/mkchangelog.sh
+++ b/mkchangelog.sh
@@ -1,5 +1,17 @@
#!/bin/sh
+#
+# Generates the ChangeLog since the last release.
-lrev=$(hg log --limit 1 --template '{rev}' ChangeLog)
+# This would generate based on the last update of the ChangeLog, instead:
+# lrev=$(git log -1 --pretty=format:"%H" ChangeLog)
-hg log --style=./hg-changelog-map -r "reverse($lrev::.)"
+lrev=$(git tag --merged=HEAD --list 'mutt-*-rel' | tr - . | sort -Vr | head -n1 | tr . -)
+
+# This is a rough approximation of the official ChangeLog format
+# previously generated by hg. Git doesn't provide enough formatting
+# tools to produce this more accurately. We could post-format it with
+# a script, but I'm not sure enough people care about this file
+# anymore to make it worth the effort.
+git log --name-status \
+ --pretty=format:"%ai %an <%ae> (%h)%n%n%w(,8,8)* %s%n%+b" \
+ ${lrev}^..
diff --git a/mx.c b/mx.c
index 5d6782a..1f99120 100644
--- a/mx.c
+++ b/mx.c
@@ -1054,7 +1054,7 @@ void mx_update_tables(CONTEXT *ctx, int committing)
if (committing)
ctx->hdrs[j]->changed = 0;
else if (ctx->hdrs[j]->changed)
- ctx->changed++;
+ ctx->changed = 1;
if (!committing || (ctx->magic == MUTT_MAILDIR && option (OPTMAILDIRTRASH)))
{
diff --git a/po/mutt.pot b/po/mutt.pot
index 7c33307..356bcde 100644
--- a/po/mutt.pot
+++ b/po/mutt.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-23 11:39-0700\n"
+"POT-Creation-Date: 2017-12-15 15:28-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -2361,71 +2361,71 @@ msgstr ""
msgid "Error opening mailbox"
msgstr ""
-#: imap/imap.c:837 imap/imap.c:2231 imap/message.c:1014 muttlib.c:1683
+#: imap/imap.c:837 imap/imap.c:2225 imap/message.c:1014 muttlib.c:1683
#, c-format
msgid "Create %s?"
msgstr ""
-#: imap/imap.c:1247
+#: imap/imap.c:1241
msgid "Expunge failed"
msgstr ""
-#: imap/imap.c:1259
+#: imap/imap.c:1253
#, c-format
msgid "Marking %d messages deleted..."
msgstr ""
-#: imap/imap.c:1291
+#: imap/imap.c:1285
#, c-format
msgid "Saving changed messages... [%d/%d]"
msgstr ""
-#: imap/imap.c:1347
+#: imap/imap.c:1341
msgid "Error saving flags. Close anyway?"
msgstr ""
-#: imap/imap.c:1355
+#: imap/imap.c:1349
msgid "Error saving flags"
msgstr ""
-#: imap/imap.c:1378
+#: imap/imap.c:1372
msgid "Expunging messages from server..."
msgstr ""
-#: imap/imap.c:1384
+#: imap/imap.c:1378
msgid "imap_sync_mailbox: EXPUNGE failed"
msgstr ""
-#: imap/imap.c:1871
+#: imap/imap.c:1865
#, c-format
msgid "Header search without header name: %s"
msgstr ""
-#: imap/imap.c:1942
+#: imap/imap.c:1936
msgid "Bad mailbox name"
msgstr ""
-#: imap/imap.c:1966
+#: imap/imap.c:1960
#, c-format
msgid "Subscribing to %s..."
msgstr ""
-#: imap/imap.c:1968
+#: imap/imap.c:1962
#, c-format
msgid "Unsubscribing from %s..."
msgstr ""
-#: imap/imap.c:1978
+#: imap/imap.c:1972
#, c-format
msgid "Subscribed to %s"
msgstr ""
-#: imap/imap.c:1980
+#: imap/imap.c:1974
#, c-format
msgid "Unsubscribed from %s"
msgstr ""
-#: imap/imap.c:2216 imap/message.c:978
+#: imap/imap.c:2210 imap/message.c:978
#, c-format
msgid "Copying %d messages to %s..."
msgstr ""
diff --git a/rfc822.c b/rfc822.c
index d347d69..5b3f0b8 100644
--- a/rfc822.c
+++ b/rfc822.c
@@ -494,10 +494,10 @@ ADDRESS *rfc822_parse_adrlist (ADDRESS *top, const char *s)
phraselen = 0;
commentlen = 0;
- s++;
#ifdef EXACT_ADDRESS
- begin = skip_email_wsp(s);
+ begin = s;
#endif
+ s++;
}
else if (*s == '<')
{
diff --git a/smime.c b/smime.c
index f447d56..0ba58a1 100644
--- a/smime.c
+++ b/smime.c
@@ -1391,8 +1391,8 @@ BODY *smime_build_smime_entity (BODY *a, char *certlist)
if ((smimeerr = safe_fopen (smimeerrfile, "w+")) == NULL)
{
mutt_perror (smimeerrfile);
- safe_fclose (&fpout);
mutt_unlink (tempfile);
+ safe_fclose (&fpout);
return NULL;
}
mutt_unlink (smimeerrfile);
@@ -1433,9 +1433,10 @@ BODY *smime_build_smime_entity (BODY *a, char *certlist)
fileno (fpout), fileno (smimeerr),
smimeinfile, certfile)) == -1)
{
+ mutt_unlink (tempfile);
+ safe_fclose (&fpout);
safe_fclose (&smimeerr);
mutt_unlink (smimeinfile);
- mutt_unlink (certfile);
return (NULL);
}
@@ -1443,7 +1444,6 @@ BODY *smime_build_smime_entity (BODY *a, char *certlist)
mutt_wait_filter (thepid);
mutt_unlink (smimeinfile);
- mutt_unlink (certfile);
fflush (fpout);
rewind (fpout);
diff --git a/version.sh b/version.sh
index d7988df..45dac50 100644
--- a/version.sh
+++ b/version.sh
@@ -1,68 +1,24 @@
#!/bin/sh
-HG=hg
-
# Switch to directory where this script lives so that further commands are run
# from the root directory of the source. The script path and srcdir are double
# quoted to allow the space character to appear in the path.
srcdir=`dirname "$0"` && cd "$srcdir" || exit 1
-# Ensure that we have a repo here and that mercurial is installed. If
-# not, just cat the VERSION file; it contains the latest release number.
-{ [ -d ".hg" ] && $HG >/dev/null 2>&1; } \
+# Ensure that we have a repo here.
+# If not, just cat the VERSION file; it contains the latest release number.
+{ [ -d ".git" ] && command -v git >/dev/null 2>&1; } \
|| exec cat VERSION
-# This is a mercurial repo and we have the hg command.
-
-# Get essential properties of the current working copy
-set -- `$HG parents --template='{rev} {node|short}\n'`
-rev="$1"
-node="$2"
-
-# translate release tags into ##.##.## notation
-cleantag () {
- case "$1" in
- mutt-*-rel) echo "$1" | sed -e 's/mutt-//' -e 's/-rel//' | tr - . ;;
- *) echo "$1" ;;
- esac
-}
-
-getdistance_old () {
- # fudge it
- set -- `$HG tags | sort -n -k 2 | egrep 'mutt-.*rel' | tail -1 | cut -d: -f1`
- latesttag="$1"
- latestrev="$2"
- distance=`expr $rev - $latestrev`
- echo $latesttag $distance
-}
-
-getdistance_new () {
- $HG parents --template='{latesttag} {latesttagdistance}\n'
-}
-
-
-# latesttag appeared in hg 1.4. Test for it.
-[ "`$HG log -r . --template='{latesttag}'`" = '' ] &&
-set -- `getdistance_old` ||
-set -- `getdistance_new`
-
-tag=`cleantag "$1"`
-dist=$2
-
-if [ $dist -eq 0 ]; then
- dist=
-else
- dist="+$dist"
-fi
+latesttag="$(git tag --merged=HEAD --list 'mutt-*-rel' | tr - . | sort -Vr | head -n1 | tr . -)"
+version="$(echo $latesttag | sed -e s/mutt-// -e s/-rel// -e s/-/./g)"
+distance="$(git rev-list --count $latesttag..)"
+commitid="$(git rev-parse --short HEAD)"
-# if we have mq patches applied, mention it
-qparent=`$HG log -r qparent --template='{rev}\n' 2>/dev/null || echo $rev`
-qdelta=`expr $rev - $qparent`
-if [ $qdelta -eq 0 ]; then
- qdist=""
+if [ $distance -eq 0 ]; then
+ distance=
else
- qdist=",mq+$qdelta"
+ distance="+$distance"
fi
-echo "$tag$dist$qdist ($node)"
-exit 0
+echo "${version}${distance} (${commitid})"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git
More information about the pkg-mutt-commits
mailing list