Package: release.debian.org
Severity: normal
X-Debbugs-Cc: neomutt@packages.debian.org
Control: affects -1 + src:neomutt
User: release.debian.org@packages.debian.org
Usertags: unblock
Hi Release Team,
Please unblock package neomutt
I did not upload to unstable and will wait an ack from you before
doing so.
[ Reason ]
Neomutt had a patch release on May 10th. The commit diff between
20250404 and the latest release can be seen here [1] (25 commits).
I have picked 5 patches already fixing bugs in -2 which is in testing,
but there a few more in the bugfix release.
[ Impact ]
There are some bugfixes for use cases related to IMAP and using labels. Namely:
0bfef9844 imap: check for incomplete Mailboxes on sync
381e07697 Fix gpg-json output (#4616)
aec3e4b71 fix label completion crash
The first and third result in crashes, so users might be a bit upset
about it.
[ Tests ]
Unfortunately I didn't have time to proper consider implementing
autopkgtest, but we do have many build time tests which are passing.
I've also uploaded to experimental a week ago to test things and see if everything is working properly, so far all good.
[ Risks ]
Neomutt is a leaf package so I won't be breaking any other package.
Aside from that, the diff is pretty simple (mind most of it is Esperanto translation that was added and the patches I've picked from upstream
being removed). Obviously there is always the chance of introducing regressions, but it was mostly bugfixes and no new feature were
introduced, so pretty low risk in my opinion.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
Here is the upstream changelog (I'll mark the cherry-picked commits with
a *).
0eba4efcb (HEAD -> main, tag: 20250510, upstream/main) NeoMutt 2025-05-10
10b81bc5b trans: sync to source
aec3e4b71 fix label completion crash
de5453aff Build and test on FreeBSD (#4618)
941987d0e Update lt_LT translations
1c527a20b merge: update Esperanto translation
509c07a3e Fixed a misspelling
92d7a6e8e [EO] 100%, replaced the bad translation of (c)lear [it's not a verb (to clear the selection) but an adjective (send as clear text)]
5928849e7 [EO] 90%
37557d27d [EO] 80%
43e56da6d [EO] 70%
62a6c31a7 [EO] 50%
edf1b687e [EO] 40%
64b3508d4 [EO] 30%
dfd1f7a71 [EO] 20%
4b13358f6 [EO] 10%
89bce1b69 [EO] Help screen
381e07697 Fix gpg-json output (#4616)
0bfef9844 imap: check for incomplete Mailboxes on sync
*a74ff1b99 docs: fix broken functions
1401cbb93 Check for DocBook XSL
*70d6b5b75 help: fix leaks
*efaaea925 Don't consider "weed" when writing an email to file (#4604) *676914a48 color: fix quoted maths
*2d7347c77 main: don't stop if /var/spool/mail is missing
unblock neomutt/20250510+dfsg-2
Cheers,
Charles
[1] https://github.com/neomutt/neomutt/compare/20250404...20250510
diff -Nru neomutt-20250404+dfsg/AUTHORS.md neomutt-20250510+dfsg/AUTHORS.md --- neomutt-20250404+dfsg/AUTHORS.md 2025-04-04 06:48:33.000000000 -0300
+++ neomutt-20250510+dfsg/AUTHORS.md 2025-05-10 06:17:14.000000000 -0300
@@ -152,8 +152,10 @@
[Josh Poimboeuf](https://github.com/jpoimboe "jpoimboe"),
[Joshua Jordi](https://github.com/jakkinstewart "jakkinstewart"),
[Julian Andres Klode](https://github.com/julian-klode "julian-klode"), +[Juris Lambda](https://github.com/jxlambda "jxlambda"),
[Justin Vasel](https://github.com/justinvasel "justinvasel"),
[Karel Zak](https://github.com/karelzak "karelzak"), +[Keith Bowes](https://github.com/keithbowes "keithbowes"),
[Kevin Decherf](https://github.com/kdecherf "kdecherf"),
[Kevin Velghe](https://github.com/paretje "paretje"),
[Kurt Jaeger](https://github.com/opsec "opsec"),
diff -Nru neomutt-20250404+dfsg/auto.def neomutt-20250510+dfsg/auto.def
--- neomutt-20250404+dfsg/auto.def 2025-04-04 06:48:33.000000000 -0300
+++ neomutt-20250510+dfsg/auto.def 2025-05-10 06:17:14.000000000 -0300
@@ -16,7 +16,7 @@
###############################################################################
# Names and versions
define PACKAGE "neomutt"
-define PACKAGE_VERSION "20250404"
+define PACKAGE_VERSION "20250510"
define BUGS_ADDRESS "neomutt-devel@neomutt.org"
# Subdirectories that contain additional Makefile.autosetup files
@@ -484,11 +484,11 @@
user-error "Unable to find xsltproc"
}
- msg-checking "Checking for DocBook DTDs..."
- set res [exec xmlcatalog --shell << {public "-//OASIS//DTD DocBook XML V4.2//EN"}]
- if {[string match {> No entry*} $res]} {
- msg-result "no"
- user-error "Install DocBook DTDs or './configure --disable-doc'"
+ msg-checking "Checking for DocBook DTDs and Stylesheets..."
+ foreach catalog { "-//OASIS//DTD DocBook XML V4.2//EN" "http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl" } {
+ if {[catch {exec xmlcatalog "" $catalog}]} {
+ user-error "Install DocBook DTDs and Stylesheets or './configure --disable-doc'"
+ }
}
msg-result "yes"
diff -Nru neomutt-20250404+dfsg/ChangeLog.md neomutt-20250510+dfsg/ChangeLog.md
--- neomutt-20250404+dfsg/ChangeLog.md 2025-04-04 06:48:33.000000000 -0300
+++ neomutt-20250510+dfsg/ChangeLog.md 2025-05-10 06:17:14.000000000 -0300
@@ -1,3 +1,22 @@
+2025-05-10 Richard Russon \<rich@flatcap.org\>
+* Contrib
+ - #4616 Fix gpg-json output
+* Bug Fixes
+ - #4600 main: don't stop if /var/spool/mail is missing
+ - #4602 color: fix quoted maths
+ - #4604 Don't consider "weed" when writing an email to file
+ - #4605 help: fix leaks
+ - #4612 imap: check for incomplete Mailboxes on sync
+ - #4622 fix label completion crash
+* Translations
+ - #4622 update Esperanto translation
+ - Update lt_LT translations
+* Docs
+ - docs: fix broken functions
+* Build
+ - #4607 Check for DocBook XSL
+ - #4618 Build and test on FreeBSD
+
2025-04-04 Richard Russon \<rich@flatcap.org\>
* Features
- #4493 config: don't quote enums
diff -Nru neomutt-20250404+dfsg/color/quoted.c neomutt-20250510+dfsg/color/quoted.c
--- neomutt-20250404+dfsg/color/quoted.c 2025-04-04 06:48:33.000000000 -0300
+++ neomutt-20250510+dfsg/color/quoted.c 2025-05-10 06:17:14.000000000 -0300
@@ -57,7 +57,7 @@
{
if (simple_color_is_set(i))
{
- NumQuotedColors = i + 1;
+ NumQuotedColors = i - MT_COLOR_QUOTED0 + 1;
break;
}
}
diff -Nru neomutt-20250404+dfsg/copy.c neomutt-20250510+dfsg/copy.c
--- neomutt-20250404+dfsg/copy.c 2025-04-04 06:48:33.000000000 -0300
+++ neomutt-20250510+dfsg/copy.c 2025-05-10 06:17:14.000000000 -0300
@@ -425,7 +425,7 @@
CopyHeaderFlags chflags, const char *prefix, int wraplen)
{
char *temp_hdr = NULL;
- const bool c_weed = cs_subset_bool(NeoMutt->sub, "weed");
+ const bool c_weed = (chflags & CH_UPDATE) ? false : cs_subset_bool(NeoMutt->sub, "weed");
if (e->env)
{
@@ -475,7 +475,7 @@
if ((chflags & CH_UPDATE) && ((chflags & CH_NOSTATUS) == 0))
{
- if ((e->old || e->read) && !(c_weed && mutt_matches_ignore("Status")))
+ if ((e->old || e->read))
{
fputs("Status: ", fp_out);
if (e->read)
@@ -485,7 +485,7 @@
fputc('\n', fp_out);
}
- if ((e->flagged || e->replied) && !(c_weed && mutt_matches_ignore("X-Status")))
+ if ((e->flagged || e->replied))
{
fputs("X-Status: ", fp_out);
if (e->replied)
diff -Nru neomutt-20250404+dfsg/data/account-command/gpg-json/credentials.sh neomutt-20250510+dfsg/data/account-command/gpg-json/credentials.sh
--- neomutt-20250404+dfsg/data/account-command/gpg-json/credentials.sh 2025-04-04 06:48:33.000000000 -0300
+++ neomutt-20250510+dfsg/data/account-command/gpg-json/credentials.sh 2025-05-10 06:17:14.000000000 -0300
@@ -16,4 +16,5 @@
[ -z "$cred" ] || [ -z "$host" ] || [ -z "$user" ] && exit 1
query=$(printf '.host == "%s" and .user == "%s"' "$host" "$user")
+printf "password: "
gpg -qd "$cred" | jq -r ".[] | select($query) | .pass"
diff -Nru neomutt-20250404+dfsg/debian/changelog neomutt-20250510+dfsg/debian/changelog
--- neomutt-20250404+dfsg/debian/changelog 2025-04-18 00:55:57.000000000 -0300
+++ neomutt-20250510+dfsg/debian/changelog 2025-05-16 14:56:17.000000000 -0300
@@ -1,3 +1,25 @@
+neomutt (20250510+dfsg-2) unstable; urgency=medium
+
+ * Upload to unstable.
+
+ -- Carlos Henrique Lima Melara <charlesmelara@riseup.net> Fri, 16 May 2025 14:56:17 -0300
+
+neomutt (20250510+dfsg-1) experimental; urgency=medium
+
+ * New upstream version 20250510+dfsg.
+ * debian/patches: refresh patches against new upstream release.
+ - debian-specific/use_usr_bin_editor.patch: refresh.
+ - upstream/dont-stop-if-spoolfile-is-missing.patch: drop as it's in the
+ new release.
+ - upstream/fix-help-memory-leaks.patch: drop as it's in the new release.
+ - upstream/fix-marking-read-mail-as-new.patch: drop as it's in the new + release.
+ - upstream/fix-quoting-color.patch: drop as it's in the new release.
+ - upstream/update-functions-in-docs.patch: drop as it's in the new
+ release.
+
+ -- Carlos Henrique Lima Melara <charlesmelara@riseup.net> Sat, 10 May 2025 10:57:08 -0300
+
neomutt (20250404+dfsg-2) unstable; urgency=medium
* debian/patches/upstream/:
diff -Nru neomutt-20250404+dfsg/debian/patches/debian-specific/use_usr_bin_editor.patch neomutt-20250510+dfsg/debian/patches/debian-specific/use_usr_bin_editor.patch
--- neomutt-20250404+dfsg/debian/patches/debian-specific/use_usr_bin_editor.patch 2025-04-10 21:49:23.000000000 -0300
+++ neomutt-20250510+dfsg/debian/patches/debian-specific/use_usr_bin_editor.patch 2025-05-12 11:16:32.000000000 -0300
@@ -26,7 +26,7 @@
** The \fC$$editor\fP string may contain a \fI%s\fP escape, which will be replaced by the name
** of the file to be edited. If the \fI%s\fP escape does not appear in \fC$$editor\fP, a
diff --git a/main.c b/main.c
-index 9827cb0..9dffe66 100644
+index 4ab51ce..0b9acac 100644
--- a/main.c
+++ b/main.c
@@ -497,7 +497,7 @@ static int mutt_init(struct ConfigSet *cs, struct Buffer *dlevel,
diff -Nru neomutt-20250404+dfsg/debian/patches/series neomutt-20250510+dfsg/debian/patches/series
--- neomutt-20250404+dfsg/debian/patches/series 2025-04-17 23:58:38.000000000 -0300
+++ neomutt-20250510+dfsg/debian/patches/series 2025-05-12 11:16:32.000000000 -0300
@@ -2,10 +2,3 @@
debian-specific/use_usr_bin_editor.patch
debian-specific/document_debian_defaults.patch
upstream/fix-groff-C-font.patch
-
-# Post 20250404 fixes
-upstream/dont-stop-if-spoolfile-is-missing.patch -upstream/fix-quoting-color.patch -upstream/fix-marking-read-mail-as-new.patch -upstream/fix-help-memory-leaks.patch -upstream/update-functions-in-docs.patch
diff -Nru neomutt-20250404+dfsg/debian/patches/upstream/dont-stop-if-spoolfile-is-missing.patch neomutt-20250510+dfsg/debian/patches/upstream/dont-stop-if-spoolfile-is-missing.patch
--- neomutt-20250404+dfsg/debian/patches/upstream/dont-stop-if-spoolfile-is-missing.patch 2025-04-17 23:31:58.000000000 -0300
+++ neomutt-20250510+dfsg/debian/patches/upstream/dont-stop-if-spoolfile-is-missing.patch 1969-12-31 21:00:00.000000000 -0300
@@ -1,37 +0,0 @@
-From 2d7347c779b1f34494d8f8a18761aa6c20438e2e Mon Sep 17 00:00:00 2001 -From: Richard Russon <rich@flatcap.org>
-Date: Mon, 7 Apr 2025 09:55:47 +0100
-Subject: [PATCH] main: don't stop if /var/spool/mail is missing
-
-If /var/spool/mail/USER is missing, continue to the GUI and display an -error message.
-
-This was the behaviour before 699657c main: refactor command line parsing -Origin: upstream, https://github.com/neomutt/neomutt/commit/2d7347c779b1f34494d8f8a18761aa6c20438e2e
-Last-Update: 2025-04-17
----
- main.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/main.c b/main.c
-index 9827cb0710..4ab51ceeb9 100644
---- a/main.c
-+++ b/main.c
-@@ -1638,6 +1638,8 @@ int main(int argc, char *argv[], char *envp[])
- else
- {
- struct Buffer *folder = &cli->tui.folder;
-+ bool explicit_folder = !buf_is_empty(folder);
-+
- if (cli->tui.start_new_mail)
- {
- const bool c_imap_passive = cs_subset_bool(NeoMutt->sub, "imap_passive");
-@@ -1747,7 +1749,7 @@ int main(int argc, char *argv[], char *envp[])
- mutt_error(_("Unable to open mailbox %s"), buf_string(folder));
- repeat_error = false;
- }
-- if (m || buf_is_empty(folder))
-+ if (m || !explicit_folder)
- {
- struct MuttWindow *dlg = index_pager_init();
- dialog_push(dlg);
diff -Nru neomutt-20250404+dfsg/debian/patches/upstream/fix-help-memory-leaks.patch neomutt-20250510+dfsg/debian/patches/upstream/fix-help-memory-leaks.patch
--- neomutt-20250404+dfsg/debian/patches/upstream/fix-help-memory-leaks.patch 2025-04-17 23:58:37.000000000 -0300
+++ neomutt-20250510+dfsg/debian/patches/upstream/fix-help-memory-leaks.patch 1969-12-31 21:00:00.000000000 -0300
@@ -1,55 +0,0 @@
-From 70d6b5b75491023036309a5ac387d26cec0bc779 Mon Sep 17 00:00:00 2001 -From: Richard Russon <rich@flatcap.org>
-Date: Wed, 9 Apr 2025 21:04:38 +0100
-Subject: [PATCH] help: fix leaks
-
-Fix memory leaks from <help>.
-Origin: upstream, https://github.com/neomutt/neomutt/commit/70d6b5b75491023036309a5ac387d26cec0bc779
-Last-Update: 2025-04-17
----
- help.c | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/help.c b/help.c
-index a02d406e81..fde479e1ee 100644
---- a/help.c
-+++ b/help.c
-@@ -154,6 +154,7 @@ void mutt_help(enum MenuType menu)
- struct BindingInfoArray bia_unbound = ARRAY_HEAD_INITIALIZER;
- struct Buffer *banner = NULL;
- struct Buffer *tempfile = NULL;
-+ struct BindingInfo *bi = NULL;
-
- // ---------------------------------------------------------------------------
- // Gather the data
-@@ -201,7 +202,6 @@ void mutt_help(enum MenuType menu)
- }
-
- const char *menu_name = mutt_map_get_name(menu, MenuNames);
-- struct BindingInfo *bi = NULL;
-
- fprintf(fp, "%s bindings\n", menu_name);
- fprintf(fp, "\n");
-@@ -271,6 +271,22 @@ void mutt_help(enum MenuType menu)
-
- cleanup:
-
-+ ARRAY_FOREACH(bi, &bia_bind)
-+ {
-+ FREE(&bi->a[0]);
-+ }
-+
-+ ARRAY_FOREACH(bi, &bia_macro)
-+ {
-+ FREE(&bi->a[0]);
-+ FREE(&bi->a[1]);
-+ }
-+
-+ ARRAY_FOREACH(bi, &bia_gen)
-+ {
-+ FREE(&bi->a[0]);
-+ }
-+
- buf_pool_release(&banner);
- buf_pool_release(&tempfile);
- ARRAY_FREE(&bia_bind);
diff -Nru neomutt-20250404+dfsg/debian/patches/upstream/fix-marking-read-mail-as-new.patch neomutt-20250510+dfsg/debian/patches/upstream/fix-marking-read-mail-as-new.patch
--- neomutt-20250404+dfsg/debian/patches/upstream/fix-marking-read-mail-as-new.patch 2025-04-17 23:58:37.000000000 -0300
+++ neomutt-20250510+dfsg/debian/patches/upstream/fix-marking-read-mail-as-new.patch 1969-12-31 21:00:00.000000000 -0300
@@ -1,43 +0,0 @@
-From efaaea9251784d0b963c7c374e34f39921b18a82 Mon Sep 17 00:00:00 2001 -From: Pietro Cerutti <gahr@gahr.ch>
-Date: Wed, 9 Apr 2025 22:31:21 +0200
-Subject: [PATCH] Don't consider "weed" when writing an email to file (#4604) -
-Fixes #4601
-Origin: upstream, https://github.com/neomutt/neomutt/commit/efaaea9251784d0b963c7c374e34f39921b18a82
-Last-Update: 2025-04-17
----
- copy.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/copy.c b/copy.c
-index dce9992e3b..d083f52c0a 100644
---- a/copy.c
-+++ b/copy.c
-@@ -425,7 +425,7 @@ int mutt_copy_header(FILE *fp_in, struct Email *e, FILE *fp_out,
- CopyHeaderFlags chflags, const char *prefix, int wraplen)
- {
- char *temp_hdr = NULL;
-- const bool c_weed = cs_subset_bool(NeoMutt->sub, "weed");
-+ const bool c_weed = (chflags & CH_UPDATE) ? false : cs_subset_bool(NeoMutt->sub, "weed");
-
- if (e->env)
- {
-@@ -475,7 +475,7 @@ int mutt_copy_header(FILE *fp_in, struct Email *e, FILE *fp_out,
-
- if ((chflags & CH_UPDATE) && ((chflags & CH_NOSTATUS) == 0))
- {
-- if ((e->old || e->read) && !(c_weed && mutt_matches_ignore("Status"))) -+ if ((e->old || e->read))
- {
- fputs("Status: ", fp_out);
- if (e->read)
-@@ -485,7 +485,7 @@ int mutt_copy_header(FILE *fp_in, struct Email *e, FILE *fp_out,
- fputc('\n', fp_out);
- }
-
-- if ((e->flagged || e->replied) && !(c_weed && mutt_matches_ignore("X-Status")))
-+ if ((e->flagged || e->replied))
- {
- fputs("X-Status: ", fp_out);
- if (e->replied)
diff -Nru neomutt-20250404+dfsg/debian/patches/upstream/fix-quoting-color.patch neomutt-20250510+dfsg/debian/patches/upstream/fix-quoting-color.patch
--- neomutt-20250404+dfsg/debian/patches/upstream/fix-quoting-color.patch 2025-04-17 23:58:36.000000000 -0300
+++ neomutt-20250510+dfsg/debian/patches/upstream/fix-quoting-color.patch 1969-12-31 21:00:00.000000000 -0300
@@ -1,26 +0,0 @@
-From 676914a48e3b59d8c1c39b75337ed979d769ea99 Mon Sep 17 00:00:00 2001 -From: Richard Russon <rich@flatcap.org>
-Date: Mon, 7 Apr 2025 12:40:14 +0100
-Subject: [PATCH] color: fix quoted maths
-
-The quoted colour constants don't start at zero, so remember to subtract -the base MT_COLOR_QUOTED0.
-Origin: upstream, https://github.com/neomutt/neomutt/commit/676914a48e3b59d8c1c39b75337ed979d769ea99
-Last-Update: 2025-04-17
----
- color/quoted.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/color/quoted.c b/color/quoted.c
-index 9671f7b727..2661d5193c 100644
---- a/color/quoted.c
-+++ b/color/quoted.c
-@@ -57,7 +57,7 @@ static int quoted_color_observer(struct NotifyCallback *nc)
- {
- if (simple_color_is_set(i))
- {
-- NumQuotedColors = i + 1;
-+ NumQuotedColors = i - MT_COLOR_QUOTED0 + 1;
- break;
- }
- }
diff -Nru neomutt-20250404+dfsg/debian/patches/upstream/update-functions-in-docs.patch neomutt-20250510+dfsg/debian/patches/upstream/update-functions-in-docs.patch
--- neomutt-20250404+dfsg/debian/patches/upstream/update-functions-in-docs.patch 2025-04-17 23:58:38.000000000 -0300
+++ neomutt-20250510+dfsg/debian/patches/upstream/update-functions-in-docs.patch 1969-12-31 21:00:00.000000000 -0300
@@ -1,73 +0,0 @@
-From a74ff1b995c21bf2320118f304fbf7804bb358bf Mon Sep 17 00:00:00 2001 -From: Richard Russon <rich@flatcap.org>
-Date: Thu, 17 Apr 2025 21:28:45 +0100
-Subject: [PATCH] docs: fix broken functions
-Origin: upstream, https://github.com/neomutt/neomutt/commit/a74ff1b995c21bf2320118f304fbf7804bb358bf
-Last-Update: 2025-04-17
----
- docs/manual.xml.head | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/docs/manual.xml.head b/docs/manual.xml.head
-index 67027a6df0..08cccb54b1 100644
---- a/docs/manual.xml.head
-+++ b/docs/manual.xml.head
-@@ -1223,12 +1223,12 @@ color sidebar_divider color8 default <emphasis role="comment"># Dark gre
- </row>
- <row>
- <entry>z or <PageDn></entry>
-- <entry><literal><page-down></literal></entry>
-+ <entry><literal><next-page></literal></entry>
- <entry>go to the next page</entry>
- </row>
- <row>
- <entry>Z or <PageUp></entry>
-- <entry><literal><page-up></literal></entry>
-+ <entry><literal><previous-page></literal></entry>
- <entry>go to the previous page</entry>
- </row>
- <row>
-@@ -2636,12 +2636,12 @@ color sidebar_divider color8 default <emphasis role="comment"># Dark gre
- </row>
- <row>
- <entry>f</entry>
-- <entry><literal><forward></literal></entry>
-+ <entry><literal><forward-message></literal></entry>
- <entry>forward message</entry>
- </row>
- <row>
- <entry>b</entry>
-- <entry><literal><bounce></literal></entry>
-+ <entry><literal><bounce-message></literal></entry>
- <entry>bounce (remail) message</entry>
- </row>
- <row>
-@@ -3295,8 +3295,8 @@ color sidebar_divider color8 default <emphasis role="comment"># Dark gre
- recipients specified in the Bcc header. Forwarding a message, on the
- other hand, allows you to modify the message before it is resent (for
- example, by adding your own comments). Bouncing is done using the -- <literal><bounce></literal> function and forwarding using the -- <literal><forward></literal> function bound to <quote>b</quote>
-+ <literal><bounce-message></literal> function and forwarding using the
-+ <literal><forward-message></literal> function bound to <quote>b</quote>
- and <quote>f</quote> respectively.
- </para>
- <para>
-@@ -10453,7 +10453,7 @@ subjectrx '\[[^]]*\]:? *' '%L%R'
- command, and indicate which contain new messages. NeoMutt will
- automatically enter this mode when invoked from the command line with
- the <literal>-y</literal> option, or from the index/pager via the -- <literal><browse-mailboxes></literal> function.
-+ <literal><change-folder></literal> function.
- </para>
- <para>
- For the pager, index and directory browser menus, NeoMutt contains
-@@ -10919,7 +10919,7 @@ macro index ,a "<save-message>=archive<enter><enter-command>ec
- <link linkend="resend-message"><literal><resend-message></literal></link>,
- and the
- <literal><reply></literal> and
-- <literal><forward></literal> functions) to attachments of type
-+ <literal><forward-message></literal> functions) to attachments of type
- <literal>message/rfc822</literal>.
- </para>
- <para>
diff -Nru neomutt-20250404+dfsg/docs/manual.xml.head neomutt-20250510+dfsg/docs/manual.xml.head
--- neomutt-20250404+dfsg/docs/manual.xml.head 2025-04-04 06:48:33.000000000 -0300
+++ neomutt-20250510+dfsg/docs/manual.xml.head 2025-05-10 06:17:14.000000000 -0300
@@ -1223,12 +1223,12 @@
</row>
<row>
<entry>z or <PageDn></entry>
- <entry><literal><page-down></literal></entry>
+ <entry><literal><next-page></literal></entry>
<entry>go to the next page</entry>
</row>
<row>
<entry>Z or <PageUp></entry>
- <entry><literal><page-up></literal></entry>
+ <entry><literal><previous-page></literal></entry>
<entry>go to the previous page</entry>
</row>
<row>
@@ -2636,12 +2636,12 @@
</row>
<row>
<entry>f</entry>
- <entry><literal><forward></literal></entry>
+ <entry><literal><forward-message></literal></entry>
<entry>forward message</entry>
</row>
<row>
<entry>b</entry>
- <entry><literal><bounce></literal></entry>
+ <entry><literal><bounce-message></literal></entry>
<entry>bounce (remail) message</entry>
</row>
<row>
@@ -3295,8 +3295,8 @@
recipients specified in the Bcc header. Forwarding a message, on the
other hand, allows you to modify the message before it is resent (for
example, by adding your own comments). Bouncing is done using the
- <literal><bounce></literal> function and forwarding using the - <literal><forward></literal> function bound to <quote>b</quote>
+ <literal><bounce-message></literal> function and forwarding using the
+ <literal><forward-message></literal> function bound to <quote>b</quote>
and <quote>f</quote> respectively.
</para>
<para>
@@ -10453,7 +10453,7 @@
command, and indicate which contain new messages. NeoMutt will
automatically enter this mode when invoked from the command line with
the <literal>-y</literal> option, or from the index/pager via the - <literal><browse-mailboxes></literal> function.
+ <literal><change-folder></literal> function.
</para>
<para>
For the pager, index and directory browser menus, NeoMutt contains @@ -10919,7 +10919,7 @@
<link linkend="resend-message"><literal><resend-message></literal></link>,
and the
<literal><reply></literal> and
- <literal><forward></literal> functions) to attachments of type
+ <literal><forward-message></literal> functions) to attachments of type
<literal>message/rfc822</literal>.
</para>
<para>
diff -Nru neomutt-20250404+dfsg/editor/window.c neomutt-20250510+dfsg/editor/window.c
--- neomutt-20250404+dfsg/editor/window.c 2025-04-04 06:48:33.000000000 -0300
+++ neomutt-20250510+dfsg/editor/window.c 2025-05-10 06:17:14.000000000 -0300
@@ -394,9 +394,9 @@
bye:
mutt_hist_reset_state(wdata.hclass);
FREE(&wdata.tempbuf);
- completion_data_free(&wdata.cd);
} while (rc == 1);
+ completion_data_free(&wdata.cd);
msgcont_pop_window();
window_set_focus(old_focus);
mutt_window_free(&win);
diff -Nru neomutt-20250404+dfsg/.github/workflows/build-and-test-freebsd.yml neomutt-20250510+dfsg/.github/workflows/build-and-test-freebsd.yml
--- neomutt-20250404+dfsg/.github/workflows/build-and-test-freebsd.yml 1969-12-31 21:00:00.000000000 -0300
+++ neomutt-20250510+dfsg/.github/workflows/build-and-test-freebsd.yml 2025-05-10 06:17:14.000000000 -0300
@@ -0,0 +1,51 @@
+name: Build and Test (FreeBSD)
+
+on:
+ pull_request:
+ push:
+ branches:
+ - 'main'
+ - 'devel/**'
+ workflow_dispatch:
+
+concurrency:
+ group: ${{ github.workflow }}
+
+jobs:
+ build:
+ if: github.event.pull_request.draft == false
+ name: Build
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Get number of CPU cores
+ uses: SimenB/github-actions-cpu-cores@v2
+ id: cpu-cores
+
+ - name: Checkout Code
+ uses: actions/checkout@v4
+
+ - name: Checkout Test Files
+ uses: actions/checkout@v4
+ with:
+ repository: neomutt/neomutt-test-files
+ path: test-files
+
+ - name: Build and Test on FreeBSD
+ uses: vmactions/freebsd-vm@v1
+ with:
+ usesh: true
+ prepare: |
+ pkg install -y perl5 pkgconf gettext libxslt docbook-xsl db5 gdbm gpgme gnutls kyotocabinet tokyocabinet lmdb lua54 pcre2 notmuch qdbm rocksdb cyrus-sasl tdb zstd
+ run: |
+ cd test-files
+ ./setup.sh
+ cd -
+ ./configure --full-doc --autocrypt --bdb --fmemopen --gdbm --gnutls --gpgme --gss --lmdb --lua --lz4 --notmuch --pcre2 --qdbm --rocksdb --sasl --tdb --testing --kyotocabinet --tokyocabinet --with-lock=fcntl --zlib --zstd
+ make -j ${{steps.cpu-cores.outputs.count}} neomutt
+ ./neomutt -v
+ ./neomutt -h all
+ make validate-docs
+ make -j ${{steps.cpu-cores.outputs.count}} test/neomutt-test
+ export NEOMUTT_TEST_DIR=$GITHUB_WORKSPACE/test-files
+ make test
diff -Nru neomutt-20250404+dfsg/.github/workflows/build-and-test.yml neomutt-20250510+dfsg/.github/workflows/build-and-test.yml
--- neomutt-20250404+dfsg/.github/workflows/build-and-test.yml 2025-04-04 06:48:33.000000000 -0300
+++ neomutt-20250510+dfsg/.github/workflows/build-and-test.yml 2025-05-10 06:17:14.000000000 -0300
@@ -69,8 +69,6 @@
- name: Test Docs
run: |
cd build-${{ matrix.cfg.name }}
- pwd
- ls -C
make validate-docs
- name: Build Tests
diff -Nru neomutt-20250404+dfsg/help.c neomutt-20250510+dfsg/help.c
--- neomutt-20250404+dfsg/help.c 2025-04-04 06:48:33.000000000 -0300
+++ neomutt-20250510+dfsg/help.c 2025-05-10 06:17:14.000000000 -0300
@@ -154,6 +154,7 @@
struct BindingInfoArray bia_unbound = ARRAY_HEAD_INITIALIZER;
struct Buffer *banner = NULL;
struct Buffer *tempfile = NULL;
+ struct BindingInfo *bi = NULL;
// ---------------------------------------------------------------------------
// Gather the data
@@ -201,7 +202,6 @@
}
const char *menu_name = mutt_map_get_name(menu, MenuNames);
- struct BindingInfo *bi = NULL;
fprintf(fp, "%s bindings\n", menu_name);
fprintf(fp, "\n");
@@ -271,6 +271,22 @@
cleanup:
+ ARRAY_FOREACH(bi, &bia_bind)
+ {
+ FREE(&bi->a[0]);
+ }
+
+ ARRAY_FOREACH(bi, &bia_macro)
+ {
+ FREE(&bi->a[0]);
+ FREE(&bi->a[1]);
+ }
+
+ ARRAY_FOREACH(bi, &bia_gen)
+ {
+ FREE(&bi->a[0]);
+ }
+
buf_pool_release(&banner);
buf_pool_release(&tempfile);
ARRAY_FREE(&bia_bind);
diff -Nru neomutt-20250404+dfsg/imap/imap.c neomutt-20250510+dfsg/imap/imap.c --- neomutt-20250404+dfsg/imap/imap.c 2025-04-04 06:48:33.000000000 -0300
+++ neomutt-20250510+dfsg/imap/imap.c 2025-05-10 06:17:14.000000000 -0300
@@ -1481,6 +1481,8 @@
struct ImapAccountData *adata = imap_adata_get(m);
struct ImapMboxData *mdata = imap_mdata_get(m);
+ if (!adata || !mdata)
+ return MX_STATUS_ERROR;
if (adata->state < IMAP_SELECTED)
{
diff -Nru neomutt-20250404+dfsg/.mailmap neomutt-20250510+dfsg/.mailmap
--- neomutt-20250404+dfsg/.mailmap 2025-04-04 06:48:33.000000000 -0300
+++ neomutt-20250510+dfsg/.mailmap 2025-05-10 06:17:14.000000000 -0300
@@ -209,8 +209,10 @@
Joshua Jordi (@jakkinstewart) <dracogoyle@gmail.com> Joshua Jordi <dracogoyle@gmail.com>
Joshua Jordi (@jakkinstewart) <dracogoyle@gmail.com> Joshua Jordi <JakkinStewart@users.noreply.github.com>
Julian Andres Klode (@julian-klode) <jak@jak-linux.org> Julian Andres Klode <jak@jak-linux.org>
+Juris Lambda (@jxlambda) <jxlambda@pm.me> Juris Lambda <jxlambda@pm.me>
Justin Vasel (@justinvasel) <justin.vasel@gmail.com> Justin Vasel <justin.vasel@gmail.com>
Karel Zak (@karelzak) <kzak@redhat.com> Karel Zak <kzak@redhat.com> +Keith Bowes (@keithbowes) <keithbowes@users.noreply.github.com> Keith Bowes <keithbowes@users.noreply.github.com>
Kevin Decherf (@kdecherf) <kevin@kdecherf.com> Kevin Decherf <kevin@kdecherf.com>
Kevin Velghe (@paretje) <kevin@paretje.be> Kevin Velghe <kevin@paretje.be>
On 2025-05-16 17:18:35 -0300, Carlos Henrique Lima Melara wrote:
Please unblock package neomutt
I did not upload to unstable and will wait an ack from you before
doing so.
Please go ahead
| Sysop: | Keyop |
|---|---|
| Location: | Huddersfield, West Yorkshire, UK |
| Users: | 486 |
| Nodes: | 16 (2 / 14) |
| Uptime: | 135:37:56 |
| Calls: | 9,657 |
| Calls today: | 5 |
| Files: | 13,707 |
| Messages: | 6,166,934 |