CVS commit: pkgsrc/inputmethod/librime

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Apr 27 10:52:42 UTC 2026

Modified Files:
        pkgsrc/inputmethod/librime: Makefile distinfo
Added Files:
        pkgsrc/inputmethod/librime/patches:
            patch-src_rime_config_config__data.cc

Log Message:
librime: fix ctype(3) abuse

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/inputmethod/librime/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/inputmethod/librime/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/inputmethod/librime/patches/patch-src_rime_config_config__data.cc

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

Modified files:

Index: pkgsrc/inputmethod/librime/Makefile
diff -u pkgsrc/inputmethod/librime/Makefile:1.42 pkgsrc/inputmethod/librime/Makefile:1.43
--- pkgsrc/inputmethod/librime/Makefile:1.42    Sun Jan 25 08:21:57 2026
+++ pkgsrc/inputmethod/librime/Makefile Mon Apr 27 10:52:41 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2026/01/25 08:21:57 adam Exp $
+# $NetBSD: Makefile,v 1.43 2026/04/27 10:52:41 wiz Exp $
 
 DISTNAME=      librime-1.16.1
+PKGREVISION=   1
 CATEGORIES=    inputmethod chinese
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=rime/}
 

Index: pkgsrc/inputmethod/librime/distinfo
diff -u pkgsrc/inputmethod/librime/distinfo:1.18 pkgsrc/inputmethod/librime/distinfo:1.19
--- pkgsrc/inputmethod/librime/distinfo:1.18    Sun Jan 25 08:21:57 2026
+++ pkgsrc/inputmethod/librime/distinfo Mon Apr 27 10:52:42 2026
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.18 2026/01/25 08:21:57 adam Exp $
+$NetBSD: distinfo,v 1.19 2026/04/27 10:52:42 wiz Exp $
 
 BLAKE2s (librime-1.16.1.tar.gz) = 2cd60a3c63ce44bdab75496ae6d5f07deb86daf7374af86104a0a80c246af4a8
 SHA512 (librime-1.16.1.tar.gz) = ff48cd3d8a6b39c998735522160e1e213a978bc15e439412a417023042e9c623f0b98ec98c70bd21f0bb204d5197cdc6660cef202da4032ea6a3e4ec99570369
 Size (librime-1.16.1.tar.gz) = 2649730 bytes
 SHA1 (patch-CMakeLists.txt) = dc01d9f1d34d4d1ece83da133dac8efe46089830
 SHA1 (patch-plugins_CMakeLists.txt) = ab0b528c0a9219c52d0a8ca596209799db9de14a
+SHA1 (patch-src_rime_config_config__data.cc) = e9035ce0684f43fc281f8cb2b78fe72449a36f91

Added files:

Index: pkgsrc/inputmethod/librime/patches/patch-src_rime_config_config__data.cc
diff -u /dev/null pkgsrc/inputmethod/librime/patches/patch-src_rime_config_config__data.cc:1.1
--- /dev/null   Mon Apr 27 10:52:42 2026
+++ pkgsrc/inputmethod/librime/patches/patch-src_rime_config_config__data.cc    Mon Apr 27 10:52:42 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_rime_config_config__data.cc,v 1.1 2026/04/27 10:52:42 wiz Exp $
+
+Fix ctype(3) API abuse.
+
+--- src/rime/config/config_data.cc.orig        2026-04-27 10:48:42.262818340 +0000
++++ src/rime/config/config_data.cc
+@@ -96,7 +96,7 @@ bool ConfigData::IsListItemReference(const string& key
+ }
+ 
+ bool ConfigData::IsListItemReference(const string& key) {
+-  return key.length() > 1 && key[0] == '@' && std::isalnum(key[1]);
++  return key.length() > 1 && key[0] == '@' && std::isalnum((unsigned char)key[1]);
+ }
+ 
+ string ConfigData::FormatListIndex(size_t index) {
+@@ -293,7 +293,7 @@ void EmitScalar(const string& str_value, YAML::Emitter
+   if (str_value.find_first_of("\r\n") != string::npos) {
+     *emitter << YAML::Literal;
+   } else if (!std::all_of(str_value.cbegin(), str_value.cend(), [](auto ch) {
+-               return std::isalnum(ch) || ch == '_' || ch == '.';
++               return std::isalnum((unsigned char)ch) || ch == '_' || ch == '.';
+              })) {
+     *emitter << YAML::DoubleQuoted;
+   }