From 4cab568abbbf1bd89ed5107713890ca82ae5e376 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 23 Nov 2020 22:10:34 +0100 Subject: [PATCH] vendor: github.com/moby/term bea5bbe245bf407372d477f1361d2ff042d2f556 full diff: https://github.com/moby/term/compare/7f0af18e79f2784809e9cef63d0df5aa2c79d76e...bea5bbe245bf407372d477f1361d2ff042d2f556 - Fix windows integer overflow on GOOS=windows, GOARCH=arm - go.mod: github.com/creack/pty v1.1.11 - v1.1.11: Add arm support for OpenBSD - v1.1.10: Fix CTTY to work with go1.15 - CI: fix Go version matrix, and drop go 1.12, add go 1.15 - CI: remove "sudo" to fix incorrect Go versions (incorrect PATH, GOROOT) Signed-off-by: Sebastiaan van Stijn --- vendor.conf | 2 +- vendor/github.com/moby/term/go.mod | 2 +- vendor/github.com/moby/term/term_windows.go | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/vendor.conf b/vendor.conf index bcd6a37c12..a6f6854ea4 100755 --- a/vendor.conf +++ b/vendor.conf @@ -48,7 +48,7 @@ github.com/miekg/pkcs11 210dc1e16747c5ba98a03bcbcf72 github.com/mitchellh/mapstructure d16e9488127408e67948eb43b6d3fbb9f222da10 # v1.3.2 github.com/moby/buildkit 4d1f260e8490ec438ab66e08bb105577aca0ce06 github.com/moby/sys 1bc8673b57550ddf85262eb0fed0aac651a37dab # symlink/v0.1.0 (latest tag, either mount/vXXX, mountinfo/vXXX or symlink/vXXX) -github.com/moby/term 7f0af18e79f2784809e9cef63d0df5aa2c79d76e +github.com/moby/term bea5bbe245bf407372d477f1361d2ff042d2f556 github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 # 1.0.3 github.com/modern-go/reflect2 4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd # 1.0.1 github.com/morikuni/aec 39771216ff4c63d11f5e604076f9c45e8be1067b # v1.0.0 diff --git a/vendor/github.com/moby/term/go.mod b/vendor/github.com/moby/term/go.mod index 4088df8db1..f453204333 100644 --- a/vendor/github.com/moby/term/go.mod +++ b/vendor/github.com/moby/term/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 - github.com/creack/pty v1.1.9 + github.com/creack/pty v1.1.11 github.com/google/go-cmp v0.4.0 github.com/pkg/errors v0.9.1 // indirect golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a diff --git a/vendor/github.com/moby/term/term_windows.go b/vendor/github.com/moby/term/term_windows.go index 2e512759e5..ba82960d4a 100644 --- a/vendor/github.com/moby/term/term_windows.go +++ b/vendor/github.com/moby/term/term_windows.go @@ -71,19 +71,22 @@ func StdStreams() (stdIn io.ReadCloser, stdOut, stdErr io.Writer) { // go-ansiterm hasn't switch to x/sys/windows. // TODO: switch back to x/sys/windows once go-ansiterm has switched if emulateStdin { - stdIn = windowsconsole.NewAnsiReader(windows.STD_INPUT_HANDLE) + h := uint32(windows.STD_INPUT_HANDLE) + stdIn = windowsconsole.NewAnsiReader(int(h)) } else { stdIn = os.Stdin } if emulateStdout { - stdOut = windowsconsole.NewAnsiWriter(windows.STD_OUTPUT_HANDLE) + h := uint32(windows.STD_OUTPUT_HANDLE) + stdOut = windowsconsole.NewAnsiWriter(int(h)) } else { stdOut = os.Stdout } if emulateStderr { - stdErr = windowsconsole.NewAnsiWriter(windows.STD_ERROR_HANDLE) + h := uint32(windows.STD_ERROR_HANDLE) + stdErr = windowsconsole.NewAnsiWriter(int(h)) } else { stdErr = os.Stderr }