CVS commit: pkgsrc/mail/mu

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

Module Name:    pkgsrc
Committed By:   ktnb
Date:           Wed May 13 18:34:47 UTC 2026

Modified Files:
        pkgsrc/mail/mu: distinfo
Added Files:
        pkgsrc/mail/mu/patches: patch-lib_message_mu-labels.cc
            patch-lib_message_mu-message-part.cc
            patch-lib_mu-query-processor.cc patch-lib_utils_mu-utils.cc

Log Message:
mu: found more ctype bugs


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/mail/mu/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/mu/patches/patch-lib_message_mu-labels.cc \
    pkgsrc/mail/mu/patches/patch-lib_message_mu-message-part.cc \
    pkgsrc/mail/mu/patches/patch-lib_mu-query-processor.cc \
    pkgsrc/mail/mu/patches/patch-lib_utils_mu-utils.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.16 pkgsrc/mail/mu/distinfo:1.17
--- pkgsrc/mail/mu/distinfo:1.16        Wed May 13 17:46:13 2026
+++ pkgsrc/mail/mu/distinfo     Wed May 13 18:34:47 2026
@@ -1,8 +1,12 @@
-$NetBSD: distinfo,v 1.16 2026/05/13 17:46:13 ktnb Exp $
+$NetBSD: distinfo,v 1.17 2026/05/13 18:34:47 ktnb Exp $
 
 BLAKE2s (mu-1.14.1.tar.gz) = 5a363f24afcab47619359feb361fe5de647213eb3007e372481421f4421d1f7f
 SHA512 (mu-1.14.1.tar.gz) = f2210fb217d27044292339f494e3c48b2e34c43ce89c0c41f980d5b4bb6a3721657a7246d7f17e01b186f5274cf7b78c55ca284892375c7063c95dd314db06e5
 Size (mu-1.14.1.tar.gz) = 1304730 bytes
 SHA1 (patch-lib_message_mu-contact.hh) = dce9b6da318ccb7f6103a9d7796fdf3cf57e187e
+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-utils.cc) = 90374673360fd191b238940117e44b1e6deb8579
 SHA1 (patch-mu4e_meson.build) = 8578ab905d8bb4e26b7ad27cf6cb3d68d353c7e1

Added files:

Index: pkgsrc/mail/mu/patches/patch-lib_message_mu-labels.cc
diff -u /dev/null pkgsrc/mail/mu/patches/patch-lib_message_mu-labels.cc:1.1
--- /dev/null   Wed May 13 18:34:47 2026
+++ pkgsrc/mail/mu/patches/patch-lib_message_mu-labels.cc       Wed May 13 18:34:47 2026
@@ -0,0 +1,20 @@
+$NetBSD: patch-lib_message_mu-labels.cc,v 1.1 2026/05/13 18:34:47 ktnb Exp $
+
+ctype(3) for NetBSD 11
+
+--- lib/message/mu-labels.cc.orig      2026-04-27 19:03:29.000000000 +0000
++++ lib/message/mu-labels.cc
+@@ -50,11 +50,11 @@ Mu::Labels::validate_label(const std::string &label)
+               if (g_unichar_isalnum(uc))
+                       continue; // alphanum is okay
+ 
+-              if (::iscntrl(uc))
++              if (::iscntrl(static_cast<unsigned char>(uc)))
+                       return Err(Error{Error::Code::InvalidArgument,
+                                       "control character {} not allowed in label",
+                                       static_cast<int>(uc)});
+-              if (::isblank(uc))
++              if (::isblank(static_cast<unsigned char>(uc)))
+                       return Err(Error{Error::Code::InvalidArgument,
+                                       "blank character {} not allowed in label",
+                                       static_cast<int>(uc)});
Index: pkgsrc/mail/mu/patches/patch-lib_message_mu-message-part.cc
diff -u /dev/null pkgsrc/mail/mu/patches/patch-lib_message_mu-message-part.cc:1.1
--- /dev/null   Wed May 13 18:34:47 2026
+++ pkgsrc/mail/mu/patches/patch-lib_message_mu-message-part.cc Wed May 13 18:34:47 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_message_mu-message-part.cc,v 1.1 2026/05/13 18:34:47 ktnb Exp $
+
+ctype(3) for NetBSD 11
+
+--- lib/message/mu-message-part.cc.orig        2026-04-27 19:03:29.000000000 +0000
++++ lib/message/mu-message-part.cc
+@@ -49,7 +49,7 @@ cook(const std::string& fname, const std::vector<char>
+       clean.reserve(fname.length());
+ 
+       for (auto& c: basename(fname))
+-              if (seq_some(forbidden,[&](char fc){return ::iscntrl(c) || c == fc;}))
++              if (seq_some(forbidden,[&](char fc){return ::iscntrl(static_cast<unsigned char>(c)) || c == fc;}))
+                       clean += '-';
+               else
+                       clean += c;
Index: pkgsrc/mail/mu/patches/patch-lib_mu-query-processor.cc
diff -u /dev/null pkgsrc/mail/mu/patches/patch-lib_mu-query-processor.cc:1.1
--- /dev/null   Wed May 13 18:34:47 2026
+++ pkgsrc/mail/mu/patches/patch-lib_mu-query-processor.cc      Wed May 13 18:34:47 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_mu-query-processor.cc,v 1.1 2026/05/13 18:34:47 ktnb Exp $
+
+ctype(3) for NetBSD 11
+
+--- lib/mu-query-processor.cc.orig     2026-04-27 19:03:29.000000000 +0000
++++ lib/mu-query-processor.cc
+@@ -437,7 +437,7 @@ process(const std::string& expr)
+       /* all control chars become SPC */
+       std::string str{expr};
+       for (auto& c: str)
+-              c = ::iscntrl(c) ? ' ' : c;
++              c = ::iscntrl(static_cast<unsigned char>(c)) ? ' ' : c;
+ 
+       while(!str.empty()) {
+               auto&& element = next_element(str, offset)
Index: pkgsrc/mail/mu/patches/patch-lib_utils_mu-utils.cc
diff -u /dev/null pkgsrc/mail/mu/patches/patch-lib_utils_mu-utils.cc:1.1
--- /dev/null   Wed May 13 18:34:47 2026
+++ pkgsrc/mail/mu/patches/patch-lib_utils_mu-utils.cc  Wed May 13 18:34:47 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_utils_mu-utils.cc,v 1.1 2026/05/13 18:34:47 ktnb Exp $
+
+ctype(3) for NetBSD 11
+
+--- lib/utils/mu-utils.cc.orig 2026-04-27 19:03:29.000000000 +0000
++++ lib/utils/mu-utils.cc
+@@ -269,7 +269,7 @@ Mu::remove_ctrl(const std::string& str)
+       result.reserve(str.length());
+ 
+       for (auto&& c : str) {
+-              if (::iscntrl(c) || c == ' ') {
++              if (::iscntrl(static_cast<unsigned char>(c)) || c == ' ') {
+                       if (prev != ' ')
+                               result += prev = ' ';
+               } else