From 441f8f21ff13868c1fb56ecf03696c810f88034f Mon Sep 17 00:00:00 2001
From: Deniz Onur Duzgun <59659739+dduzgun-security@users.noreply.github.com>
Date: Wed, 3 Jul 2024 15:33:40 -0400
Subject: [PATCH] build: update to go1.22.5 (#23498)

---
 .changelog/23498.txt             | 3 +++
 .go-version                      | 2 +-
 contributing/README.md           | 2 +-
 scripts/linux-priv-go.sh         | 2 +-
 scripts/release/mac-remote-build | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 .changelog/23498.txt

diff --git a/.changelog/23498.txt b/.changelog/23498.txt
new file mode 100644
index 000000000..850acea34
--- /dev/null
+++ b/.changelog/23498.txt
@@ -0,0 +1,3 @@
+```release-note:security
+build: Updated Go to 1.22.5 to address CVE-2024-24791
+```
diff --git a/.go-version b/.go-version
index 2a0ba77cc..da9594fd6 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.22.4
+1.22.5
diff --git a/contributing/README.md b/contributing/README.md
index 47d23928f..8fced1143 100644
--- a/contributing/README.md
+++ b/contributing/README.md
@@ -30,7 +30,7 @@ A development environment is supplied via Vagrant to make getting started easier
 
 Developing without Vagrant
 ---
-1. Install [Go 1.22.4+](https://golang.org/) *(Note: `gcc-go` is not supported)*
+1. Install [Go 1.22.5+](https://golang.org/) *(Note: `gcc-go` is not supported)*
 1. Clone this repo
    ```sh
    $ git clone https://github.com/hashicorp/nomad.git
diff --git a/scripts/linux-priv-go.sh b/scripts/linux-priv-go.sh
index fa627ccfc..8b2d033e9 100755
--- a/scripts/linux-priv-go.sh
+++ b/scripts/linux-priv-go.sh
@@ -21,7 +21,7 @@ case $(arch) in
 esac
 
 function install_go() {
-	local go_version="1.22.4"
+	local go_version="1.22.5"
 	local download="https://storage.googleapis.com/golang/go${go_version}.linux-${ARCH}.tar.gz"
 
 	if go version 2>&1 | grep -q "${go_version}"; then
diff --git a/scripts/release/mac-remote-build b/scripts/release/mac-remote-build
index 01251a809..89479f365 100755
--- a/scripts/release/mac-remote-build
+++ b/scripts/release/mac-remote-build
@@ -56,7 +56,7 @@ REPO_PATH="${TMP_WORKSPACE}/gopath/src/github.com/hashicorp/nomad"
 mkdir -p "${TMP_WORKSPACE}/tmp"
 
 install_go() {
-  local go_version="1.22.4"
+  local go_version="1.22.5"
   local download=
 
   download="https://storage.googleapis.com/golang/go${go_version}.darwin-amd64.tar.gz"