From 517a30b48d7b483e27eb3c3328356a8e83272988 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 14 Dec 2018 02:04:33 +0100
Subject: [PATCH] Bump Golang 1.11.3 (CVE-2018-16875)
go1.11.3 (released 2018/12/14)
- crypto/x509: CPU denial of service in chain validation golang/go#29233
- cmd/go: directory traversal in "go get" via curly braces in import paths golang/go#29231
- cmd/go: remote command execution during "go get -u" golang/go#29230
See the Go 1.11.3 milestone on the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.11.3
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
Makefile | 2 +-
deb/Makefile | 2 +-
image/Makefile | 2 +-
rpm/Makefile | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index bb12174fdf..e2483ab596 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ VERSION?=0.0.0-dev
DOCKER_GITCOMMIT:=abcdefg
ARCH=$(shell uname -m)
STATIC_VERSION=$(shell static/gen-static-ver $(ENGINE_DIR) $(VERSION))
-GO_VERSION:=1.10.6
+GO_VERSION:=1.11.3
DEFAULT_PRODUCT_LICENSE:=Community Engine
PLATFORM=Docker Engine - Community
BUILDTIME=$(shell date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')
diff --git a/deb/Makefile b/deb/Makefile
index c8e4a6430b..a6400708f7 100644
--- a/deb/Makefile
+++ b/deb/Makefile
@@ -6,7 +6,7 @@ CLI_DIR:=$(CURDIR)/../../cli
GITCOMMIT?=$(shell cd $(CLI_DIR) && git rev-parse --short HEAD)
VERSION?=0.0.0-dev
GO_BASE_IMAGE=golang
-GO_VERSION:=1.10.6
+GO_VERSION:=1.11.3
GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)
DEB_VERSION=$(shell ./gen-deb-ver $(CLI_DIR) "$(VERSION)")
CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown
diff --git a/image/Makefile b/image/Makefile
index 5b3620f337..0ed668f48f 100644
--- a/image/Makefile
+++ b/image/Makefile
@@ -3,7 +3,7 @@ ENGINE_DIR:=$(CURDIR)/../../engine
CLI_DIR:=$(CURDIR)/../../cli
VERSION?=0.0.0-dev
GO_BASE_IMAGE=golang
-GO_VERSION:=1.10.6
+GO_VERSION:=1.11.3
ENGINE_GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)
STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
DOCKER_HUB_ORG?=dockereng
diff --git a/rpm/Makefile b/rpm/Makefile
index e4a48ccccb..eb299dd4f4 100644
--- a/rpm/Makefile
+++ b/rpm/Makefile
@@ -6,7 +6,7 @@ CLI_DIR:=$(CURDIR)/../../cli
GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD)
VERSION?=0.0.0-dev
GO_BASE_IMAGE=golang
-GO_VERSION:=1.10.6
+GO_VERSION:=1.11.3
GO_IMAGE?=$(GO_BASE_IMAGE):$(GO_VERSION)
GEN_RPM_VER=$(shell ./gen-rpm-ver $(CLI_DIR) $(VERSION))
CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v alpine chown