From 2b4d0deed6591df7bd0662f5c3995fde26b96b99 Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Tue, 6 Jun 2017 03:36:49 +0000 Subject: [PATCH 1/2] [vendor] Set OPOST on bsd Signed-off-by: Michael Crosby (cherry picked from commit 17ec46a24316f59c808c112e3ca46d7c442a785a) Manually update pkg/term vendoring to match changes in moby Signed-off-by: Tibor Vass --- vendor/github.com/docker/docker/pkg/term/termios_bsd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/github.com/docker/docker/pkg/term/termios_bsd.go b/vendor/github.com/docker/docker/pkg/term/termios_bsd.go index c47341e8731..9fdc720f25b 100644 --- a/vendor/github.com/docker/docker/pkg/term/termios_bsd.go +++ b/vendor/github.com/docker/docker/pkg/term/termios_bsd.go @@ -27,7 +27,7 @@ func MakeRaw(fd uintptr) (*State, error) { newState := oldState.termios newState.Iflag &^= (unix.IGNBRK | unix.BRKINT | unix.PARMRK | unix.ISTRIP | unix.INLCR | unix.IGNCR | unix.ICRNL | unix.IXON) - newState.Oflag &^= unix.OPOST + newState.Oflag |= unix.OPOST newState.Lflag &^= (unix.ECHO | unix.ECHONL | unix.ICANON | unix.ISIG | unix.IEXTEN) newState.Cflag &^= (unix.CSIZE | unix.PARENB) newState.Cflag |= unix.CS8 From 2f965cbc5251d2a77dc951a60c784e1021db3518 Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Tue, 6 Jun 2017 03:39:10 +0000 Subject: [PATCH 2/2] Comment out vendoring for docker/docker in components/cli Because of cherry-pick from commit 17ec46a24316f59c808c112e3ca46d7c442a785a into components/cli/vendor/github.com/docker/docker Signed-off-by: Tibor Vass --- vendor.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vendor.conf b/vendor.conf index 0ca92b32281..324859aac79 100644 --- a/vendor.conf +++ b/vendor.conf @@ -6,7 +6,8 @@ github.com/agl/ed25519 d2b94fd789ea21d12fac1a4443dd3a3f79cda72c github.com/coreos/etcd 824277cb3a577a0e8c829ca9ec557b973fe06d20 github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76 github.com/docker/distribution b38e5838b7b2f2ad48e06ec4b500011976080621 -github.com/docker/docker 45c6f4262a865a03adaac291a9ce33c0f2190d77 +# commented out, since we needed to advance just github.com/docker/docker/pkg/term/termios_bsd.go +# github.com/docker/docker 45c6f4262a865a03adaac291a9ce33c0f2190d77 github.com/docker/docker-credential-helpers v0.5.0 github.com/docker/go d30aec9fd63c35133f8f79c3412ad91a3b08be06 github.com/docker/go-connections e15c02316c12de00874640cd76311849de2aeed5 @@ -15,7 +16,7 @@ github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1 github.com/docker/libnetwork b13e0604016a4944025aaff521d9c125850b0d04 github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a github.com/docker/notary v0.4.2 -github.com/docker/swarmkit 1a3e510517be82d18ac04380b5f71eddf06c2fc0 +github.com/docker/swarmkit 1a3e510517be82d18ac04380b5f71eddf06c2fc0 github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff github.com/gogo/protobuf 7efa791bd276fd4db00867cbd982b552627c24cb github.com/golang/protobuf 8ee79997227bf9b34611aee7946ae64735e6fd93