<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.6
in repository macports-base.

</pre>
<p><a href="https://github.com/macports/macports-base/commit/49377e5044107cf74bc7e07a0bd1fae3f666c0db">https://github.com/macports/macports-base/commit/49377e5044107cf74bc7e07a0bd1fae3f666c0db</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 49377e5044107cf74bc7e07a0bd1fae3f666c0db
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Jul 15 17:48:51 2020 +1000

<span style='display:block; white-space:pre;color:#404040;'>    Disable hfscompression for non-root installs (again)
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/60230
</span><span style='display:block; white-space:pre;color:#404040;'>    (cherry picked from commit 9d0ebd5b5b1a7fd0f3a05be85bf0e7267c63b70a)
</span>---
 src/registry2.0/portimage.tcl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/portimage.tcl b/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a4548db..fdb2d3b8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -353,7 +353,10 @@ proc extract_archive_to_tmpdir {location} {
</span>                 global macports::hfscompression
                 # Opportunistic HFS compression. bsdtar will automatically
                 # disable this if filesystem does not support compression.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                if {${macports::hfscompression} &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                # Don't use if not running as root, due to bugs:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                # The system bsdtar on 10.15 suffers from https://github.com/libarchive/libarchive/issues/497
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                # Later versions fixed that problem but another remains: https://github.com/libarchive/libarchive/issues/1415 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                if {${macports::hfscompression} && [getuid] == 0 &&
</span>                         ![catch {macports::binaryInPath bsdtar}] &&
                         ![catch {exec bsdtar -x --hfsCompression < /dev/null >& /dev/null}]} {
                     ui_debug "Using bsdtar with HFS+ compression (if valid)"
</pre><pre style='margin:0'>

</pre>