update to neomutt-20250404

This commit is contained in:
sthen
2025-04-14 18:56:22 +00:00
parent da71a33e45
commit 9f1a42c33d
3 changed files with 14 additions and 10 deletions
+3 -2
View File
@@ -2,8 +2,7 @@ COMMENT= tty-based e-mail client, forked from Mutt
GH_ACCOUNT= neomutt
GH_PROJECT= neomutt
GH_TAGNAME= 20250113
REVISION= 0
GH_TAGNAME= 20250404
DIST_TUPLE= github neomutt neomutt-test-files \
7404f4423b11cd5da2d123b3636c7a310bbbed9f neomutt-test-files
@@ -11,6 +10,8 @@ DIST_TUPLE= github neomutt neomutt-test-files \
CATEGORIES= mail
HOMEPAGE= https://neomutt.org/
MAINTAINER= Stuart Henderson <stu.ports@spacehopper.org>
EPOCH= 0
# GPLv2+
+2 -2
View File
@@ -1,4 +1,4 @@
SHA256 (neomutt-20250113.tar.gz) = zHg16A/XKvEEqOFG4AnpPmh877xsEXJe4u0R1zd0hv8=
SHA256 (neomutt-20250404.tar.gz) = cy1P0AaFYDCXHJnvDlaYRtA1j+q6vqEVo1P5CrAtMUI=
SHA256 (neomutt-neomutt-test-files-7404f4423b11cd5da2d123b3636c7a310bbbed9f.tar.gz) = 5DLXwXB6Jbri3VKiHh3SC/k44TcZ2Up4Om3q7S7slGI=
SIZE (neomutt-20250113.tar.gz) = 4099632
SIZE (neomutt-20250404.tar.gz) = 4177395
SIZE (neomutt-neomutt-test-files-7404f4423b11cd5da2d123b3636c7a310bbbed9f.tar.gz) = 10603
+9 -6
View File
@@ -3,13 +3,14 @@ Pledge
Index: main.c
--- main.c.orig
+++ main.c
@@ -720,6 +720,30 @@ main
}
}
@@ -1132,6 +1132,33 @@ int main(int argc, char *argv[], char *envp[])
if (!show_help(&cli->help))
goto main_ok;
+#ifdef USE_SASL_CYRUS
+ {
+ int ret;
+ mutt_debug(LL_DEBUG1, "Starting SASL early for pledge\n");
+ if ((ret = mutt_sasl_start()) != SASL_OK) {
+ fprintf(stderr, "%s: mutt_sasl_start: %d\n", argv[0], ret);
+ exit(1);
@@ -18,12 +19,14 @@ Index: main.c
+#endif
+
+#ifdef CRYPT_BACKEND_GPGME
+ mutt_debug(LL_DEBUG1, "Pledging (GPGME build)\n");
+ if (pledge("stdio rpath wpath cpath flock fattr getpw tty inet dns "
+ "proc exec sendfd recvfd", NULL) == -1) {
+ fprintf(stderr, "%s: pledge: %s\n", argv[0], strerror(errno));
+ exit(1);
+ }
+#else
+ mutt_debug(LL_DEBUG1, "Pledging (non-GPGME build)\n");
+ if (pledge("stdio rpath wpath cpath flock fattr getpw tty inet dns "
+ "proc exec", NULL) == -1) {
+ fprintf(stderr, "%s: pledge: %s\n", argv[0], strerror(errno));
@@ -31,6 +34,6 @@ Index: main.c
+ }
+#endif /* CRYPT_BACKEND_GPGME */
+
/* collapse remaining argv */
while (optind < argc)
argv[nargc++] = argv[optind++];
// Change the current umask, and save the original one
NeoMutt->user_default_umask = umask(077);
subjrx_init();