<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fa716cb767302cdaa6bba6ee6e462ceaf143629d">https://github.com/macports/macports-ports/commit/fa716cb767302cdaa6bba6ee6e462ceaf143629d</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 fa716cb7673 gocryptfs: update to 2.5.4, refactor
</span>fa716cb7673 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fa716cb767302cdaa6bba6ee6e462ceaf143629d
</span>Author: i0ntempest <i0ntempest@i0ntempest.com>
AuthorDate: Thu May 15 00:50:07 2025 +1000
<span style='display:block; white-space:pre;color:#404040;'> gocryptfs: update to 2.5.4, refactor
</span>---
fuse/gocryptfs/Portfile | 146 +++++++++++++++++++++++++++---------------------
1 file changed, 81 insertions(+), 65 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/fuse/gocryptfs/Portfile b/fuse/gocryptfs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 25d0472d497..2c7a6617cfe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/fuse/gocryptfs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/fuse/gocryptfs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,13 +4,11 @@ PortSystem 1.0
</span> PortGroup golang 1.0
PortGroup fuse 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-go.setup github.com/rfjakob/gocryptfs 2.3.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Delete this on next update to use golang PortGroup's default ('archive')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.tarball_from tarball
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+go.setup github.com/rfjakob/gocryptfs 2.5.4 v
</span> revision 0
categories fuse
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {i0ntempest @i0ntempest} openmaintainer
</span> license MIT
platforms darwin
description Encrypted overlay filesystem written in Go
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,36 +16,36 @@ long_description {*}${description}
</span> homepage https://nuetzlich.net/gocryptfs/
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 b3ae8b01ad4219bc027378f6475b7f417a2c9647 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0e440c66abe923792d11e9890fc893096f54a32347776589b25f9edb9e3eb8c2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1371916
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 2a0ba82fb109678bbaa82cc158f23b9ccd73f539 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bbdfb574ad08faed19b724022bc167b00236967c742b23c25f95f8c31837342c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1383575
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set gitversionfuse "915cf5413cde"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set gitversionfuse "v2.5.0"
</span> go.vendors gopkg.in/yaml.v3 \
lock 9f266ea9e77c \
rmd160 06dca2ede07b2f31c515b4711fbebc1d5359b5e4 \
sha256 e70dd42fb30b7b2d0129c5cdf0e079caaf5602cab24081fdac830ec01204fa59 \
size 86890 \
golang.org/x/term \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lock a9ba230a4035 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2011606ab7a7f34f3deffe211d32ef2c89ebb195 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3f372803b6ee7e65988d483eaf3696ec479b2cc3e42873e8d8e147c9600e40e2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14845 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lock v0.29.0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 8897b8f4c7a32f6801b376eab03bc4d98970bb45 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 584aae20390fd14d70c64dfa2c4a35ee53b53526fd2175f02177cd391d8733ef \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14690 \
</span> golang.org/x/sys \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lock bc2c85ada10a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c4b2c26618cd3f02fe04653b3a4fbe6707de5716 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b2526b52942c803a1687e16f87942bd0f0701b5d260fbaa35d53231e0a520577 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1303117 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lock v0.30.0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 4cd711df5da2e159b6efbb7fa42ae0a3a3f6eb53 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 76cfe40018bfa5418c1d19d47d8353c3375594013e2b2feea49f06018d2a3102 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1523466 \
</span> golang.org/x/net \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lock 1185a9018129 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 06766c092ba6050f64d884ea7319c7ba9225891d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 157ec6672ba40db471b1e5c4b9d08c9637388bafd475c93e3acf50b6bf2d2208 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1228139 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lock v0.21.0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 f75340f16f42b617230110603e41bd586cdef8fe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8fed668d8604e2b59b5cf00ebc327f710e1af177eab7a73d9ddc68992cd9bea9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1487222 \
</span> golang.org/x/crypto \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lock 32db794688a5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 02ab581de5510ce94205e0fe5a58aacd2cd375b8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2276178323ee1992d2e845e78ffb8fdce625ef24602b97719428fddaf9f2192f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1732601 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lock v0.33.0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a9bb37694af13af0618980c934387320bab1234a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e8755fe2f1785cb6047c52b28f48b4565f8d6ca32be675cb36b330b6a33d1ba9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1840770 \
</span> github.com/stretchr/testify \
lock v1.6.1 \
rmd160 7e5b798212a8f15cd58a63985ae0b928eede8e6b \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,10 +57,10 @@ go.vendors gopkg.in/yaml.v3 \
</span> sha256 7f41acdcba65b1fab5b9b633947a139f9915b60f94bdab486cdbe9d90c54f61e \
size 50815 \
github.com/sabhiram/go-gitignore \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lock 54b8a0bf510f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a857fc463477e6b9f836e792a96a4685ae2e143f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8da1f8a688c9217bad55da1738e9178017f5a9bb1e5ca2210b158f73d010219e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8081 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lock 525f6e181f06 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 dedbb7e6dcd1cf8dd5f625090fa8c6b4af8430d6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1966d81c0496a29d36e15731d3290bbc71be1b8ca3745a58b364d8a18972b153 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8886 \
</span> github.com/rfjakob/eme \
lock v1.1.2 \
rmd160 27b6194560dbcdfdad845bbad4d1ed456486f8e4 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,10 +72,15 @@ go.vendors gopkg.in/yaml.v3 \
</span> sha256 7cd492737641847266115f3060489a67f63581e521a8ec51efbc280c33fc991f \
size 11409 \
github.com/pkg/xattr \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lock v0.4.3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 fdba0ff090e7ef820728334392fb5667fcdefcc5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e1623ed7d3f052c532f0f97fcbbc43ae7371a4016c182e591fff37b6f2df9c82 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9445 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lock v0.4.9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 9a3c128c3a1f66f0086c7e0991830cfec5c6407c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 58d70e46c81345035cbf3df6d6bb4a59c43c9a4c68c248801f701be5a1d79bce \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9642 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.com/moby/sys/mountinfo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lock v0.6.2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 2e73489ef5df0c80857f2e854f212400c63a7da2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 61d9765f556a9242bf6c7574cc1191555b1e15fbabb433e329939db4be2b5309 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 59483 \
</span> github.com/kylelemons/godebug \
lock d65d576e9348 \
rmd160 929cd615eff16a0c5ba2145b809b10016587a387 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,26 +108,39 @@ go.vendors gopkg.in/yaml.v3 \
</span> size 43827 \
github.com/hanwen/go-fuse \
lock ${gitversionfuse} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 02f4d3a41fe763097ac9f1b88f8b0cdad1ae4c4b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d466c51b50238497708f40214587a06ee539f868c7c20833128b1f92d577abd9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 187382 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a8fbef71692c8d95a14ade1592b3d618615f279c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ab934cda6d2c4413857a285e4b00bcb69bbcee6a9d458bc2e5763d14e0fc770a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 198796 \
</span> github.com/davecgh/go-spew \
lock v1.1.0 \
rmd160 0303eae19a01f38fe314921fd965e4d09b9ef3ad \
sha256 810a597004388d68bb92d8aa612375419ba1080dd5fc2c66dd41b58f0ba4442c \
size 42348 \
github.com/aperturerobotics/jacobsa-crypto \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lock v1.0.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 6d34d0b1b4779666f969c1df6cb8934ed6468e6b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f75a386f00a96aaf95975036513c3b837a601a66eb631e2d159c7f9322f33f60 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3654688
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lock v1.0.2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b63c554b9cc30fae17a120fcb145d453893f1c8d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 64203a607c71eb2fe8751a4ecbd6521c01a7b2f0c00bee27f5fd8d01408d8b3d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3656426
</span>
# Build date should not be set to a variable value as this would prevent reproducible builds.
# Not setting it results in defaulting to '0000-00-00' when using the --version flag.
set builddate "build_date_not_set"
set ldflags "-X \"main.GitVersion=${version}\" -X \"main.GitVersionFuse=${gitversionfuse}\" -X \"main.BuildDate=${builddate}\""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args -ldflags="${ldflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CGO_ENABLED=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append -ldflags="${ldflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -tags without_openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/${name}-xray "${build.env} ${build.cmd} [join ${build.args}]"
</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;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${worksrcpath}/${name} ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${worksrcpath}/${name}-xray/${name}-xray ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${worksrcpath}/Documentation/gocryptfs.1 ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${worksrcpath}/Documentation/gocryptfs-xray.1 ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# According to [1] there is no benefit to build gocryptfs with openssl on M1 Macs.
# According to [2] on most modern CPUs openssl provides no speed benefits. I confirmed this by tests on
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,41 +148,41 @@ build.args -ldflags="${ldflags}"
</span> # [1]: https://github.com/rfjakob/gocryptfs/issues/556#issuecomment-848185514
# [2]: https://github.com/rfjakob/gocryptfs/wiki/CPU-Benchmarks
variant openssl description {Build with openssl support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libcrypto.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_PATH=[openssl::pkgconfig_dir]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGO_ENABLED=0 CGO_ENABLED=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -tags without_openssl
</span> }
variant doc description {Build man pages} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:go-md2man
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/Documentation "${prefix}/bin/go-md2man -in=MANPAGE.md -out=${name}.1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/Documentation "${prefix}/bin/go-md2man -in=MANPAGE-XRAY.md -out=${name}-xray.1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/Documentation "${prefix}/bin/go-md2man -in=MANPAGE-STATFS.md -out=statfs.1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pandoc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/Documentation "sh MANPAGE-render.bash"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pandoc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/Documentation "sh MANPAGE-render.bash"
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant fs_link description "Link ${name} to a .fs bundle in /Library/Filesystems" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dir /Library/Filesystems/${name}.fs/Contents/Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/bin/${name} ${destroot}${dir}/mount_${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset openssl]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env CGO_ENABLED=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append -tags without_openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.violate_mtree \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${worksrcpath}/${name} ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${worksrcpath}/Documentation/gocryptfs.1 ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${worksrcpath}/Documentation/gocryptfs-xray.1 ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${worksrcpath}/Documentation/statfs.1 ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ With +fs_link, you may use \'mount -t ${name}\' and use ${name} in /etc/fstab.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Exclude pre-release versions.
github.livecheck.regex \
{([0-9.]+)}
</pre><pre style='margin:0'>
</pre>