<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/257a975b6effd2210f203a8e222c14df3653804c">https://github.com/macports/macports-ports/commit/257a975b6effd2210f203a8e222c14df3653804c</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 257a975b6ef cloudflared: 2024.11.1, add wrapper script
</span>257a975b6ef is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 257a975b6effd2210f203a8e222c14df3653804c
</span>Author: i0ntempest <i0ntempest@i0ntempest.com>
AuthorDate: Tue Dec 3 16:02:22 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> cloudflared: 2024.11.1, add wrapper script
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> restore config file handling
</span>---
net/cloudflared/Portfile | 38 +++++++++++++++++++++-------
net/cloudflared/files/cloudflared-wrapper.sh | 4 +++
net/cloudflared/files/cloudflared_env.conf | 18 +++++++++++++
net/cloudflared/files/config.yml | 7 -----
4 files changed, 51 insertions(+), 16 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 ddc0873243a..76bc4878921 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;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
PortGroup golang 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-go.setup github.com/cloudflare/cloudflared 2024.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+go.setup github.com/cloudflare/cloudflared 2024.11.1
</span> categories net security
maintainers {i0ntempest @i0ntempest} openmaintainer
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,9 +15,9 @@ long_description Contains the command-line client for Cloudflare Tunnel, a tu
</span> homepage https://developers.cloudflare.com/argo-tunnel
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 93dcac42a776700d0bd4b1a24dbc3727938150c3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 30dfbf9a9e4831ec7f1d1177e1a938b5820b0da62d6be836bb2cfcc7cd362fd2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6992148
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 39322c2a9bcf94e5319b991c280ebc29c7c4c5e2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6d1e7a5286c1ec059d9782711c73cc71f1891076007aaf5f2c3cdcf176881363 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7000598
</span>
go.vendors zombiezen.com/go/capnproto2 \
repo github.com/capnproto/go-capnp \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -577,12 +577,32 @@ destroot {
</span> xinstall -m 0755 ${worksrcpath}/${name} ${destroot}${prefix}/bin/
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set config_path ${prefix}/etc/cloudflared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set env_file cloudflared_env.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set wrapper_script cloudflared-wrapper.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${destroot}${prefix}/libexec/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/${wrapper_script} ${destroot}${prefix}/libexec/${name}/${wrapper_script}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${destroot}${config_path}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/${env_file} ${destroot}${config_path}${env_file}.example
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PREFIX@@|${prefix}|g" ${destroot}${prefix}/libexec/${name}/${wrapper_script}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@CONFIG_PATH@@|${config_path}|g" ${destroot}${prefix}/libexec/${name}/${wrapper_script}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@ENV_FILE@@|${env_file}|g" ${destroot}${prefix}/libexec/${name}/${wrapper_script}
</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;'>+post-activate {
</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:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> startupitem.create yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.executable ${prefix}/bin/cloudflared proxy-dns --port 5053 --upstream https://1.1.1.1/dns-query --upstream https://1.0.0.1/dns-query \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --upstream https://\[2606:4700:4700::1111\]/dns-query --upstream https://\[2606:4700:4700::1001\]/dns-query
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.executable ${prefix}/libexec/${name}/${wrapper_script}
</span>
notes-append "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- The automatically created startup item configures cloudflared as a DNS over HTTPS client using cloudflare DNS,\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- running on port 5053. If you want to use cloudflared for other stuff please create your own launchd script.\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Since version 2022.12.0, due to changes in the software, a sample configuration file is no longer provided.
</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 cloudflared\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as a DNS over HTTPS client using cloudflare DNS, running on port 5053. The startup item\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ will use this config file by default.
</span> "
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/cloudflared/files/cloudflared-wrapper.sh b/net/cloudflared/files/cloudflared-wrapper.sh
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3a474f65d9b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/cloudflared/files/cloudflared-wrapper.sh
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#!/bin/sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+source @@CONFIG_PATH@@/@@ENV_FILE@@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@PREFIX@@/bin/cloudflared proxy-dns $CLOUDFLARED_OPTS
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/cloudflared/files/cloudflared_env.conf b/net/cloudflared/files/cloudflared_env.conf
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fd1d64254ea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/cloudflared/files/cloudflared_env.conf
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Commandline args to configure cloudflared as a DNS over HTTP proxy, using:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Cloudflare DNS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+CLOUDFLARED_OPTS=" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --port 5053 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --upstream https://1.1.1.1/dns-query \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --upstream https://1.0.0.1/dns-query \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --upstream https://[2606:4700:4700::1111]/dns-query \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --upstream https://[2606:4700:4700::1001]/dns-query \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# AliDNS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#CLOUDFLARED_OPTS=" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# --port 5053 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# --upstream https://223.5.5.5/dns-query \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# --upstream https://223.6.6.6/dns-query \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# --upstream https://[2400:3200::1]/dns-query \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# --upstream https://[2400:3200:baba::1]/dns-query \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# "
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/cloudflared/files/config.yml b/net/cloudflared/files/config.yml
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7d41db6803a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/cloudflared/files/config.yml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proxy-dns: true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proxy-dns-port: 5053
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proxy-dns-upstream:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - https://1.1.1.1/dns-query
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - https://1.0.0.1/dns-query
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - https://[2606:4700:4700::1111]/dns-query
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - https://[2606:4700:4700::1001]/dns-query
</span></pre><pre style='margin:0'>
</pre>