aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2017-01-22 22:39:55 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2017-01-23 15:50:54 +0100
commitaf96b7fd097c7ddf1718085c1c66d3a2d85ff031 (patch)
treebb6947c869c7b0d368cf472ea631403f1dee32ff
parent5bd3fdec1153718ac4ac77dcd99ec29053ac858d (diff)
downloadbuildroot-af96b7fd097c7ddf1718085c1c66d3a2d85ff031.tar.gz
buildroot-af96b7fd097c7ddf1718085c1c66d3a2d85ff031.tar.bz2
docker-engine: security bump to version 1.12.6
Fixes runC privilege escalation (CVE-2016-9962). Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> (cherry picked from commit 157ddf77e403c6ee00faef44fc32f8f679964204)
-rw-r--r--package/docker-engine/docker-engine.hash2
-rw-r--r--package/docker-engine/docker-engine.mk4
2 files changed, 3 insertions, 3 deletions
diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash
index 6697d8a30d..5e09453e49 100644
--- a/package/docker-engine/docker-engine.hash
+++ b/package/docker-engine/docker-engine.hash
@@ -1,2 +1,2 @@
# Locally calculated
-sha256 81b337368efafb631a75f6ad5469413fd5828ce672592c374adf894dc05abd38 docker-engine-v1.12.5.tar.gz
+sha256 0413f3513c2a6842ed9cf837154c8a722e9b34cb36b33430348489baa183707e docker-engine-v1.12.6.tar.gz
diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
index 2cd71dd898..d575662dde 100644
--- a/package/docker-engine/docker-engine.mk
+++ b/package/docker-engine/docker-engine.mk
@@ -4,8 +4,8 @@
#
################################################################################
-DOCKER_ENGINE_VERSION = v1.12.5
-DOCKER_ENGINE_COMMIT = 7392c3b0ce0f9d3e918a321c66668c5d1ef4f689
+DOCKER_ENGINE_VERSION = v1.12.6
+DOCKER_ENGINE_COMMIT = 78d18021ecba00c00730dec9d56de6896f9e708d
DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION))
DOCKER_ENGINE_LICENSE = Apache-2.0