CVS commit: pkgsrc/chat/libpurple

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Oct  5 07:39:54 UTC 2025

Modified Files:
        pkgsrc/chat/libpurple: Makefile distinfo
Added Files:
        pkgsrc/chat/libpurple/patches: patch-pidgin_gtkimhtml.c

Log Message:
libpurple: fix a ctype(3) problem

>From Anthony Mallet on tech-pkg.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 pkgsrc/chat/libpurple/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/chat/libpurple/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/libpurple/patches/patch-pidgin_gtkimhtml.c

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

Modified files:

Index: pkgsrc/chat/libpurple/Makefile
diff -u pkgsrc/chat/libpurple/Makefile:1.135 pkgsrc/chat/libpurple/Makefile:1.136
--- pkgsrc/chat/libpurple/Makefile:1.135        Fri Jul  4 08:44:47 2025
+++ pkgsrc/chat/libpurple/Makefile      Sun Oct  5 07:39:53 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.135 2025/07/04 08:44:47 wiz Exp $
+# $NetBSD: Makefile,v 1.136 2025/10/05 07:39:53 wiz Exp $
 
 PKGNAME=       libpurple-${PIDGIN_VERSION}
-PKGREVISION=   2
-#PKGREVISION=  0
+PKGREVISION=   3
 
 COMMENT=       Plugin-based multi-protocol instant messaging library
 

Index: pkgsrc/chat/libpurple/distinfo
diff -u pkgsrc/chat/libpurple/distinfo:1.59 pkgsrc/chat/libpurple/distinfo:1.60
--- pkgsrc/chat/libpurple/distinfo:1.59 Sun Feb  2 12:33:12 2025
+++ pkgsrc/chat/libpurple/distinfo      Sun Oct  5 07:39:53 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.59 2025/02/02 12:33:12 gdt Exp $
+$NetBSD: distinfo,v 1.60 2025/10/05 07:39:53 wiz Exp $
 
 BLAKE2s (pidgin-2.14.14.tar.bz2) = 0cd37c6b2632abbbf98df254f1c7dc8478bbdaba1ddca897ca508b20b0c123e3
 SHA512 (pidgin-2.14.14.tar.bz2) = 2d1ee55e701983871762b5307a2c13fa4431b388229aee7c27522ba593a4c79df729be04cda91f44b3cc9663ca0579bf66b722cdcbd71cae3b8c2dbe75c1f24d
 Size (pidgin-2.14.14.tar.bz2) = 8121174 bytes
 SHA1 (patch-libpurple_plugins_perl_common_Makefile.PL.in) = 4fc1c7cc2df8f4cf179d00fe3bcf5b2ab0c5adbd
+SHA1 (patch-pidgin_gtkimhtml.c) = 54af515155ae2d3326b405516158865d365102c7

Added files:

Index: pkgsrc/chat/libpurple/patches/patch-pidgin_gtkimhtml.c
diff -u /dev/null pkgsrc/chat/libpurple/patches/patch-pidgin_gtkimhtml.c:1.1
--- /dev/null   Sun Oct  5 07:39:54 2025
+++ pkgsrc/chat/libpurple/patches/patch-pidgin_gtkimhtml.c      Sun Oct  5 07:39:53 2025
@@ -0,0 +1,30 @@
+$NetBSD: patch-pidgin_gtkimhtml.c,v 1.1 2025/10/05 07:39:53 wiz Exp $
+
+Fix -Wchar-subscripts
+
+The code isspace(*(c - 1)) below actually later triggers a segfault in
+NetBSD-11 when passed a non-ASCII char in the range [0x80-0xff].
+
+--- pidgin/gtkimhtml.c~        2024-09-17 10:52:23.000000000 +0200
++++ pidgin/gtkimhtml.c 2025-10-05 04:44:34.643159904 +0200
+@@ -3095,7 +3095,7 @@
+                                                       } else if (*size == '-') {
+                                                               sscanf (size + 1, "%hd", &font->size);
+                                                               font->size = MAX (0, 3 - font->size);
+-                                                      } else if (isdigit (*size)) {
++                                                      } else if (isdigit ((unsigned char)*size)) {
+                                                               sscanf (size, "%hd", &font->size);
+                                                       }
+                                                       if (font->size > 100)
+@@ -3512,9 +3512,9 @@
+                       }
+                       c++;
+                       pos++;
+-              } else if ((pos == 0 || wpos == 0 || isspace(*(c - 1))) &&
++              } else if ((pos == 0 || wpos == 0 || isspace((unsigned char)*(c - 1))) &&
+                          (len_protocol = gtk_imhtml_is_protocol(c)) > 0 &&
+-                                 c[len_protocol] && !isspace(c[len_protocol]) &&
++                                 c[len_protocol] && !isspace((unsigned char)c[len_protocol]) &&
+                                  (c[len_protocol] != '<' || !gtk_imhtml_is_tag(c + 1, NULL, NULL, NULL))) {
+                       br = FALSE;
+                       if (wpos > 0) {