<pre style='margin:0'>
Dan Ports (drkp) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/60351f9bd866d1dabd6834a3984f10922b2ae15c">https://github.com/macports/macports-ports/commit/60351f9bd866d1dabd6834a3984f10922b2ae15c</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 60351f9 osxfuse: update to v3.7.1; disable kext build on Mavericks and later
</span>60351f9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 60351f9bd866d1dabd6834a3984f10922b2ae15c
</span>Author: Dan R. K. Ports <drkp@cs.washington.edu>
AuthorDate: Fri Sep 22 21:03:00 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> osxfuse: update to v3.7.1; disable kext build on Mavericks and later
</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/54781
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/54561
</span>---
fuse/osxfuse/Portfile | 75 +++++++++++-----------
.../patch-build.d_targets_packagemanager.sh.diff | 38 +++++++++++
2 files changed, 77 insertions(+), 36 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/fuse/osxfuse/Portfile b/fuse/osxfuse/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 70d6808..fbb53c5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/fuse/osxfuse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/fuse/osxfuse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name osxfuse
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.6.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.7.1
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories fuse devel
platforms macosx
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,12 +45,12 @@ if {${kernel_arch} ne "x86_64"} {
</span>
distfiles
set mp.dist {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- osxfuse 87d266a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kext be85464
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- framework 77897c1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ osxfuse 431bdc5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kext 0a73539
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ framework e1df643
</span> prefpane 8a65eb2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fuse 035ae21
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- support 8f3a07e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fuse 559738e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ support 19b4e8b
</span> }
depends_build port:autoconf \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,27 +71,27 @@ if { $use_signed_kext } {
</span> distfiles-append ${name}-${version}.dmg
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums osxfuse-87d266a.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ec56f1d8196255ed763e3cccaa0a15feb2ffbf24 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bb0ac23aa09292ba6564ef8836f016ee7c3d4c6fd97d54799edcc834078aa111 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kext-be85464.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 911e4a8a8002cb48d1b5a5a960725b3ebd250237 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1713f3daaec5ef02524a3ef9a431feada9fb1254147510777354b7cbf6f5c111 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- framework-77897c1.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 bdbdb4a67a2ab2a545129b5f7e1228be9bea1927 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3b3063d5dd6ef5a2268db438f9d1d5966dec49bda64ed7622fa64db54fec1baf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums osxfuse-431bdc5.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 71feaf83788bc2d1a862dd603993dab06f18e0e4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4e93768fd8276bf458c237ee298db659e412cff26362ee13a0789000e387f7b5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kext-0a73539.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 8e05632c0e27528845115c51cddcc074b0555720 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 48bf4a9a6befed3a710f3254f5572891e7c5e6b2e637e2ee70a222882864bedf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ framework-e1df643.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6b929ca95d19636a84c3c6805b6bb4afad7af0c1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7a9946a7bd5b29e0c826be267ccdbcce98f8c2946b8aea355ed9257d28c359a9 \
</span> prefpane-8a65eb2.tar.gz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2527eee92d1634b811e6be9aab9b93c42f08d4e7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9227d2e309fcab59fb4ea342b5b72d9e1eee5e1de430e1e45175f0f9f50d1f34 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fuse-035ae21.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 fde4fb9f26d2f32adb88b6176cf8e270eb870a9b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 743a025bebc1b5912f75bea2d651ee5f8d0f5f3cf5450ad08fc644b40f88659b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- support-8f3a07e.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 6cfbecce7f84812472939cfa2d0a1f65eff6f2e1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3cfc6bb52223c7b381dd4a22bafac0786a61997cc974860b3494736728378e18 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- osxfuse-3.6.3.dmg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c0979146b12018969c84295d54031f3406509c55 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 64474821b8b9b663ff728f79fd0e7d361f972dc0ac0ea4e16f7d26cdb1655db2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 cdf12079ce6ed657b11814c5d1aba1f698f210eb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 45510edfbfbc8d430fa06f8bc3f4f1d5db943c84c2e93445fa64224f742d4124 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fuse-559738e.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 97ebdbf37f84035400666f7252c67313700db494 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 32818f955c7179987bee8b4187e23a00763d43e19759190956b92740b673cb94 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ support-19b4e8b.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 26028986b1dac72789be9bf760f40afe00e79a1a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5a606d9f9d3a652d20c4e23efca5638edde0b70c24d0a85ec21fc1ddd0395da9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ osxfuse-3.7.1.dmg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b63fdf2dae4dbe8f95e52b38f2f310fbb7c7164f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0982bca1661d1b8df1c310e828984b25c11dfdc623a79566bfa6283779fad24c
</span>
# extract phase will just extract the dmg; post-extract will expand
# the tarballs
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,6 +120,10 @@ post-extract {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ! $use_signed_kext } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-build.d_targets_packagemanager.sh.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
build.cmd ./build.sh -t packagemanager
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,16 +145,6 @@ destroot.target -a install
</span> destroot.args -v 5 --build-directory="${workpath}"
destroot.destdir -- "${destroot}${prefix}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Move filesystem bundle into place
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set proper permissions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fs-traverse f ${destroot}${prefix}/Library {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes $f -owner root -group wheel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Enable setuid on helper binary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes ${destroot}${prefix}/Library/Filesystems/osxfuse.fs/Contents/Resources/load_osxfuse -permissions 04755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>
# On Mavericks and Yosemite, replace the kext we just built with the
# one from the binary distribution. This works around OS X's
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,6 +162,15 @@ if { $use_signed_kext } {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set proper permissions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse f ${destroot}${prefix}/Library {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file attributes $f -owner root -group wheel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Enable setuid on helper binary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file attributes ${destroot}${prefix}/Library/Filesystems/osxfuse.fs/Contents/Resources/load_osxfuse -permissions 04755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot.violate_mtree yes
notes {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/fuse/osxfuse/files/patch-build.d_targets_packagemanager.sh.diff b/fuse/osxfuse/files/patch-build.d_targets_packagemanager.sh.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9a3c114
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/fuse/osxfuse/files/patch-build.d_targets_packagemanager.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build.d/targets/packagemanager.sh.old 2017-09-22 19:32:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build.d/targets/packagemanager.sh 2017-09-22 19:32:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,11 +120,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Build file system bundle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- build_target_invoke fsbundle build "${default_build_options[@]}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- common_die_on_error "Failed to build file system bundle"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #build_target_invoke fsbundle build "${default_build_options[@]}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #common_die_on_error "Failed to build file system bundle"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- build_target_invoke fsbundle install --debug="${debug_directory}" -- "${stage_directory}/Library/Filesystems"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- common_die_on_error "Failed to install file system bundle"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #build_target_invoke fsbundle install --debug="${debug_directory}" -- "${stage_directory}/Library/Filesystems"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #common_die_on_error "Failed to install file system bundle"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Build library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -152,14 +152,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Locate file system bundle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- local fsbundle_path=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fsbundle_path="`osxfuse_find "${stage_directory}/Library/Filesystems"/*.fs`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- common_die_on_error "Failed to locate file system bundle"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #local fsbundle_path=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #fsbundle_path="`osxfuse_find "${stage_directory}/Library/Filesystems"/*.fs`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #common_die_on_error "Failed to locate file system bundle"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Move debug files into file system bundle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /bin/mv "${debug_directory}" "${fsbundle_path}/Contents/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- common_die_on_error "Failed to move debug files into file system bundle"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #/bin/mv "${debug_directory}" "${fsbundle_path}/Contents/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #common_die_on_error "Failed to move debug files into file system bundle"
</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;'>+ function packagemanager_install
</span></pre><pre style='margin:0'>
</pre>