From 72699be87f1fd2c0a784bf9ba1a2e5f76e8d8e456fb7e6ec7f8353a7eb1e7352 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Mon, 21 Dec 2020 07:22:36 +0000
Subject: [PATCH] - Update to Docker 19.03.14-ce. See upstream changelog in the
 packaged   /usr/share/doc/packages/docker/CHANGELOG.md. CVE-2020-15257
 bsc#1180243

  https://github.com/docker/docker-ce/releases/tag/v19.03.14

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=348
---
 _service                               |  4 ++--
 docker-19.03.12_ce_48a66213fe17.tar.xz |  3 ---
 docker-19.03.14_ce_5eb3275d4006.tar.xz |  3 +++
 docker.changes                         | 14 ++++++++++++++
 docker.spec                            | 17 +++++++++--------
 5 files changed, 28 insertions(+), 13 deletions(-)
 delete mode 100644 docker-19.03.12_ce_48a66213fe17.tar.xz
 create mode 100644 docker-19.03.14_ce_5eb3275d4006.tar.xz

diff --git a/_service b/_service
index d07ad3d..5af57a7 100644
--- a/_service
+++ b/_service
@@ -3,8 +3,8 @@
     <param name="url">https://github.com/docker/docker-ce.git</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="versionformat">19.03.12_ce_%h</param>
-    <param name="revision">v19.03.12</param>
+    <param name="versionformat">19.03.14_ce_%h</param>
+    <param name="revision">v19.03.14</param>
     <param name="filename">docker</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/docker-19.03.12_ce_48a66213fe17.tar.xz b/docker-19.03.12_ce_48a66213fe17.tar.xz
deleted file mode 100644
index fc86839..0000000
--- a/docker-19.03.12_ce_48a66213fe17.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:041fcb5d4f283a0de7b058b979441380869e680d065748fd72abfbeeedfd73cc
-size 10252156
diff --git a/docker-19.03.14_ce_5eb3275d4006.tar.xz b/docker-19.03.14_ce_5eb3275d4006.tar.xz
new file mode 100644
index 0000000..6392dee
--- /dev/null
+++ b/docker-19.03.14_ce_5eb3275d4006.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5bf99fd416c9a282dc97ac3568da541d378ea1c003a5680c07f11f91115d984d
+size 10421676
diff --git a/docker.changes b/docker.changes
index b625757..08170cc 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Dec 21 07:06:53 UTC 2020 - Aleksa Sarai <asarai@suse.com>
+
+- Update to Docker 19.03.14-ce. See upstream changelog in the packaged
+  /usr/share/doc/packages/docker/CHANGELOG.md. CVE-2020-15257 bsc#1180243
+
+  https://github.com/docker/docker-ce/releases/tag/v19.03.14
+
 -------------------------------------------------------------------
 Mon Dec 14 13:45:56 UTC 2020 - Robert Munteanu <rombert@apache.org>
 
@@ -11,6 +19,12 @@ Thu Nov 12 18:36:26 UTC 2020 - Michał Rostecki <mrostecki@suse.com>
   (boo#1178801, SLE-16460)
   * boo1178801-0001-Add-docker-interfaces-to-firewalld-docker-zone.patch
 
+-------------------------------------------------------------------
+Fri Sep 18 08:20:04 UTC 2020 - Aleksa Sarai <asarai@suse.com>
+
+- Update to Docker 19.03.13-ce. See upstream changelog in the packaged
+  /usr/share/doc/packages/docker/CHANGELOG.md. bsc#1176708
+
 -------------------------------------------------------------------
 Mon Aug  3 16:58:07 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
 
diff --git a/docker.spec b/docker.spec
index 86e04a0..9ff61c6 100644
--- a/docker.spec
+++ b/docker.spec
@@ -42,17 +42,17 @@
 # helpfully injects into our build environment from the changelog). If you want
 # to generate a new git_commit_epoch, use this:
 #  $ date --date="$(git show --format=fuller --date=iso $COMMIT_ID | grep -oP '(?<=^CommitDate: ).*')" '+%s'
-%define git_version 48a66213fe17
-%define git_commit_epoch 1592522265
+%define git_version 5eb3275d4006
+%define git_commit_epoch 1606849828
 
 # These are the git commits required. We verify them against the source to make
 # sure we didn't miss anything important when doing upgrades.
-%define required_containerd 7ad184331fa3e55e52b890ea95e65ba581ae3429
+%define required_containerd ea765aba0d05254012b0b9e595e995c09186427f
 %define required_dockerrunc dc9208a3303feef5b3839f4323d9beb36df0a9dd
-%define required_libnetwork 026aabaa659832804b01754aaadd2c0f420c68b6
+%define required_libnetwork 55e924b8a84231a065879156c0de95aefc5f5435
 
 Name:           %{realname}%{name_suffix}
-Version:        19.03.12_ce
+Version:        19.03.14_ce
 Release:        0
 Summary:        The Moby-project Linux container runtime
 License:        Apache-2.0
@@ -83,11 +83,11 @@ Patch300:       packaging-0001-revert-Remove-docker-prefix-for-containerd-and-ru
 Patch401:       bsc1073877-0001-apparmor-clobber-docker-default-profile-on-start.patch
 # SUSE-BACKPORT: Backport of https://github.com/docker/docker/pull/39121. bsc#1122469
 Patch402:       bsc1122469-0001-apparmor-allow-readby-and-tracedby.patch
+# SUSE-BACKPORT: Backport of https://github.com/moby/libnetwork/pull/2548. boo#1178801, SLE-16460
+Patch403:       boo1178801-0001-Add-docker-interfaces-to-firewalld-docker-zone.patch
 # SUSE-FEATURE: Add support to mirror inofficial/private registries
 #               (https://github.com/docker/docker/pull/34319)
 Patch500:       private-registry-0001-Add-private-registry-mirror-support.patch
-# SUSE-BACKPORT: Backport of https://github.com/moby/libnetwork/pull/2548. boo#1178801, SLE-16460
-Patch600:       boo1178801-0001-Add-docker-interfaces-to-firewalld-docker-zone.patch
 BuildRequires:  audit
 BuildRequires:  bash-completion
 BuildRequires:  ca-certificates
@@ -281,11 +281,12 @@ docker container runtime configuration for kubeadm
 %patch401 -p1
 # bsc#1122469
 %patch402 -p1
+# boo#1178801, SLE-16460
+%patch403 -p1
 %if "%flavour" == "kubic"
 # PATCH-SUSE: Mirror patch.
 %patch500 -p1
 %endif
-%patch600 -p1
 
 cp %{SOURCE7} .