Bump go patch version

8 files changed, 14 insertions, 14 deletions

diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml
index 154f8c6c8a..4e8379e709 100644
--- a/.github/workflows/android-app.yml
+++ b/.github/workflows/android-app.yml
@@ -59,7 +59,7 @@ jobs:
               if: steps.cache-native-libs.outputs.cache-hit != 'true'
               uses: actions/setup-go@v3
               with:
-                  go-version: 1.18.1
+                  go-version: 1.18.5
 
             - name: Configure Android NDK
               if: steps.cache-native-libs.outputs.cache-hit != 'true'
diff --git a/.github/workflows/daemon.yml b/.github/workflows/daemon.yml
index d7315e53b2..f0c8b843d6 100644
--- a/.github/workflows/daemon.yml
+++ b/.github/workflows/daemon.yml
@@ -56,7 +56,7 @@ jobs:
             - name: Install Go
               uses: actions/setup-go@v3
               with:
-                  go-version: 1.18.1
+                  go-version: 1.18.5
 
             - name: Install build dependencies
               run: |
@@ -81,7 +81,7 @@ jobs:
             - name: Install Go
               uses: actions/setup-go@v3
               with:
-                  go-version: 1.18.1
+                  go-version: 1.18.5
 
             - name: Build and test crates
               run: ./ci/check-rust.sh
@@ -123,7 +123,7 @@ jobs:
             - name: Install Go
               uses: actions/setup-go@v3
               with:
-                  go-version: 1.18.1
+                  go-version: 1.18.5
 
             - name: Install msbuild
               uses: microsoft/setup-msbuild@v1.0.2
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index 62b94203f9..cf1ff4b058 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -48,7 +48,7 @@ jobs:
             - name: Setup go-lang
               uses: actions/setup-go@v3
               with:
-                  go-version: 1.18.1
+                  go-version: 1.18.5
 
             - name: Prepare iOS simulator
               run: |
diff --git a/Dockerfile b/Dockerfile
index 10eb78eaad..c9dc12294c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,9 +14,9 @@ RUN apt update -y && apt install build-essential \
 
 
 # Install golang
-ENV GOLANG_VERSION 1.18.1
+ENV GOLANG_VERSION 1.18.5
 # Checksum from: https://go.dev/dl/
-ENV GOLANG_HASH b3b815f47ababac13810fc6021eb73d65478e0b2db4b09d348eefad9581a2334
+ENV GOLANG_HASH 9e5de37f9c49942c601b191ac5fba404b868bfc21d446d6960acc12283d6e5f2
 RUN curl -Lo go.tgz https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz && \
 	echo $(sha256sum go.tgz) && \
 	echo "${GOLANG_HASH} go.tgz" | sha256sum -c - && \
diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile
index c70589f4b8..7a6ec35c76 100644
--- a/android/docker/Dockerfile
+++ b/android/docker/Dockerfile
@@ -44,9 +44,9 @@ ENV ANDROID_NDK_HOME="/opt/android/android-ndk-r20b" \
     NDK_TOOLCHAIN_DIR="/opt/android/android-ndk-r20b/toolchains/llvm/prebuilt/linux-x86_64/bin"
 
 # Install golang
-ENV GOLANG_VERSION 1.18.1
+ENV GOLANG_VERSION 1.18.5
 # Checksum from: https://go.dev/dl/
-ENV GOLANG_HASH b3b815f47ababac13810fc6021eb73d65478e0b2db4b09d348eefad9581a2334
+ENV GOLANG_HASH 9e5de37f9c49942c601b191ac5fba404b868bfc21d446d6960acc12283d6e5f2
 COPY goruntime-boottime-over-monotonic.diff /tmp/goruntime-boottime-over-monotonic.diff
 RUN cd /tmp && \
     curl -sf -L -o go.tgz https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz && \
diff --git a/android/fdroid-build/init.sh b/android/fdroid-build/init.sh
index 38667abb06..f8d498e10c 100755
--- a/android/fdroid-build/init.sh
+++ b/android/fdroid-build/init.sh
@@ -20,9 +20,9 @@ rustup target add \
     armv7-linux-androideabi
 
 # Install golang
-GOLANG_VERSION="1.18.1"
+GOLANG_VERSION="1.18.5"
 # Checksum from: https://golang.org/dl/
-GOLANG_HASH="b3b815f47ababac13810fc6021eb73d65478e0b2db4b09d348eefad9581a2334"
+GOLANG_HASH="9e5de37f9c49942c601b191ac5fba404b868bfc21d446d6960acc12283d6e5f2"
 cd "$HOME"
 curl -sf -L -o go.tgz https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
 echo "$GOLANG_HASH go.tgz" | sha256sum -c
diff --git a/wireguard/libwg/Android.mk b/wireguard/libwg/Android.mk
index 0508c20c0c..54fd160db8 100644
--- a/wireguard/libwg/Android.mk
+++ b/wireguard/libwg/Android.mk
@@ -22,7 +22,7 @@ default: $(DESTDIR)/libwg.so
 
 GOBUILDARCH := $(NDK_GO_ARCH_MAP_$(shell uname -m))
 GOBUILDOS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
-GOBUILDVERSION := 1.18.1
+GOBUILDVERSION := 1.18.5
 # TODO: Add checksum?
 GOBUILDTARBALL := https://go.dev/dl/go$(GOBUILDVERSION).$(GOBUILDOS)-$(GOBUILDARCH).tar.gz
 GOBUILDVERSION_NEEDED := go version go$(GOBUILDVERSION) $(GOBUILDOS)/$(GOBUILDARCH)
diff --git a/wireguard/libwg/Dockerfile_AndroidPatchedGoruntime b/wireguard/libwg/Dockerfile_AndroidPatchedGoruntime
index 09104e7e6d..4781e89e76 100644
--- a/wireguard/libwg/Dockerfile_AndroidPatchedGoruntime
+++ b/wireguard/libwg/Dockerfile_AndroidPatchedGoruntime
@@ -27,8 +27,8 @@ RUN cd /tmp && \
 ENV ANDROID_NDK_HOME="/opt/android/android-ndk-r20b"
 ENV NDK_TOOLCHAIN_DIR="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin"
 
-ENV GOLANG_VERSION 1.18.1
-ENV GOLANG_HASH b3b815f47ababac13810fc6021eb73d65478e0b2db4b09d348eefad9581a2334
+ENV GOLANG_VERSION 1.18.5
+ENV GOLANG_HASH 9e5de37f9c49942c601b191ac5fba404b868bfc21d446d6960acc12283d6e5f2
 
 # Install Go-lang and patch it to use the appropriate monotonic clock
 COPY goruntime-boottime-over-monotonic.diff /opt/goruntime-boottime-over-monotonic.diff