From 20c9a1d813a4c6792fb4b0d8dbec5569ef120191 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <jlecuirot@microsoft.com>
Date: Thu, 28 May 2026 12:43:44 +0100
Subject: [PATCH 1/2] make.conf: Set a custom user-agent for wget when fetching
 distfiles

crates.io (on Amazon CloudFront) is now rejecting our requests with 403.
I have made a similar change to upstream Portage, but let's use our own
string for Flatcar.

Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
---
 setup_board   | 4 +---
 update_chroot | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup_board b/setup_board
index 9cfbc061bf9..51e07902c33 100755
--- a/setup_board
+++ b/setup_board
@@ -299,9 +299,7 @@ sudo_clobber "${BOARD_ETC}/portage/make.conf" <<EOF
 # Settings derived from the host environment
 CBUILD="$(portageq envvar CHOST)"
 HOSTCC="$(portageq envvar CHOST)-gcc"
-DISTDIR="$(portageq envvar DISTDIR)"
-MAKEOPTS="$(portageq envvar MAKEOPTS)"
-PORTAGE_USERNAME="$(portageq envvar PORTAGE_USERNAME)"
+$(portageq envvar -v DISTDIR MAKEOPTS PORTAGE_USERNAME FETCHCOMMAND RESUMECOMMAND | sed 's:\$:\\$:g')
 
 # Board specific settings
 CHOST="${BOARD_CHOST}"
diff --git a/update_chroot b/update_chroot
index d07198f8bab..1eb080a7b20 100755
--- a/update_chroot
+++ b/update_chroot
@@ -91,6 +91,8 @@ PORT_LOGDIR="/var/log/portage"
 PORTAGE_BINHOST="$PORTAGE_BINHOST"
 PORTAGE_USERNAME="${PORTAGE_USERNAME}"
 MAKEOPTS="--jobs=${NUM_JOBS} --load-average=$((NUM_JOBS * 2))"
+FETCHCOMMAND='wget -t 3 -T 60 --passive-ftp -U "Portage (Flatcar SDK ${FLATCAR_SDK_VERSION}, https://www.flatcar.org) distfile-fetch" -O "\\\${DISTDIR}/\\\${FILE}" "\\\${URI}"'
+RESUMECOMMAND='wget -c -t 3 -T 60 --passive-ftp -U "Portage (Flatcar SDK ${FLATCAR_SDK_VERSION}, https://www.flatcar.org) distfile-fetch" -O "\\\${DISTDIR}/\\\${FILE}" "\\\${URI}"'
 
 # Generally there isn't any need to add packages to @world by default.
 # You can use --select to override this.

From 934efee1eb0cd9bd61847df2ccc7450208ace745 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <jlecuirot@microsoft.com>
Date: Fri, 29 May 2026 11:18:26 +0100
Subject: [PATCH 2/2] cargo.eclass: Sync with Gentoo for crates.io fix

This hasn't actually been merged upstream yet, but it's about to be. The
user-agent change deals with the blocked requests, but it turns out we
should be using this faster and less restricted endpoint anyway.

Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
---
 .../src/third_party/portage-stable/eclass/cargo.eclass          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass b/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass
index 6f606208296..e88ff48036e 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass
@@ -280,7 +280,7 @@ _cargo_set_crate_uris() {
 			name="${BASH_REMATCH[1]}"
 			version="${BASH_REMATCH[2]}"
 		fi
-		url="https://crates.io/api/v1/crates/${name}/${version}/download -> ${name}-${version}.crate"
+		url="https://static.crates.io/crates/${name}/${name}-${version}.crate"
 		CARGO_CRATE_URIS+="${url} "
 
 		# when invoked by pkgbump, avoid fetching all the crates