CVS commit: pkgsrc/mail/mu

["Kevin Bloom" <ktnb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ktnb
Date:           Wed May 13 19:12:43 UTC 2026

Modified Files:
        pkgsrc/mail/mu: distinfo
        pkgsrc/mail/mu/patches: patch-lib_utils_mu-html-to-text.cc
Added Files:
        pkgsrc/mail/mu/patches: patch-lib_utils_mu-sexp.cc

Log Message:
mu: found another ctype(3) issue...


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/mail/mu/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/mail/mu/patches/patch-lib_utils_mu-html-to-text.cc
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/mu/patches/patch-lib_utils_mu-sexp.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/mu/distinfo
diff -u pkgsrc/mail/mu/distinfo:1.17 pkgsrc/mail/mu/distinfo:1.18
--- pkgsrc/mail/mu/distinfo:1.17        Wed May 13 18:34:47 2026
+++ pkgsrc/mail/mu/distinfo     Wed May 13 19:12:43 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2026/05/13 18:34:47 ktnb Exp $
+$NetBSD: distinfo,v 1.18 2026/05/13 19:12:43 ktnb Exp $
 
 BLAKE2s (mu-1.14.1.tar.gz) = 5a363f24afcab47619359feb361fe5de647213eb3007e372481421f4421d1f7f
 SHA512 (mu-1.14.1.tar.gz) = f2210fb217d27044292339f494e3c48b2e34c43ce89c0c41f980d5b4bb6a3721657a7246d7f17e01b186f5274cf7b78c55ca284892375c7063c95dd314db06e5
@@ -7,6 +7,7 @@ SHA1 (patch-lib_message_mu-contact.hh) =
 SHA1 (patch-lib_message_mu-labels.cc) = 37f207ccd216d3cec59c07b24a1512a28d46d058
 SHA1 (patch-lib_message_mu-message-part.cc) = 1af584701961a896b9da7368f6019ab883ca4723
 SHA1 (patch-lib_mu-query-processor.cc) = 646bfd73818aff8e87658065d5b8e1c543eeada2
-SHA1 (patch-lib_utils_mu-html-to-text.cc) = 237a86c329e164feff973fe51fb9c93b033b6ee5
+SHA1 (patch-lib_utils_mu-html-to-text.cc) = 5a2a52c8d31ef7048d597068342831ab93c57c5c
+SHA1 (patch-lib_utils_mu-sexp.cc) = fabb59590e2b9348c3ba9992d67b3739288c591d
 SHA1 (patch-lib_utils_mu-utils.cc) = 90374673360fd191b238940117e44b1e6deb8579
 SHA1 (patch-mu4e_meson.build) = 8578ab905d8bb4e26b7ad27cf6cb3d68d353c7e1

Index: pkgsrc/mail/mu/patches/patch-lib_utils_mu-html-to-text.cc
diff -u pkgsrc/mail/mu/patches/patch-lib_utils_mu-html-to-text.cc:1.1 pkgsrc/mail/mu/patches/patch-lib_utils_mu-html-to-text.cc:1.2
--- pkgsrc/mail/mu/patches/patch-lib_utils_mu-html-to-text.cc:1.1       Wed May 13 17:46:13 2026
+++ pkgsrc/mail/mu/patches/patch-lib_utils_mu-html-to-text.cc   Wed May 13 19:12:43 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-lib_utils_mu-html-to-text.cc,v 1.1 2026/05/13 17:46:13 ktnb Exp $
+$NetBSD: patch-lib_utils_mu-html-to-text.cc,v 1.2 2026/05/13 19:12:43 ktnb Exp $
 
 ctype(3) for NetBSD 11
 
---- lib/utils/mu-html-to-text.cc.orig  2026-05-13 17:22:59.975533319 +0000
+--- lib/utils/mu-html-to-text.cc.orig  2026-04-27 19:03:29.000000000 +0000
 +++ lib/utils/mu-html-to-text.cc
 @@ -36,7 +36,7 @@ starts_with(std::string_view haystack, std::string_vie
                return false;
@@ -13,6 +13,15 @@ ctype(3) for NetBSD 11
                        return false;
  
        return true;
+@@ -143,7 +143,7 @@ class Context { (public)
+       std::string_view eat_head_word() {
+               size_t start_pos{pos_};
+               while (!done()) {
+-                      if (!::isalpha(html_.at(pos_)))
++                      if (!::isalpha(static_cast<unsigned char>(html_.at(pos_))))
+                               break;
+                       ++pos_;
+               }
 @@ -440,7 +440,7 @@ html_escape_char(Context& ctx)
        auto unescape=[escs](std::string_view esc)->char {
                if (esc.empty())

Added files:

Index: pkgsrc/mail/mu/patches/patch-lib_utils_mu-sexp.cc
diff -u /dev/null pkgsrc/mail/mu/patches/patch-lib_utils_mu-sexp.cc:1.1
--- /dev/null   Wed May 13 19:12:43 2026
+++ pkgsrc/mail/mu/patches/patch-lib_utils_mu-sexp.cc   Wed May 13 19:12:43 2026
@@ -0,0 +1,32 @@
+$NetBSD: patch-lib_utils_mu-sexp.cc,v 1.1 2026/05/13 19:12:43 ktnb Exp $
+
+ctype(3) for NetBSD 11
+
+--- lib/utils/mu-sexp.cc.orig  2026-04-27 19:03:29.000000000 +0000
++++ lib/utils/mu-sexp.cc
+@@ -129,11 +129,11 @@ parse_symbol(const std::string& expr, size_t& pos)
+ static Result<Sexp>
+ parse_symbol(const std::string& expr, size_t& pos)
+ {
+-      if (!isalpha(expr[pos]) && expr[pos] != ':') // sanity check.
++      if (!isalpha(static_cast<unsigned char>(expr[pos])) && expr[pos] != ':') // sanity check.
+               return Err(parsing_error(pos, "expected: <alpha>|: but got '{}", expr[pos]));
+ 
+       std::string symb(1, expr[pos]);
+-      for (++pos; isalnum(expr[pos]) || expr[pos] == '-'; ++pos)
++      for (++pos; isalnum(static_cast<unsigned char>(expr[pos])) || expr[pos] == '-'; ++pos)
+               symb += expr[pos];
+ 
+       return Ok(Sexp{Sexp::Symbol{symb}});
+@@ -153,9 +153,9 @@ parse(const std::string& expr, size_t& pos)
+                       return parse_list(expr, pos);
+               else if (kar == '"')
+                       return parse_string(expr, pos);
+-              else if (isdigit(kar) || kar == '-')
++              else if (isdigit(static_cast<unsigned char>(kar)) || kar == '-')
+                       return parse_integer(expr, pos);
+-              else if (isalpha(kar) || kar == ':')
++              else if (isalpha(static_cast<unsigned char>(kar)) || kar == ':')
+                       return parse_symbol(expr, pos);
+               else
+                       return Err(parsing_error(pos, "unexpected character '{}", kar));