CVS commit: pkgsrc/fonts/harfbuzz

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan 11 06:00:33 UTC 2026

Modified Files:
        pkgsrc/fonts/harfbuzz: Makefile distinfo
Added Files:
        pkgsrc/fonts/harfbuzz/patches: patch-src_hb-ot-cmap-table.hh

Log Message:
harfbuzz: add upstream fix for GHSA-xvjr-f2r9-c7ww

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 pkgsrc/fonts/harfbuzz/Makefile
cvs rdiff -u -r1.164 -r1.165 pkgsrc/fonts/harfbuzz/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/fonts/harfbuzz/patches/patch-src_hb-ot-cmap-table.hh

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

Modified files:

Index: pkgsrc/fonts/harfbuzz/Makefile
diff -u pkgsrc/fonts/harfbuzz/Makefile:1.154 pkgsrc/fonts/harfbuzz/Makefile:1.155
--- pkgsrc/fonts/harfbuzz/Makefile:1.154        Thu Nov  6 16:22:20 2025
+++ pkgsrc/fonts/harfbuzz/Makefile      Sun Jan 11 06:00:33 2026
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.154 2025/11/06 16:22:20 adam Exp $
+# $NetBSD: Makefile,v 1.155 2026/01/11 06:00:33 wiz Exp $
 
+PKGREVISION=1
 .include "Makefile.common"
 
 COMMENT=       OpenType text shaping engine

Index: pkgsrc/fonts/harfbuzz/distinfo
diff -u pkgsrc/fonts/harfbuzz/distinfo:1.164 pkgsrc/fonts/harfbuzz/distinfo:1.165
--- pkgsrc/fonts/harfbuzz/distinfo:1.164        Sun Dec 28 08:05:47 2025
+++ pkgsrc/fonts/harfbuzz/distinfo      Sun Jan 11 06:00:33 2026
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.164 2025/12/28 08:05:47 adam Exp $
+$NetBSD: distinfo,v 1.165 2026/01/11 06:00:33 wiz Exp $
 
 BLAKE2s (harfbuzz-12.3.0.tar.xz) = d4dfb14534b40e1eddaaab25488eb406d8b59d021e752eba11187da1818efa7c
 SHA512 (harfbuzz-12.3.0.tar.xz) = 7452379ee35b312cb83b5365e480dd2cc73813fa5eb489988ea7b02fa7e8137de66ea10ef71fcbbfb3275013247c46ede3f28ac9ef92c1213424ea0b0a077b03
 Size (harfbuzz-12.3.0.tar.xz) = 18580220 bytes
+SHA1 (patch-src_hb-ot-cmap-table.hh) = 5ad670bd0cafdb2cbbc1588dd047697d56b8fd60
 SHA1 (patch-src_meson.build) = 5b46f9933d5dea1f842fccf63eb92faae1f7c90f
 SHA1 (patch-util_meson.build) = 50c5146c723a734ee42609dcc384de0feb46369e

Added files:

Index: pkgsrc/fonts/harfbuzz/patches/patch-src_hb-ot-cmap-table.hh
diff -u /dev/null pkgsrc/fonts/harfbuzz/patches/patch-src_hb-ot-cmap-table.hh:1.1
--- /dev/null   Sun Jan 11 06:00:33 2026
+++ pkgsrc/fonts/harfbuzz/patches/patch-src_hb-ot-cmap-table.hh Sun Jan 11 06:00:33 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_hb-ot-cmap-table.hh,v 1.1 2026/01/11 06:00:33 wiz Exp $
+
+[cmap] malloc fail test (#5710)
+https://github.com/harfbuzz/harfbuzz/commit/1265ff8d990284f04d8768f35b0e20ae5f60daae
+
+--- src/hb-ot-cmap-table.hh.orig       2025-12-27 20:33:25.000000000 +0000
++++ src/hb-ot-cmap-table.hh
+@@ -1670,6 +1670,10 @@ struct SubtableUnicodesCache {
+   {
+     SubtableUnicodesCache* cache =
+         (SubtableUnicodesCache*) hb_malloc (sizeof(SubtableUnicodesCache));
++
++    if (unlikely (!cache))
++      return nullptr;
++
+     new (cache) SubtableUnicodesCache (source_table);
+     return cache;
+   }