diff --git a/20200821.tar.gz b/20200821.tar.gz deleted file mode 100644 index 1407412..0000000 --- a/20200821.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4233d03e03220a2ba8096ab28061e12ef538259fd7d32ad441aad5207b17b390 -size 3404856 diff --git a/20201120.tar.gz b/20201120.tar.gz new file mode 100644 index 0000000..bff2114 --- /dev/null +++ b/20201120.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48191d4f17cb1e5fd094ca92c581e1bb9599f058c122cc0e35df4e1c0cb53f47 +size 3456322 diff --git a/20201120.tar.gz.sig b/20201120.tar.gz.sig new file mode 100644 index 0000000..f7789bf Binary files /dev/null and b/20201120.tar.gz.sig differ diff --git a/neomutt-sidebar-abbreviate-shorten-what-user-sees.patch b/neomutt-sidebar-abbreviate-shorten-what-user-sees.patch deleted file mode 100644 index 551c840..0000000 --- a/neomutt-sidebar-abbreviate-shorten-what-user-sees.patch +++ /dev/null @@ -1,140 +0,0 @@ -From a6f91bc9c890581cff189e143d86e656cab6d2dc Mon Sep 17 00:00:00 2001 -From: Austin Ray -Date: Wed, 8 Jul 2020 17:17:59 -0400 -Subject: [PATCH] fix(sidebar): abbreviate/shorten what user sees - -If a user opted to display a name, perform the sidebar shorten, -abbreviation, and indentation on the name, not the path. Otherwise, -sidebar may render names incorrectly due to operation being calculated -on the path. Notmuch users are more susceptible since queries often -contain file paths or other characters such periods. - -If a user wants to display a name but operate under a folder hierarchy, -they must represent that hierarchy in the name. ---- - sidebar/private.h | 4 ++- - sidebar/sidebar.c | 69 +++++++++++++++++++++++++++-------------------- - 2 files changed, 43 insertions(+), 30 deletions(-) - -diff --git a/sidebar/private.h b/sidebar/private.h -index 94ba88498b..fadcada9ee 100644 ---- a/sidebar/private.h -+++ b/sidebar/private.h -@@ -36,7 +36,9 @@ extern struct ListHead SidebarWhitelist; - struct SbEntry - { - char box[256]; ///< Mailbox path (possibly abbreviated) -- int depth; ///< Indentation depth -+ char name[256]; ///< Mailbox name (possibly abbreviated) -+ int depth; ///< Indentation depth for path -+ int name_depth; ///< Indentation for name - struct Mailbox *mailbox; ///< Mailbox this represents - bool is_hidden; ///< Don't show, e.g. $sidebar_new_mail_only - enum ColorId color; ///< Colour to use -diff --git a/sidebar/sidebar.c b/sidebar/sidebar.c -index b729af0740..8cb8587d13 100644 ---- a/sidebar/sidebar.c -+++ b/sidebar/sidebar.c -@@ -57,10 +57,10 @@ struct ListHead SidebarWhitelist = STAILQ_HEAD_INITIALIZER(SidebarWhitelist); // - * @param sbe Sidebar entry - * @retval Number of bytes written - */ --static size_t add_indent(char *buf, size_t buflen, const struct SbEntry *sbe) -+static size_t add_indent(char *buf, size_t buflen, const int depth) - { - size_t res = 0; -- for (int i = 0; i < sbe->depth; i++) -+ for (int i = 0; i < depth; i++) - { - res += mutt_str_copy(buf + res, C_SidebarIndentString, buflen - res); - } -@@ -114,9 +114,10 @@ static const char *sidebar_format_str(char *buf, size_t buflen, size_t col, int - case 'D': - { - char indented[256]; -- size_t offset = add_indent(indented, sizeof(indented), sbe); -+ int depth = (op == 'D' && sbe->mailbox->name) ? sbe->name_depth : sbe->depth; -+ size_t offset = add_indent(indented, sizeof(indented), depth); - snprintf(indented + offset, sizeof(indented) - offset, "%s", -- ((op == 'D') && sbe->mailbox->name) ? sbe->mailbox->name : sbe->box); -+ ((op == 'D') && sbe->mailbox->name) ? sbe->name : sbe->box); - - mutt_format_s(buf, buflen, prec, indented); - break; -@@ -795,6 +796,37 @@ static int calc_path_depth(const char *mbox, const char *delims, const char **la - return depth; - } - -+static const char *shorten_abbreviate(struct Mailbox *m, const char *name_or_path, int *depth) -+{ -+ // Try to abbreviate the full path -+ const char *abbr = abbrev_folder(name_or_path, C_Folder, m->type); -+ if (!abbr) -+ abbr = abbrev_url(name_or_path, m->type); -+ const char *shortened = abbr ? abbr : name_or_path; -+ -+ /* Compute the depth */ -+ const char *last_part = abbr; -+ *depth = calc_path_depth(abbr, C_SidebarDelimChars, &last_part); -+ if (!C_SidebarFolderIndent) -+ *depth = 0; -+ -+ const bool short_is_abbr = (shortened == abbr); -+ if (C_SidebarShortPath) -+ { -+ shortened = last_part; -+ } -+ -+ // Don't indent if we were unable to create an abbreviation. -+ // Otherwise, the full path will be indent, and it looks unusual. -+ if (C_SidebarFolderIndent && short_is_abbr) -+ { -+ if (C_SidebarComponentDepth > 0) -+ *depth -= C_SidebarComponentDepth; -+ } -+ -+ return shortened; -+} -+ - /** - * draw_sidebar - Write out a list of mailboxes, in a panel - * @param wdata Sidebar data -@@ -877,34 +909,13 @@ static void draw_sidebar(struct SidebarWindowData *wdata, struct MuttWindow *win - } - - const char *path = mailbox_path(m); -+ const char *name = m->name; - -- // Try to abbreviate the full path -- const char *abbr = abbrev_folder(path, C_Folder, m->type); -- if (!abbr) -- abbr = abbrev_url(path, m->type); -- const char *short_path = abbr ? abbr : path; -- -- /* Compute the depth */ -- const char *last_part = abbr; -- entry->depth = calc_path_depth(abbr, C_SidebarDelimChars, &last_part); -- -- const bool short_path_is_abbr = (short_path == abbr); -- if (C_SidebarShortPath) -- { -- short_path = last_part; -- } -- -- // Don't indent if we were unable to create an abbreviation. -- // Otherwise, the full path will be indent, and it looks unusual. -- if (C_SidebarFolderIndent && short_path_is_abbr) -- { -- if (C_SidebarComponentDepth > 0) -- entry->depth -= C_SidebarComponentDepth; -- } -- else if (!C_SidebarFolderIndent) -- entry->depth = 0; -+ const char *short_path = shorten_abbreviate(m, path, &entry->depth); -+ const char *short_name = shorten_abbreviate(m, name, &entry->name_depth); - - mutt_str_copy(entry->box, short_path, sizeof(entry->box)); -+ mutt_str_copy(entry->name, short_name, sizeof(entry->name)); - char str[256]; - make_sidebar_entry(str, sizeof(str), w, entry); - mutt_window_printf("%s", str); diff --git a/neomutt.changes b/neomutt.changes index a740df0..b69c15e 100644 --- a/neomutt.changes +++ b/neomutt.changes @@ -1,3 +1,96 @@ +------------------------------------------------------------------- +Sat Nov 21 13:47:00 UTC 2020 - Andreas Stieger + +- add upstream signing key and validate source signature + +------------------------------------------------------------------- +Sat Nov 21 11:56:38 UTC 2020 - Kai Liu + +- Update to 20201120. Address boo#1179035, CVE-2020-28896. + * Security + - imap: close connection on all failures + * Features + - alias: add function to Alias/Query dialogs + - config: add validators for {imap,smtp,pop}_authenticators + - config: warn when signature file is missing or not readable + - smtp: support for native SMTP LOGIN auth mech + - notmuch: show originating folder in index + * Bug Fixes + - sidebar: prevent the divider colour bleeding out + - sidebar: fix + - notmuch: fix query for current email + - restore shutdown-hook functionality + - crash in reply-to + - user-after-free in folder-hook + - fix some leaks + - fix application of limits to modified mailboxes + - write Date header when postponing + * Translations + - 100% Lithuanian + - 100% Czech + - 70% Turkish + * Docs + - Document that $sort_alias affects the query menu + * Build + - improve ASAN flags + - add SASL and S/MIME to --everything + - fix contrib (un)install + * Code + - my_hdr compose screen notifications + - add contracts to the MXAPI + - maildir refactoring + - further reduce the use of global variables + * Upstream + - Add $count_alternatives to count attachments inside alternatives + +- Changes from 20200925 + * Features + - Compose: display user-defined headers + - Address Book / Query: live sorting + - Address Book / Query: patterns for searching + - Config: Add '+=' and '-=' operators for String Lists + - Config: Add '+=' operator for Strings + - Allow postfix query ':setenv NAME?' for env vars + * Bug Fixes + - Fix crash when searching with invalid regexes + - Compose: Prevent infinite loop of send2-hooks + - Fix sidebar on new/removed mailboxes + - Restore indentation for named mailboxes + - Prevent half-parsing an alias + - Remove folder creation prompt for POP path + - Show error if $message_cachedir doesn't point to a valid directory + - Fix tracking LastDir in case of IMAP paths with Unicode characters + - Make sure all mail gets applied the index limit + - Add warnings to -Q query CLI option + - Fix index tracking functionality + * Changed Config + - Add $compose_show_user_headers (yes) + * Translations + - 100% Czech + - 100% Lithuanian + - Split up usage strings + * Build + - Run shellcheck on hcachever.sh + - Add the Address Sanitizer + - Move compose files to lib under compose/ + - Move address config into libaddress + - Update to latest acutest - fixes a memory leak in the unit tests + * Code + - Implement ARRAY API + - Deglobalised the Config Sort functions + - Refactor the Sidebar to be Event-Driven + - Refactor the Color Event + - Refactor the Commands list + - Make ctx_update_tables private + - Reduce the scope/deps of some Validator functions + - Use the Email's IMAP UID instead of an increasing number as index + - debug: log window focus + +- Removed neomutt-sidebar-abbreviate-shorten-what-user-sees.patch. + No longer needed. + +- Misc spec file cleanups. + ------------------------------------------------------------------- Sun Aug 23 01:35:21 UTC 2020 - Kai Liu diff --git a/neomutt.keyring b/neomutt.keyring new file mode 100644 index 0000000..c8ce6f4 --- /dev/null +++ b/neomutt.keyring @@ -0,0 +1,82 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +KA== +=w87f +-----END PGP PUBLIC KEY BLOCK----- diff --git a/neomutt.spec b/neomutt.spec index 24dd369..20603e7 100644 --- a/neomutt.spec +++ b/neomutt.spec @@ -17,14 +17,15 @@ Name: neomutt -Version: 20200821 +Version: 20201120 Release: 0 Summary: A command line mail reader (or MUA), a fork of Mutt with added features License: GPL-2.0-or-later Group: Productivity/Networking/Email/Clients URL: https://neomutt.org Source: https://github.com/neomutt/neomutt/archive/%{version}.tar.gz -Patch0: neomutt-sidebar-abbreviate-shorten-what-user-sees.patch +Source2: https://github.com/neomutt/neomutt/releases/download/%{version}/%{version}.tar.gz.sig +Source3: https://flatcap.org/id/richard.russon.neomutt.asc#/%{name}.keyring BuildRequires: autoconf BuildRequires: automake BuildRequires: cyrus-sasl-devel @@ -70,7 +71,6 @@ and requirements. %prep %setup -q -%patch0 -p1 %build export CFLAGS="%{optflags}" @@ -98,7 +98,7 @@ make %{?_smp_mflags} %files %config(noreplace) %{_sysconfdir}/neomuttrc -%license %{_docdir}/neomutt/LICENSE.md +%license %{_docdir}/%{name}/LICENSE.md %{_bindir}/neomutt %{_mandir}/man1/neomutt.1%{?ext_man} %{_mandir}/man5/neomuttrc.5%{?ext_man} @@ -111,19 +111,22 @@ make %{?_smp_mflags} %{_mandir}/man5/mbox_neomutt.5%{?ext_man} %{_mandir}/man5/mmdf_neomutt.5%{?ext_man} # this file is used from the default /etc/neomuttrc and moved from neomutt-doc -%dir %{_docdir}/neomutt -%doc %{_docdir}/neomutt/manual.txt +%dir %{_docdir}/%{name} +%doc %{_docdir}/%{name}/manual.txt %files doc -%dir %{_docdir}/neomutt +%dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/README* +%doc %{_docdir}/%{name}/AUTHORS.md %doc %{_docdir}/%{name}/ChangeLog.md %doc %{_docdir}/%{name}/CODE_OF_CONDUCT.md -%doc %{_docdir}/neomutt/INSTALL.md +%doc %{_docdir}/%{name}/CONTRIBUTING.md +%doc %{_docdir}/%{name}/INSTALL.md +%doc %{_docdir}/%{name}/SECURITY.md %dir %{_docdir}/%{name}/ %doc %{_docdir}/%{name}/*.html -%doc %{_docdir}/neomutt/mime.types -%doc %{_docdir}/neomutt/smime-notes.txt +%doc %{_docdir}/%{name}/mime.types +%doc %{_docdir}/%{name}/smime-notes.txt %dir %doc %{_docdir}/%{name}/colorschemes/ %doc %{_docdir}/%{name}/colorschemes/*.neomuttrc %dir %doc %{_docdir}/%{name}/keybase/ @@ -135,7 +138,6 @@ make %{?_smp_mflags} %doc %{_docdir}/%{name}/samples/*.rc %doc %{_docdir}/%{name}/samples/colors.* %doc %{_docdir}/%{name}/samples/sample.* -%doc %{_docdir}/%{name}/samples/smime_keys_test.pl %dir %doc %{_docdir}/%{name}/vim-keys/ %doc %{_docdir}/%{name}/vim-keys/* %dir %doc %{_docdir}/%{name}/hcache-bench/