From 2540ad9fa7487652f8c09ab80650d98f1cd19045 Mon Sep 17 00:00:00 2001
From: Thomas Tendyck <tt@edgeless.systems>
Date: Sat, 11 May 2024 08:13:01 +0200
Subject: [PATCH] fix: allow building newer go module versions

---
 CMakeLists.txt                           | 2 +-
 _ertgo                                   | 2 +-
 dockerfiles/Dockerfile                   | 4 ++--
 dockerfiles/Dockerfile.focal             | 4 ++--
 ego/cmd/newer-go-ver-test/go.mod         | 4 ++--
 ego/cmd/newer-go-ver-test/main.go        | 2 +-
 ego/cmd/newer-go-ver-test/testmod/go.mod | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ff0aac..c78fb30 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.11)
-project(ego VERSION 1.5.1)
+project(ego VERSION 1.5.2)
 
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Debug)
diff --git a/_ertgo b/_ertgo
index 446860f..75b1e9f 160000
--- a/_ertgo
+++ b/_ertgo
@@ -1 +1 @@
-Subproject commit 446860fe00717d4e7e99759ba07338295c4994af
+Subproject commit 75b1e9f8379c8d5553b5e9ed36c637461caf2dd4
diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile
index 672a937..10cb3fe 100644
--- a/dockerfiles/Dockerfile
+++ b/dockerfiles/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/edgelesssys/ego/build-base:v1.5.1 AS build
+FROM ghcr.io/edgelesssys/ego/build-base:v1.5.2 AS build
 
 # don't run `apt-get update` because required packages are cached in build-base for reproducibility
 RUN apt-get install -y --no-install-recommends \
@@ -12,7 +12,7 @@ RUN apt-get install -y --no-install-recommends \
   wget
 
 ARG erttag=v0.4.3
-ARG egotag=v1.5.1
+ARG egotag=v1.5.2
 RUN wget -qO- https://go.dev/dl/go1.21.8.linux-amd64.tar.gz | tar -C /usr/local -xz \
   && git clone -b $erttag --depth=1 https://github.com/edgelesssys/edgelessrt \
   && git clone -b $egotag --depth=1 https://github.com/edgelesssys/ego \
diff --git a/dockerfiles/Dockerfile.focal b/dockerfiles/Dockerfile.focal
index e7f9b63..c6e2f1a 100644
--- a/dockerfiles/Dockerfile.focal
+++ b/dockerfiles/Dockerfile.focal
@@ -1,4 +1,4 @@
-FROM ghcr.io/edgelesssys/ego/build-base-focal:v1.5.1 AS build
+FROM ghcr.io/edgelesssys/ego/build-base-focal:v1.5.2 AS build
 
 # don't run `apt-get update` because required packages are cached in build-base for reproducibility
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -12,7 +12,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
   wget
 
 ARG erttag=v0.4.3
-ARG egotag=v1.5.1
+ARG egotag=v1.5.2
 RUN wget -qO- https://go.dev/dl/go1.21.8.linux-amd64.tar.gz | tar -C /usr/local -xz \
   && git clone -b $erttag --depth=1 https://github.com/edgelesssys/edgelessrt \
   && git clone -b $egotag --depth=1 https://github.com/edgelesssys/ego \
diff --git a/ego/cmd/newer-go-ver-test/go.mod b/ego/cmd/newer-go-ver-test/go.mod
index 8994947..deaf420 100644
--- a/ego/cmd/newer-go-ver-test/go.mod
+++ b/ego/cmd/newer-go-ver-test/go.mod
@@ -2,6 +2,6 @@ module example.com/newer-go-ver-test
 
 go 1.99
 
-replace example.com/testmod => ./testmod
+replace github.com/edgelesssys/ego/ego/cmd/newer-go-ver-test/testmod => ./testmod
 
-require example.com/testmod v0.0.0-00010101000000-000000000000
+require github.com/edgelesssys/ego/ego/cmd/newer-go-ver-test/testmod v0.0.0-00010101000000-000000000000
diff --git a/ego/cmd/newer-go-ver-test/main.go b/ego/cmd/newer-go-ver-test/main.go
index 742c2e0..702ad71 100644
--- a/ego/cmd/newer-go-ver-test/main.go
+++ b/ego/cmd/newer-go-ver-test/main.go
@@ -1,6 +1,6 @@
 package main
 
-import "example.com/testmod"
+import "github.com/edgelesssys/ego/ego/cmd/newer-go-ver-test/testmod"
 
 func main() {
 	testmod.Hello()
diff --git a/ego/cmd/newer-go-ver-test/testmod/go.mod b/ego/cmd/newer-go-ver-test/testmod/go.mod
index 7b8bf8f..c15675a 100644
--- a/ego/cmd/newer-go-ver-test/testmod/go.mod
+++ b/ego/cmd/newer-go-ver-test/testmod/go.mod
@@ -1,3 +1,3 @@
-module example.com/testmod
+module github.com/edgelesssys/ego/ego/cmd/newer-go-ver-test/testmod
 
 go 1.98