From ba896fad73e7e2e5076229543109f975e436ab56 Mon Sep 17 00:00:00 2001
From: bentley <bentley@openbsd.org>
Date: Sun, 13 Jul 2025 08:15:46 +0000
Subject: [PATCH] Change ownership of fontconfig cache to _fc-cache user.

ok kn@ deraadt@
---
 distrib/miniroot/install.sub  | 5 ++++-
 etc/mtree/BSD.x11.dist        | 4 ++--
 usr.sbin/sysmerge/sysmerge.sh | 5 ++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index dd632d205df..bb84f989449 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: install.sub,v 1.1274 2025/07/02 22:55:06 kn Exp $
+#	$OpenBSD: install.sub,v 1.1275 2025/07/13 08:15:46 bentley Exp $
 #
 # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
 # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -1807,6 +1807,9 @@ install_files() {
 		rm -rf /mnt/var/syspatch/*
 	fi
 
+	# From 7.8 onwards, font cache isn't owned by root
+	chown -R _fc-cache:_fc-cache /mnt/var/cache/fontconfig
+
 	# Install the set files.
 	for _f in $_get_sets; do
 		reset_watchdog
diff --git a/etc/mtree/BSD.x11.dist b/etc/mtree/BSD.x11.dist
index 63a9597ba59..b0a145d340f 100644
--- a/etc/mtree/BSD.x11.dist
+++ b/etc/mtree/BSD.x11.dist
@@ -1,4 +1,4 @@
-#       $OpenBSD: BSD.x11.dist,v 1.59 2025/05/24 02:46:02 jsg Exp $
+#       $OpenBSD: BSD.x11.dist,v 1.60 2025/07/13 08:15:46 bentley Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 .
@@ -412,7 +412,7 @@
     ..
     var
         cache
-            fontconfig
+            fontconfig uname=_fc-cache gname=_fc-cache
             ..
         ..
         db
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh
index 79286eb9c5f..967faf888ca 100644
--- a/usr.sbin/sysmerge/sysmerge.sh
+++ b/usr.sbin/sysmerge/sysmerge.sh
@@ -1,6 +1,6 @@
 #!/bin/ksh -
 #
-# $OpenBSD: sysmerge.sh,v 1.235 2019/09/28 17:30:07 ajacoutot Exp $
+# $OpenBSD: sysmerge.sh,v 1.236 2025/07/13 08:15:46 bentley Exp $
 #
 # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org>
 # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org>
@@ -184,6 +184,9 @@ sm_run() {
 	sm_add_user_grp
 	sm_cp_pkg_samples
 
+	# From 7.8 onwards, font cache isn't owned by root
+	chown -R _fc-cache:_fc-cache /var/cache/fontconfig
+
 	for _i in etcsum xetcsum pkgsum; do
 		if [[ -f /var/sysmerge/${_i} && \
 			-f ./var/sysmerge/${_i} ]] && \