From nobody Fri Jan 17 17:56:49 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 4YZS9F5NPdz5lGLy; Fri, 17 Jan 2025 17:56:49 +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 4YZS9F4p6hz3YT2; Fri, 17 Jan 2025 17:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737136609; 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=yBmZV1LDgSaNAtBSZnoigWxPyOyhK4j7lltpTQnLLFw=; b=UGm+TUMp8ZKfv3/6thhZWSLdXdR35sjd9tDdXxUjKYXEZ+V8o60yB0PXajRU/jAUoXnCk9 k0yeNfMF50J8fEN7xPZa2WP+FaAY4DQg+HV/D0qL+Weg74Plqt1qrj4hhmMQO3vbqQqmla jEQiYFKsl2g5FBTgW19s6pxpLP9pswnWJIZYQOofgujt4FjkGwaIIyiBqJp9nMMWFU+x6C PtwVCmKA+aKkmxF3ShbFgIoh+T1r3a4660RmXmqX2WjWCPU/NlIHd0pYha5TkXq4U6GCpi OoQXuIBvBar75K1dTg3fZMzjCmCbTY8lYaOhVZJhByKGYsIV8/s7Nw2PzNbepA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737136609; 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=yBmZV1LDgSaNAtBSZnoigWxPyOyhK4j7lltpTQnLLFw=; b=X3RGeVdoI8nTrFnUMddkFGVaK3U+g4KXyFQoFAjS7ADNuOImCpuz/NZ2+ooRpTuoDM4nq6 5mJlZKmuE2pemIXB8sVMJEoEdD6g361refChHHreQfxt+gZ2XeZxA7JQi/kBokPR8gZniA Ep/7mkARx5pJ2w4Z97eEXU1+ffNUKEzK/x0ykorVp+uRihw0DWge4D85fyZaoGFRRiFuQX hHJr7VGAKUdf/3NEE7D2+wE6be0KJNnhEMQCMP4k35zeQX1tRCMf8GXVXlw5fNFfsesHpZ XJMX7NXr5gpwT51HgPlsLYZhPwXj6jIFrocFggO9BDbwXPs5Jul5DRf6a6zECQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737136609; a=rsa-sha256; cv=none; b=qiH2xM3nzYnSTDK07G+fs6rpatXsmcdyoTaAZUG3hvTwu0LyJlbkWhvBOR5ZSy2AIfo0RA 5VmKDhzIV4H+GHYJtwf5EixpEbwfgg/dqF6WCa3DgCB8+72vHRKJNoGMDLq5kvfRL958DR HZlvzQr61JFq5NP3KX+mfGTG9MgDkzeGu/9mcXiLoHGE2lJggSgFqQAiumvERsEOHuZV+e khDFKkQHZUrD5WdUhg1LWtKKruwEq5lUdZTOWjO8/LeqqQhrUnR4IENfAkpYysdkqjywE/ diZ92ZDi2+2TdJykAZSRAgWzIrn7JrtW40cMiQbmBmj/4M1co8DIl2y43Ip5jA== 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 4YZS9F4MDMzD0R; Fri, 17 Jan 2025 17:56:49 +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 50HHunCT073412; Fri, 17 Jan 2025 17:56:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HHun74073409; Fri, 17 Jan 2025 17:56:49 GMT (envelope-from git) Date: Fri, 17 Jan 2025 17:56:49 GMT Message-Id: <202501171756.50HHun74073409@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: 98bebc20cef7 - main - Revert "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: 98bebc20cef7527ccb15f8defc9d52e803a0d506 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=98bebc20cef7527ccb15f8defc9d52e803a0d506 commit 98bebc20cef7527ccb15f8defc9d52e803a0d506 Author: Ed Maste AuthorDate: 2025-01-17 17:49:01 +0000 Commit: Ed Maste 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}