<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/cd992816c8fa468654a74193aab83cd43aaaceeb">https://github.com/macports/macports-base/commit/cd992816c8fa468654a74193aab83cd43aaaceeb</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new cd992816c Work around mtree quirk
</span>cd992816c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cd992816c8fa468654a74193aab83cd43aaaceeb
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Dec 7 20:51:55 2023 +1100
<span style='display:block; white-space:pre;color:#404040;'> Work around mtree quirk
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Turns out mtree -U won't complain but also won't actually create any
</span><span style='display:block; white-space:pre;color:#404040;'> directories if not all of uname, gname, and mode are specified, even
</span><span style='display:block; white-space:pre;color:#404040;'> when it can't enforce the ownership. But it's happy if you give it any
</span><span style='display:block; white-space:pre;color:#404040;'> gname.
</span>---
configure | 11 ++++++++---
configure.ac | 11 ++++++++---
doc/base.mtree.in | 2 +-
doc/prefix.mtree.in | 2 +-
4 files changed, 18 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;color:#808080;'>index 51faa2712..6a3b21e65 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/configure
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/configure
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -703,7 +703,7 @@ UNIVERSAL_ARCHS
</span> startupitem_install
MPFRAMEWORKSDIR
MPAPPLICATIONSDIR
<span style='display:block; white-space:pre;background:#ffe0e0;'>-MTREE_UGNAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MTREE_GNAME
</span> DSTMODE
RUNUSR
DSTGRP
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7014,10 +7014,15 @@ printf "%s\n" "$DSTMODE" >&6; }
</span> fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Don't set uname or gname in .mtree files unless root
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Don't set real uname or gname in .mtree files unless root
</span> # https://trac.macports.org/ticket/49501
if test "$DSTUSR" = "root" ; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>- MTREE_UGNAME="uname=root gname=$DSTGRP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MTREE_GNAME="$DSTGRP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This has to be set to something or mtree won't create any directories.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # It doesn't matter what it's set to for non-root though, as it can't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # change the ownership anyway.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MTREE_GNAME="admin"
</span> fi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;color:#808080;'>index ad12f7240..02144a8ea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/configure.ac
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -227,12 +227,17 @@ MP_CHECK_RUNUSER
</span> MP_DIRECTORY_MODE
MP_SHARED_DIRECTORY
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Don't set uname or gname in .mtree files unless root
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Don't set real uname or gname in .mtree files unless root
</span> # https://trac.macports.org/ticket/49501
if test "$DSTUSR" = "root" ; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>- MTREE_UGNAME="uname=root gname=$DSTGRP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MTREE_GNAME="$DSTGRP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This has to be set to something or mtree won't create any directories.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # It doesn't matter what it's set to for non-root though, as it can't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # change the ownership anyway.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MTREE_GNAME="admin"
</span> fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-AC_SUBST(MTREE_UGNAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+AC_SUBST(MTREE_GNAME)
</span>
# Check for default directories
MP_PATH_APPLICATIONS
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/base.mtree.in b/doc/base.mtree.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 08b9ee2f5..4ea754452 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/base.mtree.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/base.mtree.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> # MacPorts filesystem hierarchy, for internal use only. Changes to this file will not stick across installations.
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/set type=dir @MTREE_UGNAME@ mode=@DSTMODE@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/set type=dir uname=root gname=@MTREE_GNAME@ mode=@DSTMODE@
</span> .
man type=link link=share/man
..
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/prefix.mtree.in b/doc/prefix.mtree.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 56aa7fe13..c30d0bbaf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/prefix.mtree.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/prefix.mtree.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> # MacPorts filesystem hierarchy, for internal use only. Changes to this file will not stick across installations.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/set type=dir @MTREE_UGNAME@ mode=@DSTMODE@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/set type=dir uname=root gname=@MTREE_GNAME@ mode=@DSTMODE@
</span> .
bin
..
</pre><pre style='margin:0'>
</pre>