I built upstream neomutt with gpgme sasl notmuch options and ports
neomutt FLAVOR (gpgme sasl notmuch) without any patches. Both linked
and launched without any issues. I did a cursory run through of
neomutt/Notmuch and neomutt/IMAP and they looked fine.
The one patch looks like it is exposing mutt_sasl_start(void) for an
external plugin maybe. Am I missing a user that is depending on this?
Assuming no issues with this I am including the below patch.
I am CC'ing tb as they touched this patch last.
Index: patch-auto_def
===================================================================
RCS file: patch-auto_def
diff -N patch-auto_def
--- patch-auto_def 29 Apr 2022 14:33:37 -0000 1.18
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-Cope with some problem, possibly related to the old version of curses in
OpenBSD
-
-Index: auto.def
---- auto.def.orig
-+++ auto.def
-@@ -754,9 +754,9 @@ cc-with [list -libs -L$ncurses_prefix/$::libdir_tail]
- user-error "Unable to find ncursesw library"
- }
-
-- foreach f {bkgrndset setcchar} {
-- cc-check-function-in-lib $f $ncurses_lib
-- }
-+# foreach f {bkgrndset setcchar} {
-+# cc-check-function-in-lib $f $ncurses_lib
-+# }
- }
-
- # Locate the directory containing ncurses.h
Index: patch-conn_sasl_c
===================================================================
RCS file: patch-conn_sasl_c
diff -N patch-conn_sasl_c
--- patch-conn_sasl_c 29 Apr 2022 14:33:37 -0000 1.12
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: conn/sasl.c
---- conn/sasl.c.orig
-+++ conn/sasl.c
-@@ -269,7 +269,7 @@ static int mutt_sasl_cb_log(void *context, int priorit
- *
- * Call before doing an SASL exchange (initialises library if necessary).
- */
--static int mutt_sasl_start(void)
-+int mutt_sasl_start(void)
- {
- static bool sasl_init = false;
-
Index: patch-conn_sasl_h
===================================================================
RCS file: patch-conn_sasl_h
diff -N patch-conn_sasl_h
--- patch-conn_sasl_h 7 Mar 2022 21:36:45 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-Index: conn/sasl.h
---- conn/sasl.h.orig
-+++ conn/sasl.h
-@@ -36,5 +36,6 @@ int mutt_sasl_client_new(struct Connection *conn, sas
- void mutt_sasl_done (void);
- int mutt_sasl_interact (sasl_interact_t *interaction);
- void mutt_sasl_setup_conn(struct Connection *conn, sasl_conn_t *saslconn);
-+int mutt_sasl_start (void);
-
- #endif /* MUTT_CONN_SASL_H */
