From 2bf28b0b210fd173b8ce6b46b021715c0904d70d0692c1b82684a0c1ff23d5df Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Sat, 20 Jul 2019 15:54:08 +0000
Subject: [PATCH] Accepting request 717242 from home:cyphar:docker

- Move bash-completion to correct location.
- Update to Docker 18.09.8-ce. See upstream changelog in the packaged
  /usr/share/doc/packages/docker/CHANGELOG.md. bsc#1142160 CVE-2019-13509

OBS-URL: https://build.opensuse.org/request/show/717242
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=314
---
 _service                              |  4 ++--
 docker-18.09.7_ce_2d0083d657f8.tar.xz |  3 ---
 docker-18.09.8_ce_0dd43dd87fd5.tar.xz |  3 +++
 docker.changes                        |  7 +++++++
 docker.spec                           | 12 ++++++------
 5 files changed, 18 insertions(+), 11 deletions(-)
 delete mode 100644 docker-18.09.7_ce_2d0083d657f8.tar.xz
 create mode 100644 docker-18.09.8_ce_0dd43dd87fd5.tar.xz

diff --git a/_service b/_service
index d1ba9da..f92f464 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">18.09.7_ce_%h</param>
-    <param name="revision">v18.09.7</param>
+    <param name="versionformat">18.09.8_ce_%h</param>
+    <param name="revision">v18.09.8</param>
     <param name="filename">docker</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/docker-18.09.7_ce_2d0083d657f8.tar.xz b/docker-18.09.7_ce_2d0083d657f8.tar.xz
deleted file mode 100644
index 480859d..0000000
--- a/docker-18.09.7_ce_2d0083d657f8.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a84e46e28a2f23f7303146f650649e6ff18b3dbb96a842d538b6458f63d8a3ce
-size 9343716
diff --git a/docker-18.09.8_ce_0dd43dd87fd5.tar.xz b/docker-18.09.8_ce_0dd43dd87fd5.tar.xz
new file mode 100644
index 0000000..b4124d3
--- /dev/null
+++ b/docker-18.09.8_ce_0dd43dd87fd5.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e880c4ce4da35e4dd723c8b8e8dbedf95612e8bb1f423bbd900726fb47069068
+size 9344440
diff --git a/docker.changes b/docker.changes
index 9e39eea..bf6e56f 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jul 17 23:15:33 UTC 2019 - Aleksa Sarai <asarai@suse.com>
+
+- Move bash-completion to correct location.
+- Update to Docker 18.09.8-ce. See upstream changelog in the packaged
+  /usr/share/doc/packages/docker/CHANGELOG.md. bsc#1142160 CVE-2019-13509
+
 -------------------------------------------------------------------
 Fri Jun 28 01:21:19 UTC 2019 - Aleksa Sarai <asarai@suse.com>
 
diff --git a/docker.spec b/docker.spec
index d6abce3..ae34ff3 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 2d0083d657f8
-%define git_commit_epoch 1561655613
+%define git_version 0dd43dd87fd5
+%define git_commit_epoch 1563383036
 
 # 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 e7933d41e7b206756115aa9df5e0599fc5169742
 
 Name:           %{realname}%{name_suffix}
-Version:        18.09.7_ce
+Version:        18.09.8_ce
 Release:        0
 Summary:        The Moby-project Linux container runtime
 License:        Apache-2.0
@@ -374,7 +374,7 @@ install -Dd -m 0755 \
 	%{buildroot}%{_sysconfdir}/init.d \
 	%{buildroot}%{_sbindir}
 
-install -D -m0644 components/cli/contrib/completion/bash/docker "%{buildroot}%{_sysconfdir}/bash_completion.d/%{realname}"
+install -D -m0644 components/cli/contrib/completion/bash/docker "%{buildroot}%{_datarootdir}/bash-completion/completions/%{realname}"
 install -D -m0644 components/cli/contrib/completion/zsh/_docker "%{buildroot}%{_sysconfdir}/zsh_completion.d/%{realname}"
 
 #
@@ -487,11 +487,11 @@ getent group docker >/dev/null || groupadd -r docker
 
 %files bash-completion
 %defattr(-,root,root)
-%config %{_sysconfdir}/bash_completion.d/%{realname}
+%{_datarootdir}/bash-completion/completions/%{realname}
 
 %files zsh-completion
 %defattr(-,root,root)
-%config %{_sysconfdir}/zsh_completion.d/%{realname}
+%{_sysconfdir}/zsh_completion.d/%{realname}
 
 %files test
 %defattr(-,root,root)