<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3724901ee99633d6fa06575d1c068288b4f364e6">https://github.com/macports/macports-ports/commit/3724901ee99633d6fa06575d1c068288b4f364e6</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 3724901ee99 istioctl: fix build by patching init.sh
</span>3724901ee99 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3724901ee99633d6fa06575d1c068288b4f364e6
</span>Author: Andy Hall <andy@ajhall.us>
AuthorDate: Sat Sep 10 23:19:44 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> istioctl: fix build by patching init.sh
</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/65805
</span><span style='display:block; white-space:pre;color:#404040;'> Upstream issue: https://github.com/istio/istio/issues/40890
</span><span style='display:block; white-space:pre;color:#404040;'> Upstream PR: https://github.com/istio/istio/pull/40912
</span>---
sysutils/istioctl/Portfile | 3 +++
sysutils/istioctl/files/patch-init-script.diff | 37 ++++++++++++++++++++++++++
2 files changed, 40 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/istioctl/Portfile b/sysutils/istioctl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4076f6401d0..d67333c29e1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/istioctl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/istioctl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span> PortGroup golang 1.0
name istioctl
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
go.setup github.com/istio/istio 1.15.0
categories sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,6 +33,8 @@ checksums rmd160 0f2cc3563d0b1215478f7038230d190295b63868 \
</span> sha256 7ff4877c0f2553e9a07255c8eab0cea7e2adeb4b038cd38066676eac82ac5293 \
size 4851486
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-init-script.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.cmd make
build.target ${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/istioctl/files/patch-init-script.diff b/sysutils/istioctl/files/patch-init-script.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..389c5a307aa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/istioctl/files/patch-init-script.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/istio/istio/pull/40912
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove an unnecessary reference to a URL that no longer works.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bin/init.sh.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bin/init.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,14 +65,8 @@ ISTIO_ENVOY_LINUX_RELEASE_PATH="${ISTIO_ENVOY_LINUX_RELEASE_PATH:-${ISTIO_ENVOY_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ISTIO_ENVOY_CENTOS_LINUX_RELEASE_NAME="${ISTIO_ENVOY_CENTOS_LINUX_RELEASE_NAME:-envoy-centos-${ISTIO_ENVOY_LINUX_VERSION}}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ISTIO_ENVOY_CENTOS_LINUX_RELEASE_PATH="${ISTIO_ENVOY_CENTOS_LINUX_RELEASE_PATH:-${ISTIO_ENVOY_LINUX_RELEASE_DIR}/${ISTIO_ENVOY_CENTOS_LINUX_RELEASE_NAME}}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Envoy macOS vars.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# TODO Change url when official envoy release for macOS is available
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ISTIO_ENVOY_MACOS_VERSION="${ISTIO_ENVOY_MACOS_VERSION:-1.0.2}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ISTIO_ENVOY_MACOS_RELEASE_URL="${ISTIO_ENVOY_MACOS_RELEASE_URL:-https://github.com/istio/proxy/releases/download/${ISTIO_ENVOY_MACOS_VERSION}/istio-proxy-${ISTIO_ENVOY_MACOS_VERSION}-macos.tar.gz}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Variables for the extracted debug/release Envoy artifacts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ISTIO_ENVOY_MACOS_RELEASE_DIR="${ISTIO_ENVOY_MACOS_RELEASE_DIR:-${TARGET_OUT}/release}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ISTIO_ENVOY_MACOS_RELEASE_NAME="${ISTIO_ENVOY_MACOS_RELEASE_NAME:-envoy-${ISTIO_ENVOY_MACOS_VERSION}}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ISTIO_ENVOY_MACOS_RELEASE_PATH="${ISTIO_ENVOY_MACOS_RELEASE_PATH:-${ISTIO_ENVOY_MACOS_RELEASE_DIR}/${ISTIO_ENVOY_MACOS_RELEASE_NAME}}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# There is no longer an Istio built Envoy binary available for the Mac. Copy the Linux binary as the Mac binary was
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# very old and likely no one was really using it (at least temporarily).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Download Envoy debug and release binaries for Linux x86_64. They will be included in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # docker images created by Dockerfile.proxyv2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -173,14 +167,7 @@ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Download and extract the Envoy linux release binary.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ download_envoy_if_necessary "${ISTIO_ENVOY_LINUX_RELEASE_URL}" "$ISTIO_ENVOY_LINUX_RELEASE_PATH" "${SIDECAR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ download_envoy_if_necessary "${ISTIO_ENVOY_CENTOS_RELEASE_URL}" "$ISTIO_ENVOY_CENTOS_LINUX_RELEASE_PATH" "${SIDECAR}-centos"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [[ "$GOOS_LOCAL" == "darwin" ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Download and extract the Envoy macOS release binary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- download_envoy_if_necessary "${ISTIO_ENVOY_MACOS_RELEASE_URL}" "$ISTIO_ENVOY_MACOS_RELEASE_PATH" "${SIDECAR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ISTIO_ENVOY_NATIVE_PATH=${ISTIO_ENVOY_MACOS_RELEASE_PATH}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ISTIO_ENVOY_NATIVE_PATH=${ISTIO_ENVOY_LINUX_RELEASE_PATH}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ISTIO_ENVOY_NATIVE_PATH=${ISTIO_ENVOY_LINUX_RELEASE_PATH}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Download WebAssembly plugin files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WASM_RELEASE_DIR=${ISTIO_ENVOY_LINUX_RELEASE_DIR}
</span></pre><pre style='margin:0'>
</pre>