From 56c9b0f980f9b6100df55f01a687e8451a8d4a92fab9b95cb591955d2466f14e Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Wed, 2 Oct 2019 00:37:03 +0000
Subject: [PATCH] Accepting request 734438 from home:cyphar:docker

- Update to Docker 19.03.2-ce. See upstream changelog in the packaged
  /usr/share/doc/packages/docker/CHANGELOG.md. bsc#1150397

OBS-URL: https://build.opensuse.org/request/show/734438
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=320
---
 _service                              |  4 ++--
 docker-19.03.1_ce_74b1e89e8ac6.tar.xz |  3 ---
 docker-19.03.2_ce_6a30dfca0366.tar.xz |  3 +++
 docker.changes                        |  6 ++++++
 docker.spec                           | 11 ++++++-----
 5 files changed, 17 insertions(+), 10 deletions(-)
 delete mode 100644 docker-19.03.1_ce_74b1e89e8ac6.tar.xz
 create mode 100644 docker-19.03.2_ce_6a30dfca0366.tar.xz

diff --git a/_service b/_service
index 5ad56bf..f6dddfb 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.1_ce_%h</param>
-    <param name="revision">v19.03.1</param>
+    <param name="versionformat">19.03.2_ce_%h</param>
+    <param name="revision">v19.03.2</param>
     <param name="filename">docker</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/docker-19.03.1_ce_74b1e89e8ac6.tar.xz b/docker-19.03.1_ce_74b1e89e8ac6.tar.xz
deleted file mode 100644
index 346c32f..0000000
--- a/docker-19.03.1_ce_74b1e89e8ac6.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ccedcf67eeafd17d390f03b696c8d262adc697e0b806a56cb32c11180cb544e4
-size 9978776
diff --git a/docker-19.03.2_ce_6a30dfca0366.tar.xz b/docker-19.03.2_ce_6a30dfca0366.tar.xz
new file mode 100644
index 0000000..c151b62
--- /dev/null
+++ b/docker-19.03.2_ce_6a30dfca0366.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c31df0bc4328d4a3977d1dc30ed3c67a234debcfb5087c9801cb00fe4f25847
+size 9986852
diff --git a/docker.changes b/docker.changes
index 916929b..8d1953a 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  1 23:54:25 UTC 2019 - Aleksa Sarai <asarai@suse.com>
+
+- Update to Docker 19.03.2-ce. See upstream changelog in the packaged
+  /usr/share/doc/packages/docker/CHANGELOG.md. bsc#1150397
+
 -------------------------------------------------------------------
 Tue Jul 30 05:14:44 UTC 2019 - Aleksa Sarai <asarai@suse.com>
 
diff --git a/docker.spec b/docker.spec
index bda0e2b..4ce4050 100644
--- a/docker.spec
+++ b/docker.spec
@@ -42,8 +42,8 @@
 # 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 74b1e89e8ac6
-%define git_commit_epoch 1564087121
+%define git_version 6a30dfca0366
+%define git_commit_epoch 1567053734
 
 # These are the git commits required. We verify them against the source to make
 # sure we didn't miss anything important when doing upgrades.
@@ -52,7 +52,7 @@
 %define required_libnetwork fc5a7d91d54cc98f64fc28f9e288b46a0bee756c
 
 Name:           %{realname}%{name_suffix}
-Version:        19.03.1_ce
+Version:        19.03.2_ce
 Release:        0
 Summary:        The Moby-project Linux container runtime
 License:        Apache-2.0
@@ -422,8 +422,9 @@ getent passwd dockremap >/dev/null || \
 # "useradd -r" doesn't add sub[ug]ids so we manually add some. Hopefully there
 # aren't any conflicts here, because usermod doesn't provide the same "get
 # unusued range" feature that dockremap does.
-grep -q '^dockremap:' /etc/sub[ug]id || \
-	usermod -v 100000000-100065536 -w 100000000-100065536 dockremap
+touch /etc/sub{uid,gid}
+grep -q '^dockremap:' /etc/sub{uid,gid} || \
+	usermod -v 100000000-200000000 -w 100000000-200000000 dockremap
 
 %service_add_pre %{realname}.service