diff --git a/go.mod b/go.mod index 6c11611d1e..4518a2de0b 100644 --- a/go.mod +++ b/go.mod @@ -45,7 +45,7 @@ require ( github.com/json-iterator/go v1.1.12 github.com/kevinburke/ssh_config v1.2.0 github.com/klauspost/pgzip v1.2.6 - github.com/linuxkit/virtsock v0.0.0-20220523201153-1a23e78aa7a2 + github.com/linuxkit/virtsock v0.0.0-20241009230534-cb6a20cc0422 github.com/mattn/go-shellwords v1.0.12 github.com/mattn/go-sqlite3 v1.14.24 github.com/mdlayher/vsock v1.2.1 diff --git a/go.sum b/go.sum index 367be650e4..1f7e4b9d32 100644 --- a/go.sum +++ b/go.sum @@ -328,8 +328,8 @@ github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec h1:2tTW6cDth2TSgRbAhD7yjZzTQmcN25sDRPEeinR51yQ= github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec/go.mod h1:TmwEoGCwIti7BCeJ9hescZgRtatxRE+A72pCoPfmcfk= -github.com/linuxkit/virtsock v0.0.0-20220523201153-1a23e78aa7a2 h1:DZMFueDbfz6PNc1GwDRA8+6lBx1TB9UnxDQliCqR73Y= -github.com/linuxkit/virtsock v0.0.0-20220523201153-1a23e78aa7a2/go.mod h1:SWzULI85WerrFt3u+nIm5F9l7EvxZTKQvd0InF3nmgM= +github.com/linuxkit/virtsock v0.0.0-20241009230534-cb6a20cc0422 h1:XvRuyDDRvi+UDxHN/M4MW4HxjmNVMmUKQj/+AbgsYgk= +github.com/linuxkit/virtsock v0.0.0-20241009230534-cb6a20cc0422/go.mod h1:JLgfq4XMVbvfNlAXla/41lZnp21O72a/wWHGJefAvgQ= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= diff --git a/vendor/github.com/linuxkit/virtsock/pkg/hvsock/hvsock_linux.go b/vendor/github.com/linuxkit/virtsock/pkg/hvsock/hvsock_linux.go index 569e66d601..09355e3367 100644 --- a/vendor/github.com/linuxkit/virtsock/pkg/hvsock/hvsock_linux.go +++ b/vendor/github.com/linuxkit/virtsock/pkg/hvsock/hvsock_linux.go @@ -45,7 +45,6 @@ import ( "syscall" "time" - "github.com/pkg/errors" "golang.org/x/sys/unix" ) @@ -135,7 +134,7 @@ func Listen(addr Addr) (net.Listener, error) { err = syscall.Listen(fd, syscall.SOMAXCONN) if err != nil { - return nil, errors.Wrapf(err, "listen(%s) failed", addr) + return nil, fmt.Errorf("listen(%s) failed: %w", addr, err) } return &hvsockListener{fd, addr}, nil } @@ -157,7 +156,7 @@ func (v *hvsockListener) Accept() (net.Conn, error) { acceptSALen = C.sizeof_struct_sockaddr_hv fd, err := C.accept_hv(C.int(v.fd), &acceptSA, &acceptSALen) if err != nil { - return nil, errors.Wrapf(err, "accept(%s) failed", v.local) + return nil, fmt.Errorf("accept(%s) failed: %w", v.local, err) } remote := &Addr{VMID: guidFromC(acceptSA.shv_vm_id), ServiceID: guidFromC(acceptSA.shv_service_id)} diff --git a/vendor/github.com/linuxkit/virtsock/pkg/hvsock/hvsock_windows.go b/vendor/github.com/linuxkit/virtsock/pkg/hvsock/hvsock_windows.go index f21e9a3151..c97c5554cf 100644 --- a/vendor/github.com/linuxkit/virtsock/pkg/hvsock/hvsock_windows.go +++ b/vendor/github.com/linuxkit/virtsock/pkg/hvsock/hvsock_windows.go @@ -11,8 +11,6 @@ import ( "syscall" "time" "unsafe" - - "github.com/pkg/errors" ) // Make sure Winsock2 is initialised @@ -54,7 +52,7 @@ func Dial(raddr Addr) (Conn, error) { } if err := sys_connect(fd, ptr, n); err != nil { - return nil, errors.Wrapf(err, "connect(%s) failed", raddr) + return nil, fmt.Errorf("connect(%s) failed: %w", raddr, err) } return newHVsockConn(fd, Addr{VMID: GUIDZero, ServiceID: GUIDZero}, raddr) @@ -78,7 +76,7 @@ func Listen(addr Addr) (net.Listener, error) { err = syscall.Listen(fd, syscall.SOMAXCONN) if err != nil { - return nil, errors.Wrapf(err, "listen(%s) failed", addr) + return nil, fmt.Errorf("listen(%s) failed: %w", addr, err) } return &hvsockListener{fd, addr}, nil diff --git a/vendor/modules.txt b/vendor/modules.txt index 26de47a064..c0905f3c8b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -755,7 +755,7 @@ github.com/letsencrypt/boulder/identifier github.com/letsencrypt/boulder/probs github.com/letsencrypt/boulder/revocation github.com/letsencrypt/boulder/strictyaml -# github.com/linuxkit/virtsock v0.0.0-20220523201153-1a23e78aa7a2 +# github.com/linuxkit/virtsock v0.0.0-20241009230534-cb6a20cc0422 ## explicit; go 1.17 github.com/linuxkit/virtsock/pkg/hvsock # github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0