From a3ed866e382d3dec4a136b90b62f9b8dc73c879f Mon Sep 17 00:00:00 2001
From: David Michael <dm0@redhat.com>
Date: Nov 29 2018 13:56:41 +0000
Subject: Update to 18.06.1


This should fix https://bugzilla.redhat.com/show_bug.cgi?id=1654325
since the runc snapshot was after the first fix was applied and
before it broke again.

---

diff --git a/.gitignore b/.gitignore
index 69cc20e..47ab0f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-/0ffa8257ec673ed6849b73b03fb01b0cac90fdb3.tar.gz
-/a79d3687931697244b8e03485bf7b2042f8ec6b6.tar.gz
-/a88b6319614de846458750ff882723479ca7b1a1.tar.gz
-/ad0f5255060d36872be04de22f8731f38ef2d7b1.tar.gz
+/3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b.tar.gz
+/468a545b9edcd5932818eb9de8e72413e616e86e.tar.gz
+/69663f0bd4b60df09991c08812a60108003fa340.tar.gz
+/e68fc7a215d7133c34aa18e3b72b4a21fd0c6136.tar.gz
 /fec3683b971d9c3ef73f284f176672c44b448662.tar.gz
diff --git a/moby-engine.spec b/moby-engine.spec
index 0ad2727..07c73a6 100644
--- a/moby-engine.spec
+++ b/moby-engine.spec
@@ -15,22 +15,22 @@
 
 # moby / docker-ce / cli
 %global git_moby https://github.com/%{service_name}/%{service_name}-ce
-%global commit_moby 0ffa8257ec673ed6849b73b03fb01b0cac90fdb3
+%global commit_moby e68fc7a215d7133c34aa18e3b72b4a21fd0c6136
 %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7})
 
 # docker-runc
 %global git_runc https://github.com/opencontainers/runc
-%global commit_runc ad0f5255060d36872be04de22f8731f38ef2d7b1
+%global commit_runc 69663f0bd4b60df09991c08812a60108003fa340
 %global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7})
 
 # docker-containerd
 %global git_containerd https://github.com/containerd/containerd
-%global commit_containerd a88b6319614de846458750ff882723479ca7b1a1
+%global commit_containerd 468a545b9edcd5932818eb9de8e72413e616e86e
 %global shortcommit_containerd %(c=%{commit_containerd}; echo ${c:0:7})
 
 # docker-proxy / libnetwork
 %global git_libnetwork https://github.com/%{service_name}/libnetwork
-%global commit_libnetwork a79d3687931697244b8e03485bf7b2042f8ec6b6
+%global commit_libnetwork 3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b
 %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7})
 
 # tini
@@ -39,8 +39,8 @@
 %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7})
 
 Name: %{newname}-engine
-Version: 18.06.0
-Release: 2.ce.git%{shortcommit_moby}%{?dist}
+Version: 18.06.1
+Release: 1.ce.git%{shortcommit_moby}%{?dist}
 Summary: The open-source application container engine
 License: ASL 2.0
 # no golang / go-md2man for ppc64
@@ -328,6 +328,12 @@ done
 %{_datadir}/nano/Dockerfile.nanorc
 
 %changelog
+* Thu Nov 29 2018 David Michael <dm0@redhat.com> - 18.06.1-1.ce.gite68fc7a
+- Update docker-ce to commit e68fc7a (version 18.06.1).
+- Update docker-runc to commit 69663f0.
+- Update docker-containerd to commit 468a545 (version 1.1.2).
+- Update docker-proxy to commit 3ac297b.
+
 * Mon Nov 12 2018 Marcin Skarbek <rpm@skarbek.name> - 18.06.0-2.ce.git0ffa825
 - add configuration file
 - update service file
diff --git a/sources b/sources
index 432023c..752dfb8 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-SHA512 (0ffa8257ec673ed6849b73b03fb01b0cac90fdb3.tar.gz) = 4045d655548bb3d9cced82a7c27014a48343d91af47cd06a9128bfec40fe61c0688716246422128f963af9fa72eeab7c3d8e7c6ab0a2aac568a95edadc03b54a
-SHA512 (a79d3687931697244b8e03485bf7b2042f8ec6b6.tar.gz) = df6e608ecf04e81f5df16e18677fe0a2dc3402eb7b74d5c718b240937ed2c9f6781988881147bb7f30914a2fdf0c1c93092b71d45405e534a8e83cc5b763da0a
-SHA512 (a88b6319614de846458750ff882723479ca7b1a1.tar.gz) = 0e43133030c924c1c06979eaff52790fc74332e47aeaf0e6f3ce3f0a3abf5825288eab746bcfafe2aa14387f5cbd8b04a317a454596c12c6ab772e4f8d6cc25e
-SHA512 (ad0f5255060d36872be04de22f8731f38ef2d7b1.tar.gz) = 93b2c9a063a5f403f38ee9da535464456a07ea103a24e15d51105af93887f7ac18073bf6c9be87d9612087d6f6e78f4ce141ad2bc2bcdc0c70c30dfe052f8d76
+SHA512 (3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b.tar.gz) = 21d3d1bd8aafeab51a3e0a14ada4d559b5b113a48d315e91f7d70e4fa839f5c92d4068b38c28bf6929da9c11cfc61703bafc7148f64b784208d61fa14ee4545d
+SHA512 (468a545b9edcd5932818eb9de8e72413e616e86e.tar.gz) = 0c3cb261a535826f281af2d2df7e5c93e7d37139d5b709d7534148b9e706db56704d06b81a9e76acc2e86180f37475d566b8ddde990bbaae424af70206602347
+SHA512 (69663f0bd4b60df09991c08812a60108003fa340.tar.gz) = 9a55bdb8e39830f46cceff48970b7688139927552e3d268b9ef4a6e640ffc3d95164b99c5b05d07d295bedc2ea22daf6062fd520df1548d78b1d481fd928f1e3
+SHA512 (e68fc7a215d7133c34aa18e3b72b4a21fd0c6136.tar.gz) = cbeb029bbdcb6d7bd83b0257fe51fc9434fed18ac1c266e79fba43be663c3cfb38434ba2dbca055a0524b58e767b4715d1f59a79b66cf13406fb10f511423cd0
 SHA512 (fec3683b971d9c3ef73f284f176672c44b448662.tar.gz) = ee46d21467f8bacb4e8be72f5dfcbb23c1964286e90b4b3d3bf67dbbf79a337968ac8a0042a8191e329a65398b20ea160aae3ae5ef20ee03ebae11c2083d7621