The branch main has been updated by des:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c19877b03f8cd210674f0aaca5ec14c5eb00574f
commit c19877b03f8cd210674f0aaca5ec14c5eb00574f
Author: Dag-Erling Smørgrav <d...@freebsd.org>
AuthorDate: 2025-07-17 18:13:38 +0000
Commit: Dag-Erling Smørgrav <d...@freebsd.org>
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 = <<EOD
- [ -x /usr/sbin/certctl ] && env DESTDIR=${PKG_ROOTDIR} \
- /usr/sbin/certctl rehash
-EOD
-}
