<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/ad2f4ab4f9097a82ebb3ccf7b5ec617488b13cc8">https://github.com/macports/macports-base/commit/ad2f4ab4f9097a82ebb3ccf7b5ec617488b13cc8</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 ad2f4ab4f Makefile: be more cautious changing RUNUSR home dir
</span>ad2f4ab4f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ad2f4ab4f9097a82ebb3ccf7b5ec617488b13cc8
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri May 23 11:57:04 2025 +1000
<span style='display:block; white-space:pre;color:#404040;'> Makefile: be more cautious changing RUNUSR home dir
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Don't update the home dir unless the user otherwise appears to be the
</span><span style='display:block; white-space:pre;color:#404040;'> one that we created. Also warn if it has a login shell set.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/70938
</span>---
Makefile.in | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/Makefile.in b/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index b1846f962..6b127ca49 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,12 @@ ifeq ($(DESTDIR),)
</span> ${DSCL} -q . -create "/Users/${RUNUSR}" UserShell /usr/bin/false ; \
fi ; \
RUNUSR_UID=$$(${DSCL} -q . -read "/Users/${RUNUSR}" UniqueID | /usr/bin/awk '{print $$2}'); \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$$RUNUSR_UID" -gt 500; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RUNUSR_NAME=$$(${DSCL} -q . -read "/Users/${RUNUSR}" RealName | /usr/bin/awk '{print $$2}'); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RUNUSR_SHELL=$$(${DSCL} -q . -read "/Users/${RUNUSR}" UserShell | /usr/bin/awk '{print $$2}'); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$$RUNUSR_SHELL" != "/usr/bin/false"; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Warning: user '${RUNUSR}' appears to be a login user (should be unprivileged)" ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$$RUNUSR_UID" -gt 500 -a "$$RUNUSR_SHELL" = "/usr/bin/false" -a "$$RUNUSR_NAME" = "MacPorts" ; then \
</span> if test "$$(${DSCL} -q . -read "/Users/${RUNUSR}" NFSHomeDirectory)" != "NFSHomeDirectory: ${localstatedir}/macports/home" ; then \
echo "Updating home directory location for user \"${RUNUSR}\"" ; \
${DSCL} -q . -create "/Users/${RUNUSR}" NFSHomeDirectory "${localstatedir}/macports/home" ; \
</pre><pre style='margin:0'>
</pre>