From nobody Mon Dec 30 17:32:34 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YMNTb1KsSz5hVD2; Mon, 30 Dec 2024 17:32:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YMNTb0n7Pz3wng; Mon, 30 Dec 2024 17:32:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735579955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BbCmA9sKiZpuoFXlB0HfO6YfIoOlwgruPT2q/cLlcdQ=; b=eI3T67YsUmD5iFunX0s+JN/+6OPfyY+aHmQWDDDm7eTJW6IF370xZ7etAfdAv/M4ypnniq 3+ACXuOh3E5HUvj8I8LMYcA7rGjJJAVY8dVmqz2kyUMnzv2H6aIcjO8Ye05vCLqJ0RUKZ2 INzLX2aqatQgNO0iobc1FqD6JQJNfQWXazVjmAktr1e2RHplClqL0nsK4mqETCTZzeK4np 6JyuuxW0deN8znuNC6PnS+DN4B0HR4Ub53F/6PanbgsoSuEHq/TpkzFQHhIMIcIKx1XhTe /BrobQElh8Y+5OueJE4XvvR5enL1dslVrO7qAF/i56i9Ck3ghmR7gOYKcTsbPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735579955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BbCmA9sKiZpuoFXlB0HfO6YfIoOlwgruPT2q/cLlcdQ=; b=PUVFwvJIOR50CQR4QR43wqNNyN1no+hlfvHPPAEH9e/JvyQiexkiiqoMoRL8QHfAVM9kI/ 8aw2K+QuCIwC0/FXzFglAqTZUy6w4tmMy7ZRgCeQRioAj10knPqr47k1+OgwFmN5L2Hytd 0uErisBYAuE+aP4E0BLV0PE+lcaJuYyyYMvFlNVKY2N+WMVBrQ4KgQRVNAGbmDNCwsev20 pB27DqhPeoHftE35Wt4QPOq6acQl8Kj+FI2fgdU/HeyDQxNz11fFAsuxRvClu+1QlDERmi IdkR3hnTOIGgwfa38dj8krrdDz0iANaQ4oDMTVDH8p50n+l0quFM0ihwPEuxZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735579955; a=rsa-sha256; cv=none; b=hYhafOhydxmjxCkiQyK0Cz6+Icm/uHGiAnWaP+CcMD3hQlbIhIP7TOaAuJHKkmiYk9vSVs z0ZSgMdPUOLXkjxTYlFKWENp8njGT2jQdJcpewoYMZHN//gBfgrPGRhjL3IIqoEF6zqls5 CP8wGl7MiH9iW+GfkvMBpTxDQYGR/JB9UdzfhedyjXbxzqWJ+6OV2x2iAMI2Qsz7nj1gJN nuUjB/fAHxamIHIOLP/faKXhUHc0lqMkIUAwJloN/OyCfDFIv0ryYGb2UA7FuRlIMPjwaR BTA45T/J+4vZMt7/94696douJXyH0XqUClmpcRAmYQ1F7etBXSpqkrMiUwUYxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YMNTb0NH5z13pn; Mon, 30 Dec 2024 17:32:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BUHWYTH062999; Mon, 30 Dec 2024 17:32:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUHWYKU062996; Mon, 30 Dec 2024 17:32:34 GMT (envelope-from git) Date: Mon, 30 Dec 2024 17:32:34 GMT Message-Id: <202412301732.4BUHWYKU062996@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 10fa3f2518d4 - main - certctl: Set METALOG ownership to root:wheel List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10fa3f2518d4582c98d74527f79af9f30b1eceab Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=10fa3f2518d4582c98d74527f79af9f30b1eceab commit 10fa3f2518d4582c98d74527f79af9f30b1eceab Author: Pat Maddox AuthorDate: 2024-12-15 09:20:24 +0000 Commit: Ed Maste CommitDate: 2024-12-30 17:32:23 +0000 certctl: Set METALOG ownership to root:wheel This sets the correct ownership values when building base.txz PR: 283340 Reviewed by: allanjude Pull request: https://github.com/freebsd/freebsd-src/pull/1550 Signed-off-by: Pat Maddox --- usr.sbin/certctl/certctl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/certctl/certctl.sh b/usr.sbin/certctl/certctl.sh index f95b4561d852..d336a02fd4ea 100755 --- a/usr.sbin/certctl/certctl.sh +++ b/usr.sbin/certctl/certctl.sh @@ -5,7 +5,7 @@ # Copyright 2018 Allan Jude # # Redistribution and use in source and binary forms, with or without -# modification, are permitted providing that the following conditions +# modification, are permitted providing that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. @@ -334,7 +334,7 @@ fi : ${METALOG:=${DESTDIR}/METALOG} INSTALLFLAGS= if "$UNPRIV" ; then - INSTALLFLAGS="-U -M ${METALOG} -D ${DESTDIR}" + INSTALLFLAGS="-U -M ${METALOG} -D ${DESTDIR} -N ${DESTDIR}${DISTBASE}/etc -o root -g wheel" fi : ${LOCALBASE:=$(sysctl -n user.localbase)} : ${TRUSTPATH:=${DESTDIR}${DISTBASE}/usr/share/certs/trusted:${DESTDIR}${LOCALBASE}/share/certs:${DESTDIR}${LOCALBASE}/etc/ssl/certs}