From nobody Thu Jul 17 18:15:02 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 4bjh0l1hYfz625BF; Thu, 17 Jul 2025 18:15:03 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bjh0k3XL3z41Q1; Thu, 17 Jul 2025 18:15:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752776102; 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=u++nilIj0EI5vngY3IfM1JrKTZptwd//gmrTbLCYVVE=; b=QSP0lYGoLhj+tUEn8i+1T7u5rynqh60RAcPonIwXP5BT2vI0InzlMeC65s+FeNtj3ZYAB0 wJqh3HJ+l+5ufwZwNdW09YpO2cLrVPxd1PauMR/hpusOQU4wQxOOid1r2midyTZaqWcDnj 8r4+QmkLGqXAkxMRkzxTqZywYuCwMWuCpzpf+Ts8Y/f716iAmzEW3LhM8xCpBjtAqEp6Rc uxVUXiYytVtz55t88SLnqw9/2fDcFQnHj2KY3bXY9REY+ZZs8YisvrTkpFNLK9FQxItdAd E0Nz4NqmuAtPX/l6ciwWFjnH0nbCPkqwwKlFKHIQbqR5CGmZAzRNaG5pZecY4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752776102; 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=u++nilIj0EI5vngY3IfM1JrKTZptwd//gmrTbLCYVVE=; b=qwImXyxKFODtaq6xZheoHpgFer7wL+lQPIk8P6z1OpwmCKyfse0JKOeajpAgXKOv2pdOhD nARH3RbpumQc92F08iwfXjMRDtkAJxQa2yedK84mu5Xv1un3hgCco4Q0514psgVrQ5DBB/ Moe6XlNWTrLq52LZxGUYOiXp2gP9YaLv2+JSVsWTZ9Xd3Mj8JwhsaHRq8b4dgfmUVRDLHH DsdtcRmWNAwIhN2P/sIrqTs3AYSuVTZ6zfzxyj3VDFa+7l7A29TTQn6VcT5ma1TpWykZtt B5Hk1VDN5MAWmRyuI1D+m2STCvaS8TbSownp7BQZ50ktRTmvkS1w29V6/srRCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752776102; a=rsa-sha256; cv=none; b=d2FLQXRzGmi4Eq1Zc2ny95oZyS+eUbSBeUdVF6SGng3oE7sj4P3/MI6WcjWePHHOvOeUSI U7D9/MEs9nqGIGa5nybVjSzHR/8g/+KbheGbF8v88UrDotvfCaOjDsWfytpy4f8ccnJu0+ bYLTELsIsFr5+JMKEFMXyMx9riEqI7m+IlF3/bYuZt5zdrUggqVO6rh0k+j+qruKY6LWwG Y8Ft1gsGHagtzZtHAOB9SGygQ051a1X0pOTTXgYEcJLFUtxTe+9CAivIYxLg6FFzFFIjHc 0j7FXfg+tgmULSPWfXLoSjHimBG6YhPt+YCIVC8OHhsl3LmTCgJ4Y9BjIIIcdw== 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 4bjh0k2ZJwz161s; Thu, 17 Jul 2025 18:15:02 +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 56HIF2dY082159; Thu, 17 Jul 2025 18:15:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56HIF289082155; Thu, 17 Jul 2025 18:15:02 GMT (envelope-from git) Date: Thu, 17 Jul 2025 18:15:02 GMT Message-Id: <202507171815.56HIF289082155@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: c19877b03f8c - main - release: Let caroot depend on certctl, not vice versa. 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c19877b03f8cd210674f0aaca5ec14c5eb00574f Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c19877b03f8cd210674f0aaca5ec14c5eb00574f commit c19877b03f8cd210674f0aaca5ec14c5eb00574f Author: Dag-Erling Smørgrav AuthorDate: 2025-07-17 18:13:38 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-07-17 18:13:56 +0000 release: Let caroot depend on certctl, not vice versa. This makes it possible to remove the caroot package and still have the tool needed to install its replacement (e.g. security/ca_root_nss). Reviewed by: ivy Differential Revision: https://reviews.freebsd.org/D42095 --- release/packages/ucl/caroot.ucl | 10 ++++++++++ release/packages/ucl/certctl.ucl | 15 --------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/release/packages/ucl/caroot.ucl b/release/packages/ucl/caroot.ucl new file mode 100644 index 000000000000..4d2b52d300fc --- /dev/null +++ b/release/packages/ucl/caroot.ucl @@ -0,0 +1,10 @@ +deps { + "certctl": { + version = "${VERSION}" + origin = "base" + } +} +scripts: { + post-install = "/usr/sbin/certctl -D${PKG_ROOTDIR}/ rehash" + post-uninstall = "/usr/sbin/certctl -D${PKG_ROOTDIR}/ rehash" +} diff --git a/release/packages/ucl/certctl.ucl b/release/packages/ucl/certctl.ucl index 300aa55fabda..7f7adec83159 100644 --- a/release/packages/ucl/certctl.ucl +++ b/release/packages/ucl/certctl.ucl @@ -1,21 +1,6 @@ deps { - "caroot": { - version = "${VERSION}" - origin = "base" - } - "openssl": { version = "${VERSION}" origin = "base" } } - -scripts: { - # XXX If pkg picks up a mechanism to detect in the post-install script - # files being added or removed, we should use it instead to gate the - # rehash. - post-install = <