From bd86538e4e7f7928d94ba41a8f33a5d722e2eaed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20B=C3=BChler?=
 <59952941+lukasbbuehler@users.noreply.github.com>
Date: Wed, 5 Feb 2025 16:37:37 +0100
Subject: [PATCH] hkps over port 443 instead of 11371 to resolve issue
 https://github.com/actions/runner-images/discussions/9963 (#10007)

* Change to use port 80 instead of 11371

Change to use port 80 instead of 11371

* Update install-swift.sh

Changed to hkps and port 443 for added security

* Fix merge conflicts
---
 images/ubuntu/scripts/build/install-swift.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/images/ubuntu/scripts/build/install-swift.sh b/images/ubuntu/scripts/build/install-swift.sh
index 8627106c3..ffd53fc73 100644
--- a/images/ubuntu/scripts/build/install-swift.sh
+++ b/images/ubuntu/scripts/build/install-swift.sh
@@ -18,7 +18,7 @@ archive_path=$(download_with_retry "$archive_url")
 
 # Verifying PGP signature using official Swift PGP key. Referring to https://www.swift.org/install/linux/#Installation-via-Tarball
 # Download and import Swift PGP keys
-gpg --keyserver hkp://keyserver.ubuntu.com \
+gpg --keyserver hkps://keyserver.ubuntu.com:443 \
       --recv-keys \
       '7463 A81A 4B2E EA1B 551F  FBCF D441 C977 412B 37AD' \
       '1BE1 E29A 084C B305 F397  D62A 9F59 7F4D 21A5 6D5F' \
@@ -29,7 +29,8 @@ gpg --keyserver hkp://keyserver.ubuntu.com \
       '8A74 9566 2C3C D4AE 18D9  5637 FAF6 989E 1BC1 6FEA' \
       'E813 C892 820A 6FA1 3755  B268 F167 DF1A CF9C E069' \
       '52BB 7E3D E28A 71BE 22EC  05FF EF80 A866 B47A 981F'
-gpg --keyserver hkp://keyserver.ubuntu.com --refresh-keys Swift
+
+gpg --keyserver hkps://keyserver.ubuntu.com:443 --refresh-keys Swift
 
 # Download and verify signature
 signature_path=$(download_with_retry "${archive_url}.sig")