From 058e676c7f33495477583a90a0c886abe6ca89b6 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Fri, 9 Jun 2017 20:55:41 +0000 Subject: [PATCH 1/3] Revert "Comment out vendoring for docker/docker in components/cli" This reverts commit 8928dccaa64f6a5f0b01055b7e244f3b70eb0019. Signed-off-by: Andrew Hsu --- components/cli/vendor.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/components/cli/vendor.conf b/components/cli/vendor.conf index 2c65d0bb9e..83249b101e 100644 --- a/components/cli/vendor.conf +++ b/components/cli/vendor.conf @@ -7,8 +7,7 @@ github.com/coreos/etcd 824277cb3a577a0e8c829ca9ec557b973fe06d20 github.com/cpuguy83/go-md2man a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76 github.com/docker/distribution b38e5838b7b2f2ad48e06ec4b500011976080621 -# 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 45c6f4262a865a03adaac291a9ce33c0f2190d77 github.com/docker/docker-credential-helpers v0.5.0 github.com/docker/go d30aec9fd63c35133f8f79c3412ad91a3b08be06 github.com/docker/go-connections e15c02316c12de00874640cd76311849de2aeed5 @@ -17,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 From ad8c94e585b6617752e0e2b8f8ea84c940c744bb Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Fri, 9 Jun 2017 20:55:49 +0000 Subject: [PATCH 2/3] Revert "[vendor] Set OPOST on bsd" This reverts commit 972de9a65734e146fa4d3b5672b5c7073dd39b1f. Signed-off-by: Andrew Hsu --- .../cli/vendor/github.com/docker/docker/pkg/term/termios_bsd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/cli/vendor/github.com/docker/docker/pkg/term/termios_bsd.go b/components/cli/vendor/github.com/docker/docker/pkg/term/termios_bsd.go index 9fdc720f25..c47341e873 100644 --- a/components/cli/vendor/github.com/docker/docker/pkg/term/termios_bsd.go +++ b/components/cli/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 1f928815e51b2968dfdaf5589cd165c1a1bc3a7a Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Fri, 9 Jun 2017 20:55:50 +0000 Subject: [PATCH 3/3] Revert "Set OPOST on bsd" This reverts commit fff42c853aedd3e15c731217058642d9859e7d3f. Signed-off-by: Andrew Hsu --- components/engine/pkg/term/termios_bsd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/pkg/term/termios_bsd.go b/components/engine/pkg/term/termios_bsd.go index 9fdc720f25..c47341e873 100644 --- a/components/engine/pkg/term/termios_bsd.go +++ b/components/engine/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