The branch main has been updated by emaste:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=98bebc20cef7527ccb15f8defc9d52e803a0d506

commit 98bebc20cef7527ccb15f8defc9d52e803a0d506
Author:     Ed Maste <ema...@freebsd.org>
AuthorDate: 2025-01-17 17:49:01 +0000
Commit:     Ed Maste <ema...@freebsd.org>
CommitDate: 2025-01-17 17:56:30 +0000

    Revert "certctl: Set METALOG ownership to root:wheel"
    
    This introduces a circular dependency because it requires an existing
    dbdir for install -N, which might not yet exist.
    
    I imagine we can use install -o 0 -g -0, avoiding the need for the
    dbdir, but install emits uname=0 gname=0 rather than uid=0 gid=0.
    So just revert for now pending a full fix.
    
    This reverts commit 10fa3f2518d4582c98d74527f79af9f30b1eceab.
    
    PR:             283340
    Event:          January 2025 Bug-busting session
    Sponsored by:   The FreeBSD Foundation
---
 usr.sbin/certctl/certctl.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.sbin/certctl/certctl.sh b/usr.sbin/certctl/certctl.sh
index d336a02fd4ea..864302ab1160 100755
--- a/usr.sbin/certctl/certctl.sh
+++ b/usr.sbin/certctl/certctl.sh
@@ -334,7 +334,7 @@ fi
 : ${METALOG:=${DESTDIR}/METALOG}
 INSTALLFLAGS=
 if "$UNPRIV" ; then
-       INSTALLFLAGS="-U -M ${METALOG} -D ${DESTDIR} -N 
${DESTDIR}${DISTBASE}/etc -o root -g wheel"
+       INSTALLFLAGS="-U -M ${METALOG} -D ${DESTDIR}"
 fi
 : ${LOCALBASE:=$(sysctl -n user.localbase)}
 : 
${TRUSTPATH:=${DESTDIR}${DISTBASE}/usr/share/certs/trusted:${DESTDIR}${LOCALBASE}/share/certs:${DESTDIR}${LOCALBASE}/etc/ssl/certs}

Reply via email to