From 9dd652a377c4166b39bc8a295830315870b238ade47782b459dec0fbaf597d20 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Fri, 13 Jan 2017 17:01:50 +0000
Subject: [PATCH] Accepting request 450174 from
 home:jordimassaguerpla:branch:Vc:update_docker_1_12_6

OBS-URL: https://build.opensuse.org/request/show/450174
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=164
---
 _service             | 4 ++--
 docker-1.12.5.tar.xz | 3 ---
 docker-1.12.6.tar.xz | 3 +++
 docker.changes       | 7 +++++++
 docker.spec          | 8 ++++----
 5 files changed, 16 insertions(+), 9 deletions(-)
 delete mode 100644 docker-1.12.5.tar.xz
 create mode 100644 docker-1.12.6.tar.xz

diff --git a/_service b/_service
index 0948918..6520ecd 100644
--- a/_service
+++ b/_service
@@ -3,8 +3,8 @@
     <param name="url">https://github.com/docker/docker.git</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="versionformat">1.12.5</param>
-    <param name="revision">v1.12.5</param>
+    <param name="versionformat">1.12.6</param>
+    <param name="revision">v1.12.6</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="file">docker-*.tar</param>
diff --git a/docker-1.12.5.tar.xz b/docker-1.12.5.tar.xz
deleted file mode 100644
index a16d2d6..0000000
--- a/docker-1.12.5.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:23c2068ecc2a8a283338143c76ffaf6987a93df767f7f6b6927f73310915485d
-size 11190552
diff --git a/docker-1.12.6.tar.xz b/docker-1.12.6.tar.xz
new file mode 100644
index 0000000..250ec17
--- /dev/null
+++ b/docker-1.12.6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ade8df08afa29834e772ae9061975801ff35bd2b4c7979df4ff4df8f22ffce8c
+size 11190120
diff --git a/docker.changes b/docker.changes
index 8df470a..51f2ed2 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 13 13:56:15 UTC 2017 - jmassaguerpla@suse.com
+
+- fix CVE-2016-9962 bsc#1012568 . Fix it by updating to 1.12.6
+  plus an extra commit to fix liverestore:
+  https://github.com/docker/docker/commit/97cd32a6a9076306baa637a29bba84c3f1f3d218 
+
 -------------------------------------------------------------------
 Wed Jan 11 12:47:16 UTC 2017 - jmassaguerpla@suse.com
 
diff --git a/docker.spec b/docker.spec
index bda3aa8..82d8c07 100644
--- a/docker.spec
+++ b/docker.spec
@@ -35,8 +35,8 @@
 %global docker_migration_testfile %{docker_store}/.suse-image-migration-v1to2-complete
 %global docker_migration_warnfile %{docker_store}/docker-update-message.txt
 %define docker_graph              %{docker_store}/graph
-%define git_version 8eab29e
-%define version_unconverted 1.12.5
+%define git_version 78d1802
+%define version_unconverted 1.12.6
 %define __arch_install_post export NO_BRP_STRIP_DEBUG=true
 # When upgrading to a new version requires the service not to be restarted
 # Due to a long migration process update last_migration_version to the new version
@@ -44,7 +44,7 @@
 # 1.10.1
 %global last_migration_version 1.10.1
 Name:           docker
-Version:        1.12.5
+Version:        1.12.6
 Release:        0
 Summary:        The Linux container runtime
 License:        Apache-2.0
@@ -88,7 +88,7 @@ Requires:       ca-certificates-mozilla
 # Dockerfile to ensure that we don't use a slightly incompatible version of
 # runC or containerd (which would be bad).
 Requires:       containerd = 0.2.5+gitr569_2a5e70c
-Requires:       runc = 0.1.1+gitr2818_f59ba3cdd76f
+Requires:       runc = 0.1.1+gitr2819_50a19c6
 # Provides mkfs.ext4 - used by Docker when devicemapper storage driver is used
 Requires:       e2fsprogs
 Requires:       git-core >= 1.7