git: 637fa8441f0c - stable/14 - packages: fix ownership of /tmp and /dev

[Lexi Winter]

The branch stable/14 has been updated by ivy:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=637fa8441f0c8712b64f7ad95d072fcef5435c11

commit 637fa8441f0c8712b64f7ad95d072fcef5435c11
Author:     Lexi Winter <i...@freebsd.org>
AuthorDate: 2025-06-04 05:38:48 +0000
Commit:     Lexi Winter <i...@freebsd.org>
CommitDate: 2025-08-23 00:10:15 +0000

    packages: fix ownership of /tmp and /dev
    
    release/packages/runtime.ucl manually adds "/tmp" and "/dev" to the
    "directories" key, which causes them to be included in the manifest
    with the user/group owner of whoever built the package repository:
    
    drwxr-xr-x   7 ivy wheel 512 Jun  1 17:24 /dev
    drwxrwxrwt  10 ivy wheel  10 Jun  1 17:42 /tmp
    
    Remove the manual entries and instead put an explicit package tag
    in etc/mtree/BSD.root.dist.  This also means /tmp gets the right
    mode by default and we can remove the chmod from the post-install
    script.
    
    PR:     288746
    Reviewed by:    manu, kevans, emaste
    Approved by:    kevans (mentor)
    Differential Revision:  https://reviews.freebsd.org/D50636
    
    (cherry picked from commit 6b2993e74ebaacd46bd1e438787c23450cd2752d)
---
 etc/mtree/BSD.root.dist      | 4 ++--
 release/packages/runtime.ucl | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index a85ce552589c..33d9b2ffc47c 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -34,7 +34,7 @@
         zfs
         ..
     ..
-    dev             mode=0555
+    dev             mode=0555 tags=package=runtime
     ..
     etc
         X11
@@ -132,7 +132,7 @@
     ..
     sbin
     ..
-    tmp             mode=01777
+    tmp             mode=01777 tags=package=runtime
     ..
     usr
     ..
diff --git a/release/packages/runtime.ucl b/release/packages/runtime.ucl
index 8a337c038fdd..b04bc32f33cc 100644
--- a/release/packages/runtime.ucl
+++ b/release/packages/runtime.ucl
@@ -3,10 +3,5 @@ scripts: {
     post-install = <<EOD
     pwd_mkdb -i -p -d  ${PKG_ROOTDIR}/etc ${PKG_ROOTDIR}/etc/master.passwd
     services_mkdb ${CAP_MKDB_ENDIAN} -q -o ${PKG_ROOTDIR}/var/db/services.db 
${PKG_ROOTDIR}/
-    chmod 1777 ${PKG_ROOTDIR}/tmp
 EOD
 }
-directories: {
-    /dev = "y";
-    /tmp = "y";
-}