<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/10bea2d50c4125bbc704ca43a993d3e1cebc9992">https://github.com/macports/macports-ports/commit/10bea2d50c4125bbc704ca43a993d3e1cebc9992</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 10bea2d50c4 cloudflared: fix config path
</span>10bea2d50c4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 10bea2d50c4125bbc704ca43a993d3e1cebc9992
</span>Author: i0ntempest <i0ntempest@i0ntempest.com>
AuthorDate: Fri May 30 23:26:54 2025 +1000
<span style='display:block; white-space:pre;color:#404040;'> cloudflared: fix config path
</span>---
net/cloudflared/Portfile | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/cloudflared/Portfile b/net/cloudflared/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cf2350787d5..f25f80ad7d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/cloudflared/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/cloudflared/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span> PortGroup golang 1.0
go.setup github.com/cloudflare/cloudflared 2025.5.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories net security
maintainers {i0ntempest @i0ntempest} openmaintainer
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -566,7 +567,7 @@ go.vendors zombiezen.com/go/capnproto2 \
</span> # See https://trac.macports.org/ticket/61192#comment:34
set time [clock format [clock seconds] -format "%Y-%m-%d-%H%M %Z"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append -ldflags=\"-X 'main.Version=${version}' -X 'main.BuildTime=${time}'\" -o ./cloudflared ./cmd/cloudflared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append -ldflags=\"-X 'main.Version=${version}' -X 'main.BuildTime=${time}'\" -o ./${name} ./cmd/${name}
</span>
post-patch {
reinplace "s|\"/etc/cloudflared\", DefaultUnixConfigLocation|\"/etc/cloudflared\", \"${prefix}/etc/cloudflared\", DefaultUnixConfigLocation|" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -577,23 +578,23 @@ destroot {
</span> xinstall -m 0755 ${worksrcpath}/${name} ${destroot}${prefix}/bin/
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set config_path ${prefix}/etc/cloudflared
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set env_file cloudflared_env.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set wrapper_script cloudflared-wrapper.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set config_path ${prefix}/etc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set env_file ${name}_env.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set wrapper_script ${name}-wrapper.sh
</span>
post-destroot {
file mkdir ${destroot}${prefix}/libexec/${name}
copy ${filespath}/${wrapper_script} ${destroot}${prefix}/libexec/${name}/${wrapper_script}
file mkdir ${destroot}${config_path}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${filespath}/${env_file} ${destroot}${config_path}${env_file}.example
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/${env_file} ${destroot}${config_path}/${env_file}.example
</span> reinplace "s|@@PREFIX@@|${prefix}|g" ${destroot}${prefix}/libexec/${name}/${wrapper_script}
reinplace "s|@@CONFIG_PATH@@|${config_path}|g" ${destroot}${prefix}/libexec/${name}/${wrapper_script}
reinplace "s|@@ENV_FILE@@|${env_file}|g" ${destroot}${prefix}/libexec/${name}/${wrapper_script}
}
post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${config_path}${env_file}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${config_path}${env_file}.example ${config_path}${env_file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${config_path}/${env_file}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${config_path}/${env_file}.example ${config_path}/${env_file}
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -601,8 +602,8 @@ startupitem.create yes
</span> startupitem.executable ${prefix}/libexec/${name}/${wrapper_script}
notes-append "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- The example config file is copied to ${config_path}${env_file} and its content\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- will be preserved across upgrades and reinstalls. This config file configures cloudflared\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The example config file is copied to ${config_path}/${env_file} and its content\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ will be preserved across upgrades and reinstalls. This config file configures ${name}\
</span> as a DNS over HTTPS client using cloudflare DNS, running on port 5053. The startup item\
will use this config file by default.
"
</pre><pre style='margin:0'>
</pre>