From 418d92d2ef12d9e79b0a930c3ee367e27a85d2e4 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 19 Sep 2024 07:50:45 +0900 Subject: [PATCH] go.mod: replace inet.af/tcpproxy -> github.com/inetaf/tcpproxy Changes: https://github.com/inetaf/tcpproxy/compare/91f861402626c6ba93eaa57ee257109c4f07bd00...3ce58045626c8bc343a593c90354975e61b1817a https://github.com/inetaf/tcpproxy/commit/3ce58045626c8bc343a593c90354975e61b1817a says "change import path after Taliban seized it or something". It is *unlikely* that `inet.af/tcpproxy v0.0.0-20221017015627-91f861402626` cached in proxy.golang.org is compromised. Signed-off-by: Akihiro Suda --- go.mod | 7 ++++++- go.sum | 4 ++-- pkg/vz/network_darwin.go | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 6096dc5ab78..85af8150912 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 gopkg.in/yaml.v3 v3.0.1 gotest.tools/v3 v3.5.1 - inet.af/tcpproxy v0.0.0-20221017015627-91f861402626 + inet.af/tcpproxy v0.0.0-20221017015627-91f861402626 // replaced to github.com/inetaf/tcpproxy (see the bottom of this go.mod file) k8s.io/api v0.31.0 k8s.io/apimachinery v0.31.0 k8s.io/client-go v0.31.0 @@ -134,3 +134,8 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) + +// The inet.af domain was lost: https://github.com/inetaf/tcpproxy/issues/39 +// We can't just `require` github.com/inetaf/tcpproxy, as gvisor-tap-vsock +// still imports inet.af/tcpproxy: https://github.com/containers/gvisor-tap-vsock/pull/399 +replace inet.af/tcpproxy => github.com/inetaf/tcpproxy v0.0.0-20240214030015-3ce58045626c diff --git a/go.sum b/go.sum index 02472d8bf46..e43faffd620 100644 --- a/go.sum +++ b/go.sum @@ -137,6 +137,8 @@ github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/inetaf/tcpproxy v0.0.0-20240214030015-3ce58045626c h1:gYfYE403/nlrGNYj6BEOs9ucLCAGB9gstlSk92DttTg= +github.com/inetaf/tcpproxy v0.0.0-20240214030015-3ce58045626c/go.mod h1:Di7LXRyUcnvAcLicFhtM9/MlZl/TNgRSDHORM2c6CMI= github.com/insomniacslk/dhcp v0.0.0-20240710054256-ddd8a41251c9 h1:LZJWucZz7ztCqY6Jsu7N9g124iJ2kt/O62j3+UchZFg= github.com/insomniacslk/dhcp v0.0.0-20240710054256-ddd8a41251c9/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic= github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8= @@ -435,8 +437,6 @@ gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= gvisor.dev/gvisor v0.0.0-20231023213702-2691a8f9b1cf h1:0A28IFBR6VcMacM0m6Rn5/nr8pk8xa2TyIkjSaFAOPc= gvisor.dev/gvisor v0.0.0-20231023213702-2691a8f9b1cf/go.mod h1:8hmigyCdYtw5xJGfQDJzSH5Ju8XEIDBnpyi8+O6GRt8= -inet.af/tcpproxy v0.0.0-20221017015627-91f861402626 h1:2dMP3Ox/Wh5BiItwOt4jxRsfzkgyBrHzx2nW28Yg6nc= -inet.af/tcpproxy v0.0.0-20221017015627-91f861402626/go.mod h1:Tojt5kmHpDIR2jMojxzZK2w2ZR7OILODmUo2gaSwjrk= k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo= k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE= k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc= diff --git a/pkg/vz/network_darwin.go b/pkg/vz/network_darwin.go index fb458ad1103..1aceb8e294e 100644 --- a/pkg/vz/network_darwin.go +++ b/pkg/vz/network_darwin.go @@ -13,7 +13,7 @@ import ( "github.com/balajiv113/fd" "github.com/sirupsen/logrus" - "inet.af/tcpproxy" + "inet.af/tcpproxy" // replaced to github.com/inetaf/tcpproxy in go.mod ) func PassFDToUnix(unixSock string) (*os.File, error) {