From c3d5a3ae2a88330e789668551331ace0cb983886 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 4 Jul 2018 14:27:08 -0700
Subject: [PATCH] Revendor ugorji/go

To include the following backported fix:

https://github.com/kolyshkin/ugorji-go/commit/1cf431c13dec46596

which should fix this:

> 13:40:53 vendor/github.com/ugorji/go/codec/gen-helper.generated.go:1:
> possible malformed +build comment%!(EXTRA []interface {}=[])

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 09921ca33fb1cdb7648143e787a2a6222d844eb0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ca9d80ea6a07f54b6171cd3cb1a5125948fd5fdc
Component: engine
---
 components/engine/vendor.conf                                  | 3 ++-
 .../vendor/github.com/ugorji/go/codec/gen-helper.generated.go  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/engine/vendor.conf b/components/engine/vendor.conf
index c508c5fffd..2146b1fd39 100644
--- a/components/engine/vendor.conf
+++ b/components/engine/vendor.conf
@@ -57,7 +57,8 @@ github.com/samuel/go-zookeeper d0e0d8e11f318e000a8cc434616d69e329edc374
 github.com/deckarep/golang-set ef32fa3046d9f249d399f98ebaf9be944430fd1d
 github.com/coreos/etcd v3.2.1
 github.com/coreos/go-semver v0.2.0
-github.com/ugorji/go f1f1a805ed361a0e078bb537e4ea78cd37dcf065
+# fix for go vet (https://github.com/kolyshkin/ugorji-go/commit/1cf431c13dec46596)
+github.com/ugorji/go go111 https://github.com/kolyshkin/ugorji-go
 github.com/hashicorp/consul v0.5.2
 github.com/miekg/dns v1.0.7
 github.com/ishidawataru/sctp 07191f837fedd2f13d1ec7b5f885f0f3ec54b1cb
diff --git a/components/engine/vendor/github.com/ugorji/go/codec/gen-helper.generated.go b/components/engine/vendor/github.com/ugorji/go/codec/gen-helper.generated.go
index 22bce776bb..b92f9cb6ae 100644
--- a/components/engine/vendor/github.com/ugorji/go/codec/gen-helper.generated.go
+++ b/components/engine/vendor/github.com/ugorji/go/codec/gen-helper.generated.go
@@ -1,4 +1,4 @@
-// //+build ignore
+/* //+build ignore */
 
 // Copyright (c) 2012-2015 Ugorji Nwoke. All rights reserved.
 // Use of this source code is governed by a MIT license found in the LICENSE file.