pkgbase: fix caroot packaging and add post-install script
The original intention for caroot was to be packaged separately, perhaps so that users can have a more/less conservative upgrade policy for this separated from the rest of base. secure/caroot/Makefile doesn't have anything interesting to package, but its subdirectories might. Move the PACKAGE= to Makefile.inc so both blacklisted and trusted get packaged consistently into the correct one rather than the default -utilities. Also tag the directories for package=caroot, as they could also be empty; blacklisted is empty by default, but trusted is not. Add a post-install script to do certctl rehash, along with a note should we eventually come up with a way to detect that files have been added or removed that requires a rehash. -caroot gets a dependency on -utilities, as that's where we provide certctl at the moment. We can perhaps reconsider this and put certctl into this package in the future, but there are some bits within -utilities that unconditionally invoke certctl so let's hold off for now. Reviewed by: manu (earlier version, before -utilities dep added) Differential Revision: https://reviews.freebsd.org/D23352
This commit is contained in:
parent
4be465ab46
commit
fbd46fe94a
@ -201,9 +201,9 @@
|
|||||||
..
|
..
|
||||||
..
|
..
|
||||||
certs
|
certs
|
||||||
blacklisted
|
blacklisted tags=package=caroot
|
||||||
..
|
..
|
||||||
trusted
|
trusted tags=package=caroot
|
||||||
..
|
..
|
||||||
..
|
..
|
||||||
dict
|
dict
|
||||||
|
31
release/packages/caroot.ucl
Normal file
31
release/packages/caroot.ucl
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
#
|
||||||
|
# $FreeBSD$
|
||||||
|
#
|
||||||
|
|
||||||
|
name = "FreeBSD-%PKGNAME%"
|
||||||
|
origin = "base"
|
||||||
|
version = "%VERSION%"
|
||||||
|
comment = "%COMMENT%"
|
||||||
|
categories = [ base ]
|
||||||
|
maintainer = "re@FreeBSD.org"
|
||||||
|
www = "https://www.FreeBSD.org"
|
||||||
|
prefix = "/"
|
||||||
|
licenselogic = "single"
|
||||||
|
licenses = [ BSD2CLAUSE ]
|
||||||
|
desc = <<EOD
|
||||||
|
%DESC%
|
||||||
|
EOD
|
||||||
|
deps: {
|
||||||
|
FreeBSD-%PKGDEPS%: {
|
||||||
|
origin: "base",
|
||||||
|
version: "%VERSION%"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
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 ] && /usr/sbin/certctl rehash
|
||||||
|
EOD
|
||||||
|
}
|
@ -34,6 +34,9 @@ main() {
|
|||||||
outname="$(echo ${outname} | tr '-' '_')"
|
outname="$(echo ${outname} | tr '-' '_')"
|
||||||
|
|
||||||
case "${outname}" in
|
case "${outname}" in
|
||||||
|
caroot)
|
||||||
|
pkgdeps="utilities"
|
||||||
|
;;
|
||||||
runtime)
|
runtime)
|
||||||
outname="runtime"
|
outname="runtime"
|
||||||
uclfile="${uclfile}"
|
uclfile="${uclfile}"
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
PACKAGE= caroot
|
|
||||||
|
|
||||||
CLEANFILES+= certdata.txt
|
CLEANFILES+= certdata.txt
|
||||||
|
|
||||||
SUBDIR+= trusted
|
SUBDIR+= trusted
|
||||||
|
3
secure/caroot/Makefile.inc
Normal file
3
secure/caroot/Makefile.inc
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
# $FreeBSD$
|
||||||
|
|
||||||
|
PACKAGE= caroot
|
Loading…
Reference in New Issue
Block a user