Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F131521070
D23352.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
2 KB
Referenced Files
None
Subscribers
None
D23352.diff
View Options
Index: head/etc/mtree/BSD.usr.dist
===================================================================
--- head/etc/mtree/BSD.usr.dist
+++ head/etc/mtree/BSD.usr.dist
@@ -201,9 +201,9 @@
..
..
certs
- blacklisted
+ blacklisted tags=package=caroot
..
- trusted
+ trusted tags=package=caroot
..
..
dict
Index: head/release/packages/caroot.ucl
===================================================================
--- head/release/packages/caroot.ucl
+++ head/release/packages/caroot.ucl
@@ -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
+}
Index: head/release/packages/generate-ucl.sh
===================================================================
--- head/release/packages/generate-ucl.sh
+++ head/release/packages/generate-ucl.sh
@@ -34,6 +34,9 @@
outname="$(echo ${outname} | tr '-' '_')"
case "${outname}" in
+ caroot)
+ pkgdeps="utilities"
+ ;;
runtime)
outname="runtime"
uclfile="${uclfile}"
Index: head/secure/caroot/Makefile
===================================================================
--- head/secure/caroot/Makefile
+++ head/secure/caroot/Makefile
@@ -1,7 +1,5 @@
# $FreeBSD$
-PACKAGE= caroot
-
CLEANFILES+= certdata.txt
SUBDIR+= trusted
Index: head/secure/caroot/Makefile.inc
===================================================================
--- head/secure/caroot/Makefile.inc
+++ head/secure/caroot/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+PACKAGE= caroot
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Oct 9, 9:41 PM (22 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23507582
Default Alt Text
D23352.diff (2 KB)
Attached To
Mode
D23352: pkgbase: fix caroot packaging and add post-install script
Attached
Detach File
Event Timeline
Log In to Comment