From d29fbccf86d015be37d42a312d4135e507c2ba62 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 08 2017 19:30:16 +0000
Subject: import docker-distribution-2.6.2-1.git48294d9.el7


---

diff --git a/.docker-distribution.metadata b/.docker-distribution.metadata
index 7c122fc..4a21030 100644
--- a/.docker-distribution.metadata
+++ b/.docker-distribution.metadata
@@ -1 +1 @@
-50f0c322755fb62afab93086e64bf2ded0ae82da SOURCES/a25b9ef0c9fe242ac04bb20d3a028442b7d266b6.tar.gz
+3e71744d1567c26475430634b999c6dfb5d52a3d SOURCES/48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89.tar.gz
diff --git a/.gitignore b/.gitignore
index d0cc85e..d1a5151 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/a25b9ef0c9fe242ac04bb20d3a028442b7d266b6.tar.gz
+SOURCES/48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89.tar.gz
diff --git a/SOURCES/docker-distribution.service b/SOURCES/docker-distribution.service
index f2f1d4b..c020c78 100644
--- a/SOURCES/docker-distribution.service
+++ b/SOURCES/docker-distribution.service
@@ -8,3 +8,4 @@ Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
+After=network.target
diff --git a/SPECS/docker-distribution.spec b/SPECS/docker-distribution.spec
index b9911fe..55c98c8 100644
--- a/SPECS/docker-distribution.spec
+++ b/SPECS/docker-distribution.spec
@@ -33,21 +33,21 @@
 # https://github.com/docker/distribution
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
-%global commit0         a25b9ef0c9fe242ac04bb20d3a028442b7d266b6
+%global commit0         48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89
 %global shortcommit0    %(c=%{commit0}; echo ${c:0:7})
 
 Name:           %{project}-%{repo}
-Version:        2.6.1
-Release:        1.1.git%{shortcommit0}%{?dist}
+Version:        2.6.2
+Release:        1.git%{shortcommit0}%{?dist}
 Summary:        Docker toolset to pack, ship, store, and deliver content
 License:        ASL 2.0
 URL:            https://%{provider_prefix}
 Source0:        https://%{provider_prefix}/archive/%{commit0}.tar.gz
 Source1:        %{name}.service
 Source2:        config.yml
-BuildRequires: git
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} >= 1.6.2
-BuildRequires: systemd
+BuildRequires:  git
+BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} >= 1.6.2
+BuildRequires:  systemd
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -339,6 +339,10 @@ make test
 %endif
 
 %changelog
+* Tue Aug 08 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2.6.2-1.git48294d9
+- Resolves: #1474893 CVE-2017-11468, #1478282
+- rebase to v2.6.2
+
 * Fri May 05 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2.6.1-1.1.gita25b9ef
 - rebase to v2.6.1