From ce8865c0afb8fec8bd9a502fa8c58c63d1bd1feb Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt@mmmccormick.com>
Date: Fri, 6 Jun 2025 15:33:29 -0400
Subject: [PATCH 1/2] linux-arm: use https for musl.cc downloads

---
 linux-arm64-musl/Dockerfile.in  | 2 +-
 linux-armv6-musl/Dockerfile.in  | 2 +-
 linux-armv7l-musl/Dockerfile.in | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux-arm64-musl/Dockerfile.in b/linux-arm64-musl/Dockerfile.in
index 14b3752..59832a7 100644
--- a/linux-arm64-musl/Dockerfile.in
+++ b/linux-arm64-musl/Dockerfile.in
@@ -6,7 +6,7 @@ ENV CROSS_TRIPLE=aarch64-linux-musl
 ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}-cross
 
 RUN mkdir -p ${XCC_PREFIX}
-RUN curl --max-time 15 --retry 5 -LO http://musl.cc/${CROSS_TRIPLE}-cross.tgz
+RUN curl --max-time 15 --retry 5 -LO https://musl.cc/${CROSS_TRIPLE}-cross.tgz
 RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross.tgz
 
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
diff --git a/linux-armv6-musl/Dockerfile.in b/linux-armv6-musl/Dockerfile.in
index 28babd3..be72391 100644
--- a/linux-armv6-musl/Dockerfile.in
+++ b/linux-armv6-musl/Dockerfile.in
@@ -6,7 +6,7 @@ ENV CROSS_TRIPLE=armv6-linux-musleabihf
 ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}-cross
 
 RUN mkdir -p ${XCC_PREFIX}
-RUN curl --max-time 15 --retry 5 -LO http://musl.cc/${CROSS_TRIPLE}-cross.tgz
+RUN curl --max-time 15 --retry 5 -LO https://musl.cc/${CROSS_TRIPLE}-cross.tgz
 RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross.tgz
 
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
diff --git a/linux-armv7l-musl/Dockerfile.in b/linux-armv7l-musl/Dockerfile.in
index 0ffc6dc..fd9338c 100644
--- a/linux-armv7l-musl/Dockerfile.in
+++ b/linux-armv7l-musl/Dockerfile.in
@@ -6,7 +6,7 @@ ENV CROSS_TRIPLE=armv7l-linux-musleabihf
 ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}-cross
 
 RUN mkdir -p ${XCC_PREFIX}
-RUN curl --max-time 15 --retry 5 -LO http://musl.cc/${CROSS_TRIPLE}-cross.tgz
+RUN curl --max-time 15 --retry 5 -LO https://musl.cc/${CROSS_TRIPLE}-cross.tgz
 RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross.tgz
 
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \

From 1bebfd73002e9ba5a2a7eca57dd71ac145b8658e Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt@mmmccormick.com>
Date: Sat, 7 Jun 2025 14:25:16 -0400
Subject: [PATCH 2/2] linux-arm-musl: use mirror of musl.cc sources for
 reliability

---
 linux-arm64-musl/Dockerfile.in  | 7 +++++--
 linux-armv6-musl/Dockerfile.in  | 7 +++++--
 linux-armv7l-musl/Dockerfile.in | 7 +++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/linux-arm64-musl/Dockerfile.in b/linux-arm64-musl/Dockerfile.in
index 59832a7..bb55437 100644
--- a/linux-arm64-musl/Dockerfile.in
+++ b/linux-arm64-musl/Dockerfile.in
@@ -6,8 +6,11 @@ ENV CROSS_TRIPLE=aarch64-linux-musl
 ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}-cross
 
 RUN mkdir -p ${XCC_PREFIX}
-RUN curl --max-time 15 --retry 5 -LO https://musl.cc/${CROSS_TRIPLE}-cross.tgz
-RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross.tgz
+# RUN curl --max-time 15 --retry 5 -LO https://musl.cc/${CROSS_TRIPLE}-cross.tgz
+# RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross.tgz
+# Mirrored for reliability.
+RUN curl --max-time 15 --retry 5 -LO https://github.com/dockcross/dockcross/releases/download/toolchain-sources/${CROSS_TRIPLE}-cross-retrieved-2025-06-07.tgz
+RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross-retrieved-2025-06-07.tgz
 
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
     AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
diff --git a/linux-armv6-musl/Dockerfile.in b/linux-armv6-musl/Dockerfile.in
index be72391..80681b6 100644
--- a/linux-armv6-musl/Dockerfile.in
+++ b/linux-armv6-musl/Dockerfile.in
@@ -6,8 +6,11 @@ ENV CROSS_TRIPLE=armv6-linux-musleabihf
 ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}-cross
 
 RUN mkdir -p ${XCC_PREFIX}
-RUN curl --max-time 15 --retry 5 -LO https://musl.cc/${CROSS_TRIPLE}-cross.tgz
-RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross.tgz
+# RUN curl --max-time 15 --retry 5 -LO https://musl.cc/${CROSS_TRIPLE}-cross.tgz
+# RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross.tgz
+# Mirrored for reliability
+RUN curl --max-time 15 --retry 5 -LO https://github.com/dockcross/dockcross/releases/download/toolchain-sources/${CROSS_TRIPLE}-cross-retrieved-2025-06-07.tgz
+RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross-retrieved-2025-06-07.tgz
 
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
     AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
diff --git a/linux-armv7l-musl/Dockerfile.in b/linux-armv7l-musl/Dockerfile.in
index fd9338c..d157d51 100644
--- a/linux-armv7l-musl/Dockerfile.in
+++ b/linux-armv7l-musl/Dockerfile.in
@@ -6,8 +6,11 @@ ENV CROSS_TRIPLE=armv7l-linux-musleabihf
 ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}-cross
 
 RUN mkdir -p ${XCC_PREFIX}
-RUN curl --max-time 15 --retry 5 -LO https://musl.cc/${CROSS_TRIPLE}-cross.tgz
-RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross.tgz
+# RUN curl --max-time 15 --retry 5 -LO https://musl.cc/${CROSS_TRIPLE}-cross.tgz
+# RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross.tgz
+# Mirrored for reliability
+RUN curl --max-time 15 --retry 5 -LO https://github.com/dockcross/dockcross/releases/download/toolchain-sources/${CROSS_TRIPLE}-cross-retrieved-2025-06-07.tgz
+RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross-retrieved-2025-06-07.tgz
 
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
     AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \