From nobody Thu Feb 20 13:07:45 2025 X-Original-To: dev-commits-src-branches@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 4YzD821Ln5z5nryc; Thu, 20 Feb 2025 13:07:46 +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 4YzD820MXhz434P; Thu, 20 Feb 2025 13:07:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740056866; 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=fQ4cSn4GTTfL6ZRswGgwFGTRNymVNLuKVixrepFS8Nw=; b=jh6AYuIGDU/qvZzMH/3365mDcfF46zWADvZr9HbcLiWKJDvni5aiRAh7xQgf6oDr6SyykH ko6vlbGdJuRguVrjkyuKDcxZcOvDCrp92zLWVVhnGVp6OUkzdVwL1vakg6oELjWIaE98cJ cYvcSkDdZiudhWh2dryZtchb5JoAXJ8nzobHAwEr16Aj/SPW98H/6K451RX3QFw9uCvsj+ Ehx7v4IZYbb123GGGh/ua4jwlD9FlCzA6E8MooFuSfyJoXWc4Op2lZn88lsfrcxYNDzfNY q57oRPxQg0wKlTZmab70dMa6MLNISm5VO2cu1wlLOm1e7IXD/QP3g68fK3W+ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740056866; a=rsa-sha256; cv=none; b=oT/iYxYRDsfW5AnjSd/tL4nVa5Jur0t0APTUooAHI9UsoQxNWGOVI1oaaOE1pTdG2ZDE22 9IMUnql9Ib1xUhfuU5HqgRB8JbWJ0rauJz86lNEiN083SaCGtC4WbI2uYTE7oiNErBX6+P JnLw0F/bZveoc8vDv7nSHh+Q//4hthLmovEDjShVz8HfDj/osJkvUZ5Ws42DM5LftlLyqq 5Sscwxl/aRtR9SZAqRr6SlsT51g36IsLeHAuzb2qMco6eZrj91evDHrG4N4oyPzRWmln4t 2Xr9a05JaVut4iwuDhTLQTddY73EOxNuJcT97ym1kWUVp/sB88pfp83zHKAZFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740056866; 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=fQ4cSn4GTTfL6ZRswGgwFGTRNymVNLuKVixrepFS8Nw=; b=PGWWKWakm82jWN409Sxwa9bYx0qVFOnWg2zmO+dbpU6jOOCHPur4JFvK2b7OhgH7vz/HC5 xtAyCf7UrgpLlF82ZX1oDQgpV9bS8iEnBOmL4IfsKfu5B5v59vwOZ9wI532B8gw0yVluwE GubexrrcsQFTYRmrd/uefJj+mU+z7wPM+KM2yPSZ7LIfRdRuk4f+Xnh1ixtZiij6Avg9Fm w2Et27KxTOVQzZE2RiTryWkSksGLYUn99EEyTGx48SluAMFdmLwXCZO31SCP9S7OdeEk/z RYhC46ywuxraOeIBuzQG2rLPBMctnWYCOugE1X589uniUkODZwS6/mIJ9LMRBw== 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 4YzD8170SVzt31; Thu, 20 Feb 2025 13:07:45 +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 51KD7jQv025168; Thu, 20 Feb 2025 13:07:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51KD7jXa025165; Thu, 20 Feb 2025 13:07:45 GMT (envelope-from git) Date: Thu, 20 Feb 2025 13:07:45 GMT Message-Id: <202502201307.51KD7jXa025165@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 546987291380 - stable/14 - certctl: Set METALOG ownership to root:wheel List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 5469872913809c35731605e479f2128ddf75c001 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5469872913809c35731605e479f2128ddf75c001 commit 5469872913809c35731605e479f2128ddf75c001 Author: Ed Maste AuthorDate: 2025-02-04 13:48:55 +0000 Commit: Ed Maste CommitDate: 2025-02-20 13:07:17 +0000 certctl: Set METALOG ownership to root:wheel This sets the correct ownership values when building base.txz install(1) does not validate the arguments passed to -o or -g (see PR283355) so there's no need to have the passwd db available for now. Future work includes plumbing the appropriate passwd db path through certctl, and validating uid and gid in install(1). PR: 283340 Reviewed by: jrtc27 Differential Revision: https://reviews.freebsd.org/D48506 (cherry picked from commit 10fa3f2518d4582c98d74527f79af9f30b1eceab) (cherry picked from commit 98bebc20cef7527ccb15f8defc9d52e803a0d506) (cherry picked from commit 4d15b58365ea706129bedfdb37e0c5e8661a640f) --- 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 02d055102c33..5af8fecb93ac 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. @@ -303,7 +303,7 @@ fi : ${METALOG:=${DESTDIR}/METALOG} INSTALLFLAGS= if "$UNPRIV" ; then - INSTALLFLAGS="-U -M ${METALOG} -D ${DESTDIR}" + INSTALLFLAGS="-U -M ${METALOG} -D ${DESTDIR} -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}