From nobody Fri Jan 17 21:42:26 2025 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 4YZY9Z3WJdz5kGrD; Fri, 17 Jan 2025 21:42:26 +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 4YZY9Z2WCLz4F20; Fri, 17 Jan 2025 21:42:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737150146; 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=YOB6qdoqH7au9s9IRbJlqvhdRzycpO0593kHzOfiraA=; b=dKdplNtv0/rtorysVomr0PAgMdHZs2GC7v7N2nfAn4eAmhHwQLfJed1PuGICbkzGnoa9W6 rOol5Z0bUFY3qaGagkBWVxZziPy8Ixq9aJpanWQnZ+CaGWWc1+2Pb7zdef9s4sRlhTacrW 1/b5hPyMwx3SDPfEcfxpK2/t/6bJTKHQoLxHFT0SNhF7Lh3g/99hKzoBpKpLW5WcGjMA0t UHtodxnwqn0ocu3EltACLf6X7UZbYtkT2W5bIQDBoZ6jmeGQdbVd3hbYf4mlr5TDUQy9Gu wejdSYEyKMuXaPc3cw8spqXItSoZRH65RltASxTdWHurguBbUeNBnzKFMVSoQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737150146; 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=YOB6qdoqH7au9s9IRbJlqvhdRzycpO0593kHzOfiraA=; b=IjGexh13Lhh/+w2fEvpSEIsskSVe2AMQlwUgDdHEnBMTv2mU/6YOAlO36gl57xYp2ycA4t ZiCST+CWR+0NVOHbpArR01crs2PY7LzHLOsuDpFEVWI4edIC3mxfkSb8G190Gx6pdMasnj w9WmmqcN8dd7staYCnOalk90Hdc7CMP2HtKmFfJCGjV/A8w4pF/mOw6O0U04Ys1qu8lxZw 3kYHme2vEeWSuIKzgk1Qu8QGrugB/W0WeXO2vCQYUW+DYC8+UqbyXcZ9tWdZsW9exvr2hv d7snDGlQteU/Lryh/yHp4MHK71IjwMXcM8/ID1umEQNJ29+phiuODvNejVxkDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737150146; a=rsa-sha256; cv=none; b=Vz3Kum4iXRsbNRC05siDJieOSK72IptuiGutGnbVZtPzKBW/xHKibIs1wzvrPrKyuyasEV WMtC7/bshgW55UXFby84GFhIPBBxLyRmM1gYZQrAWZ/QpF1n1oqwXxs0sFgr1EzD101UXN f4t88Rl6QYYRaQA97fr78bYjvY0JpkstGJbrh0NKbdZkZZD2O09VMC5uq4tsNBYqIZLESu gpWRnIFD8jh6Xy9UgwJdb0VwcuR9WzTT3PyE2ebJp8lo0xskerGyEqYpPWFzEwStqE9gUl Rr2oE43dVUT7GGfBLt1KTJ4PncdVFOsPEmSX0iK5AzrXLtrztQ7+rqS+OZ02+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YZY9Z1sl6zcQK; Fri, 17 Jan 2025 21:42:26 +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 50HLgQIA061072; Fri, 17 Jan 2025 21:42:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HLgQ4Y061069; Fri, 17 Jan 2025 21:42:26 GMT (envelope-from git) Date: Fri, 17 Jan 2025 21:42:26 GMT Message-Id: <202501172142.50HLgQ4Y061069@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: 4d15b58365ea - 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: 4d15b58365ea706129bedfdb37e0c5e8661a640f Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4d15b58365ea706129bedfdb37e0c5e8661a640f commit 4d15b58365ea706129bedfdb37e0c5e8661a640f Author: Pat Maddox AuthorDate: 2024-12-15 09:20:24 +0000 Commit: Ed Maste CommitDate: 2025-01-17 21:41:02 +0000 certctl: Set METALOG ownership to root:wheel This sets the correct ownership values when building base.txz This is an updated version of commit 10fa3f2518d4, omitting the `-N ${DESTDIR}${DISTBASE}/etc` from the original commit. 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 --- 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 864302ab1160..458f5c53682f 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}" + 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}