From 87753cc97da6279ee7cfd97392ba072bbc04aa54 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 19 Sep 2024 07:50:45 +0900 Subject: [PATCH] go.mod: 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 | 3 ++- go.sum | 2 ++ pkg/vz/network_darwin.go | 3 +-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6096dc5ab78..5e3de6d0e02 100644 --- a/go.mod +++ b/go.mod @@ -24,6 +24,7 @@ require ( github.com/goccy/go-yaml v1.12.0 github.com/google/go-cmp v0.6.0 github.com/google/yamlfmt v0.13.0 + github.com/inetaf/tcpproxy v0.0.0-20240214030015-3ce58045626c github.com/lima-vm/go-qcow2reader v0.1.2 github.com/lima-vm/sshocker v0.3.4 github.com/mattn/go-isatty v0.0.20 @@ -48,7 +49,6 @@ 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 k8s.io/api v0.31.0 k8s.io/apimachinery v0.31.0 k8s.io/client-go v0.31.0 @@ -127,6 +127,7 @@ require ( gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gvisor.dev/gvisor v0.0.0-20231023213702-2691a8f9b1cf // indirect + inet.af/tcpproxy v0.0.0-20221017015627-91f861402626 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect diff --git a/go.sum b/go.sum index 02472d8bf46..315e8624704 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= diff --git a/pkg/vz/network_darwin.go b/pkg/vz/network_darwin.go index fb458ad1103..1daae74f889 100644 --- a/pkg/vz/network_darwin.go +++ b/pkg/vz/network_darwin.go @@ -11,9 +11,8 @@ import ( "time" "github.com/balajiv113/fd" - + "github.com/inetaf/tcpproxy" "github.com/sirupsen/logrus" - "inet.af/tcpproxy" ) func PassFDToUnix(unixSock string) (*os.File, error) {