<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/61c2f8dea57ae8492f2cc5f632cbfa2957f6e0b3">https://github.com/macports/macports-ports/commit/61c2f8dea57ae8492f2cc5f632cbfa2957f6e0b3</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 61c2f8d afsctool: support compression on macOS 10.12
</span>61c2f8d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 61c2f8dea57ae8492f2cc5f632cbfa2957f6e0b3
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Mon Nov 14 20:52:22 2016 +0100
<span style='display:block; white-space:pre;color:#404040;'> afsctool: support compression on macOS 10.12
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The undocumented f_type returned by statfs(2) for HFS+ filesystems has
</span><span style='display:block; white-space:pre;color:#404040;'> changed to 23 in macOS 10.12 Sierra. Without a source release of XNU on
</span><span style='display:block; white-space:pre;color:#404040;'> opensource.apple.com, I have to guess this is the intended change.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Unconditionally applying the patch as the change will still work with
</span><span style='display:block; white-space:pre;color:#404040;'> older releases where f_type is 17 and it is unlikely 23 would refer to
</span><span style='display:block; white-space:pre;color:#404040;'> anything else.
</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/52463
</span>---
sysutils/afsctool/Portfile | 4 +++-
sysutils/afsctool/files/patch-sierra.diff | 18 ++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/afsctool/Portfile b/sysutils/afsctool/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cf94156..7bdfa29 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/afsctool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/afsctool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortSystem 1.0
</span> name afsctool
version 1.6.4
set distversion 34
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories sysutils
platforms macosx
license GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,6 +35,8 @@ pre-fetch {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-sierra.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
universal_variant yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/afsctool/files/patch-sierra.diff b/sysutils/afsctool/files/patch-sierra.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a994b1a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/afsctool/files/patch-sierra.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Inappropriate; no canonical upstream exists,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ but this is based on https://github.com/jrk/afsctool/pull/3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- afsctool.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ afsctool.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -131,9 +131,10 @@ void compressFile(const char *inFile, struct stat *inFileInfo, long long int max
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (statfs(inFile, &fsInfo) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (fsInfo.f_type != 17)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (fsInfo.f_type != 17 && fsInfo.f_type != 23) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(stderr, "%s: f_type is %d, but expected 17 or 23\n", fsInfo.f_type);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!S_ISREG(inFileInfo->st_mode))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((inFileInfo->st_flags & UF_COMPRESSED) != 0)
</span></pre><pre style='margin:0'>
</pre>