CVS commit: pkgsrc/devel/wayland

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Mon Apr  7 17:33:30 UTC 2025

Modified Files:
        pkgsrc/devel/wayland: Makefile distinfo
Added Files:
        pkgsrc/devel/wayland/patches: patch-scanner.c

Log Message:
wayland: call ctype functions with unsigned chars.

Avoids segmentation faults when building wayland-protocols

Program received signal SIGSEGV, Segmentation fault.
0x0000000000003d81 in desc_dump (
    desc=0x7f7ff77bc000 "\n          Rec. ITU-R BT.1886 is the display transfer characteristic assumed by\n          - Rec. ITU-R BT.601-7 525 and 625\n          - Rec. ITU-R BT.709-6\n          - 
Rec. ITU-R BT.2020-2\n          T"...,
    fmt=0xb016 "\t * ") at scanner.c:366
366                     while (desc[i] && !isspace(desc[i]))
(gdb) print desc[i]
$1 = -62 '\302'


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/wayland/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/wayland/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/wayland/patches/patch-scanner.c

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

Modified files:

Index: pkgsrc/devel/wayland/Makefile
diff -u pkgsrc/devel/wayland/Makefile:1.27 pkgsrc/devel/wayland/Makefile:1.28
--- pkgsrc/devel/wayland/Makefile:1.27  Thu Jan 23 17:53:35 2025
+++ pkgsrc/devel/wayland/Makefile       Mon Apr  7 17:33:30 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2025/01/23 17:53:35 riastradh Exp $
+# $NetBSD: Makefile,v 1.28 2025/04/07 17:33:30 prlw1 Exp $
 
 DISTNAME=      wayland-1.23.0
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    devel
 MASTER_SITES=  https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PKGVERSION_NOREV}/downloads/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/devel/wayland/distinfo
diff -u pkgsrc/devel/wayland/distinfo:1.14 pkgsrc/devel/wayland/distinfo:1.15
--- pkgsrc/devel/wayland/distinfo:1.14  Thu Jan 23 17:53:35 2025
+++ pkgsrc/devel/wayland/distinfo       Mon Apr  7 17:33:30 2025
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.14 2025/01/23 17:53:35 riastradh Exp $
+$NetBSD: distinfo,v 1.15 2025/04/07 17:33:30 prlw1 Exp $
 
 BLAKE2s (wayland-1.23.0.tar.xz) = fc1a51e492c72230e59ae2dc5380dd19ec9a40cae61cac5ef5240a0b30047822
 SHA512 (wayland-1.23.0.tar.xz) = 9c525231a7ea3e68d3178230d476285a960d23e38571ac96d885f86c0588c52ef01460bff6833db5adb9456ce8db7b996613611187aac972736748ba91b8fd81
 Size (wayland-1.23.0.tar.xz) = 237900 bytes
 SHA1 (patch-meson.build) = de540a3d1f72d258b377a1e41325064f425e7534
 SHA1 (patch-meson__options.txt) = af930cd03994d7a2202af97b17939555c3aa7409
+SHA1 (patch-scanner.c) = 68629112c5518aeaecbf831d14bea53168c1bc95
 SHA1 (patch-src_meson.build) = 47bb46d9af0ab428667bebbed36b09f0b0b9c414
 SHA1 (patch-src_wayland-os.c) = 8bbd574108e06697c874d372062d3129eb7937d1
 SHA1 (patch-src_wayland-util.h) = 5c12f864cf64d8b3863ad2f81e398cf99fffa8e8

Added files:

Index: pkgsrc/devel/wayland/patches/patch-scanner.c
diff -u /dev/null pkgsrc/devel/wayland/patches/patch-scanner.c:1.1
--- /dev/null   Mon Apr  7 17:33:30 2025
+++ pkgsrc/devel/wayland/patches/patch-scanner.c        Mon Apr  7 17:33:30 2025
@@ -0,0 +1,33 @@
+$NetBSD: patch-scanner.c,v 1.1 2025/04/07 17:33:30 prlw1 Exp $
+
+Avoid segmentation fault when building wayland-protocols
+
+--- src/scanner.c.orig 2024-05-30 18:59:51.000000000 +0000
++++ src/scanner.c
+@@ -294,7 +294,7 @@ uppercase_dup(const char *src)
+ 
+       u = xstrdup(src);
+       for (i = 0; u[i]; i++)
+-              u[i] = toupper(u[i]);
++              u[i] = toupper((unsigned char)u[i]);
+       u[i] = '\0';
+ 
+       return u;
+@@ -354,7 +354,7 @@ desc_dump(char *desc, const char *fmt, .
+       for (i = 0; desc[i]; ) {
+               k = i;
+               newlines = 0;
+-              while (desc[i] && isspace(desc[i])) {
++              while (desc[i] && isspace((unsigned char)desc[i])) {
+                       if (desc[i] == '\n')
+                               newlines++;
+                       i++;
+@@ -363,7 +363,7 @@ desc_dump(char *desc, const char *fmt, .
+                       break;
+ 
+               j = i;
+-              while (desc[i] && !isspace(desc[i]))
++              while (desc[i] && !isspace((unsigned char)desc[i]))
+                       i++;
+ 
+               if (newlines > 1)