From 4b977ec29e89d9199091017c4108b0940c11e9ff Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 16 2018 15:46:46 +0000
Subject: import docker-1.13.1-74.git6e3bb8e.el7


---

diff --git a/.docker.metadata b/.docker.metadata
index 452d6e0..a056889 100644
--- a/.docker.metadata
+++ b/.docker.metadata
@@ -1,9 +1,9 @@
+f14a0342d360a9db8d2c0f40afa79b81e7408a2d SOURCES/6e3bb8e8721429ad4018bf633bff82eabdb6ad35.tar.gz
 9e9e55d86e9df69ce17c8186d6ead913273f02cf SOURCES/container-storage-setup-e0997c3.tar.gz
-402d105d5ed40a9820d41b3f677df07c566393c9 SOURCES/containerd-296f1f8.tar.gz
-551b9f749d6fd3c466dec12b34ac17e484c45a73 SOURCES/dded7126c42fb99f901b9e998b014452ef8daa82.tar.gz
-97aa4658bff77a6b8a1635ec68b09818e3d7733b SOURCES/docker-lvm-plugin-6675634.tar.gz
+3d4e57f6236139b11acce831d5a8b8dc9555ec46 SOURCES/containerd-c769d58.tar.gz
+c5e6169ea101c97d94257f48fa227f5ff0501454 SOURCES/docker-lvm-plugin-20a1f68.tar.gz
 0beb6283e30f1e87e907576f4571ccb0a48b6be5 SOURCES/docker-novolume-plugin-385ec70.tar.gz
-1a3bb20b481ba9b9d7ad07a2af8a12df3fdb47d0 SOURCES/libnetwork-19279f0.tar.gz
+34d64260ca3469bd7cb9ac3013fd14a589d0e53b SOURCES/libnetwork-d00ceed.tar.gz
 965d64f5a81c3a428ca3b29495ecf66748c67c1f SOURCES/rhel-push-plugin-af9107b.tar.gz
 b76eb87af71b8264700a2bda5064a133e54b82e1 SOURCES/runc-5eda6f6.tar.gz
 7941233b1ed34afdc074e74ab26a86dea20ee7d4 SOURCES/tini-fec3683.tar.gz
diff --git a/.gitignore b/.gitignore
index 6e7b60a..8ef390f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
+SOURCES/6e3bb8e8721429ad4018bf633bff82eabdb6ad35.tar.gz
 SOURCES/container-storage-setup-e0997c3.tar.gz
-SOURCES/containerd-296f1f8.tar.gz
-SOURCES/dded7126c42fb99f901b9e998b014452ef8daa82.tar.gz
-SOURCES/docker-lvm-plugin-6675634.tar.gz
+SOURCES/containerd-c769d58.tar.gz
+SOURCES/docker-lvm-plugin-20a1f68.tar.gz
 SOURCES/docker-novolume-plugin-385ec70.tar.gz
-SOURCES/libnetwork-19279f0.tar.gz
+SOURCES/libnetwork-d00ceed.tar.gz
 SOURCES/rhel-push-plugin-af9107b.tar.gz
 SOURCES/runc-5eda6f6.tar.gz
 SOURCES/tini-fec3683.tar.gz
diff --git a/SOURCES/docker.service b/SOURCES/docker.service
index 989763e..535487c 100644
--- a/SOURCES/docker.service
+++ b/SOURCES/docker.service
@@ -3,11 +3,12 @@ Description=Docker Application Container Engine
 Documentation=http://docs.docker.com
 After=network.target rhel-push-plugin.socket registries.service
 Wants=docker-storage-setup.service
+Requires=rhel-push-plugin.socket registries.service
 Requires=docker-cleanup.timer
 
 [Service]
 Type=notify
-NotifyAccess=all
+NotifyAccess=main
 EnvironmentFile=-/run/containers/registries.conf
 EnvironmentFile=-/etc/sysconfig/docker
 EnvironmentFile=-/etc/sysconfig/docker-storage
@@ -18,6 +19,7 @@ Environment=PATH=/usr/libexec/docker:/usr/bin:/usr/sbin
 ExecStart=/usr/bin/dockerd-current \
           --add-runtime docker-runc=/usr/libexec/docker/docker-runc-current \
           --default-runtime=docker-runc \
+          --authorization-plugin=rhel-push-plugin \
           --exec-opt native.cgroupdriver=systemd \
           --userland-proxy-path=/usr/libexec/docker/docker-proxy-current \
           --init-path=/usr/libexec/docker/docker-init-current \
diff --git a/SOURCES/docker.sysconfig b/SOURCES/docker.sysconfig
index b08f26b..68e1d2a 100644
--- a/SOURCES/docker.sysconfig
+++ b/SOURCES/docker.sysconfig
@@ -7,8 +7,7 @@ if [ -z "${DOCKER_CERT_PATH}" ]; then
 fi
 
 # Do not add registries in this file anymore. Use /etc/containers/registries.conf
-# from the atomic-registries package.
-#
+# instead. For more information reference the registries.conf(5) man page.
 
 # Location used for temporary files, such as those created by
 # docker load and build operations. Default is /var/lib/docker/tmp
diff --git a/SPECS/docker.spec b/SPECS/docker.spec
index d1fa714..6d08514 100644
--- a/SPECS/docker.spec
+++ b/SPECS/docker.spec
@@ -1,16 +1,17 @@
-%if 0%{?fedora}
-%global with_devel 1
-%global with_unit_test 1
-%else
 %global with_devel 0
 %global with_unit_test 0
-%endif
+%global with_debug 1
 
-%global with_unit_test 1
 # modifying the dockerinit binary breaks the SHA1 sum check by docker
 %global __os_install_post %{_rpmconfigdir}/brp-compress
 
-#debuginfo not supported with Go
+%if 0%{?with_debug}
+%global _find_debuginfo_dwz_opts %{nil}
+%global _dwz_low_mem_die_limit 0
+%else
+%global debug_package   %{nil}
+%endif
+
 %global provider_tld com
 %global provider github
 %global project docker
@@ -24,7 +25,7 @@
 
 # docker
 %global git_docker https://github.com/projectatomic/docker
-%global commit_docker dded7126c42fb99f901b9e998b014452ef8daa82
+%global commit_docker 6e3bb8e8721429ad4018bf633bff82eabdb6ad35
 %global shortcommit_docker %(c=%{commit_docker}; echo ${c:0:7})
 # docker_branch used in %%check
 %global docker_branch %{name}-%{version}
@@ -46,13 +47,13 @@
 %global shortcommit_novolume %(c=%{commit_novolume}; echo ${c:0:7})
 
 # rhel-push-plugin
-#%global git_rhel_push https://github.com/projectatomic/rhel-push-plugin
-#%global commit_rhel_push af9107b2aedb235338e32a3c19507cad3f218b0d
-#%global shortcommit_rhel_push %(c=%{commit_rhel_push}; echo ${c:0:7})
+%global git_rhel_push https://github.com/projectatomic/rhel-push-plugin
+%global commit_rhel_push af9107b2aedb235338e32a3c19507cad3f218b0d
+%global shortcommit_rhel_push %(c=%{commit_rhel_push}; echo ${c:0:7})
 
 # docker-lvm-plugin
 %global git_lvm https://github.com/projectatomic/%{repo}-lvm-plugin
-%global commit_lvm 66756347828c00ea1cae119e3ba5ece29f8c4582
+%global commit_lvm 20a1f68da4daecd1f7f59c5b794dd25c2f50ba02
 %global shortcommit_lvm %(c=%{commit_lvm}; echo ${c:0:7})
 
 # docker-runc
@@ -62,7 +63,7 @@
 
 # docker-containerd
 %global git_containerd https://github.com/projectatomic/containerd
-%global commit_containerd 296f1f80d6c6a83cc625163f863e53d3287328ee
+%global commit_containerd c769d58ebfebb896859d1efd016bb455bd4134f3
 %global shortcommit_containerd %(c=%{commit_containerd}; echo ${c:0:7})
 
 # docker-init
@@ -72,20 +73,20 @@
 
 # docker-proxy
 %global git_libnetwork https://github.com/docker/libnetwork
-%global commit_libnetwork 19279f0492417475b6bfbd0aa529f73e8f178fb5
+%global commit_libnetwork d00ceed44cc447c77f25cdf5d59e83163bdcb4c9
 %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7})
 
 Name: %{repo}
 Epoch: 2
 Version: 1.13.1
-Release: 68.git%{shortcommit_docker}%{?dist}
+Release: 74.git%{shortcommit_docker}%{?dist}
 Summary: Automates deployment of containerized applications
 License: ASL 2.0
 URL: https://%{import_path}
 Source0: %{git_docker}/archive/%{commit_docker}.tar.gz
 Source2: %{git_dss}/archive/%{commit_dss}/container-storage-setup-%{shortcommit_dss}.tar.gz
 Source4: %{git_novolume}/archive/%{commit_novolume}/%{repo}-novolume-plugin-%{shortcommit_novolume}.tar.gz
-#Source5: %{git_rhel_push}/archive/%{commit_rhel_push}/rhel-push-plugin-%{shortcommit_rhel_push}.tar.gz
+Source5: %{git_rhel_push}/archive/%{commit_rhel_push}/rhel-push-plugin-%{shortcommit_rhel_push}.tar.gz
 Source6: %{git_lvm}/archive/%{commit_lvm}/%{repo}-lvm-plugin-%{shortcommit_lvm}.tar.gz
 Source8: %{name}.service
 Source9: %{name}.sysconfig
@@ -123,6 +124,9 @@ BuildRequires: go-md2man >= 1.0.4
 BuildRequires: pkgconfig(systemd)
 BuildRequires: libseccomp-devel
 BuildRequires: libassuan-devel
+%if 0%{?centos}
+Requires: subscription-manager-rhsm-certificates
+%endif # centos
 Requires: %{name}-common = %{epoch}:%{version}-%{release}
 Requires: %{name}-client = %{epoch}:%{version}-%{release}
 Requires(post): systemd
@@ -179,9 +183,9 @@ Requires: device-mapper-libs >= 7:1.02.97
 Requires: oci-umount >= 2:2.3.3-3
 Requires: oci-register-machine >= 1:0-5.13
 Requires: oci-systemd-hook >= 1:0.1.4-9
-#Requires: %{name}-rhel-push-plugin = %{epoch}:%{version}-%{release}
+Requires: %{name}-rhel-push-plugin = %{epoch}:%{version}-%{release}
 Requires: xz
-#Requires: atomic-registries
+Requires: atomic-registries
 Requires: container-selinux >= 2:2.51-1
 Requires: container-storage-setup >= 0.9.0-1
 # rhbz#1214070 - update deps for d-s-s
@@ -231,16 +235,16 @@ local volumes defined. In particular, the plugin will block `docker run` with:
 
 The only thing allowed will be just bind mounts.
 
-#%package rhel-push-plugin
-#License: GPLv2
-#Summary: Avoids pushing a RHEL-based image to docker.io registry
+%package rhel-push-plugin
+License: GPLv2
+Summary: Avoids pushing a RHEL-based image to docker.io registry
 
-#%description rhel-push-plugin
-#In order to use this plugin you must be running at least Docker 1.10 which
-#has support for authorization plugins.
+%description rhel-push-plugin
+In order to use this plugin you must be running at least Docker 1.10 which
+has support for authorization plugins.
 
-#This plugin avoids any RHEL based image to be pushed to the default docker.io
-#registry preventing users to violate the RH subscription agreement.
+This plugin avoids any RHEL based image to be pushed to the default docker.io
+registry preventing users to violate the RH subscription agreement.
 
 %package lvm-plugin
 License: LGPLv3
@@ -263,7 +267,7 @@ tar zxf %{SOURCE2}
 tar zxf %{SOURCE4}
 
 # untar rhel-push-plugin
-#tar zxf %{SOURCE5}
+tar zxf %{SOURCE5}
 
 # untar lvm-plugin
 tar zxf %{SOURCE6}
@@ -321,7 +325,7 @@ pushd _build
   mkdir -p src/%{provider}.%{provider_tld}/{%{name},projectatomic}
   ln -s $(dirs +1 -l) src/%{import_path}
   ln -s $(dirs +1 -l)/%{repo}-novolume-plugin-%{commit_novolume} src/%{provider}.%{provider_tld}/projectatomic/%{repo}-novolume-plugin
-#  ln -s $(dirs +1 -l)/rhel-push-plugin-%{commit_rhel_push} src/%{provider}.%{provider_tld}/projectatomic/rhel-push-plugin
+  ln -s $(dirs +1 -l)/rhel-push-plugin-%{commit_rhel_push} src/%{provider}.%{provider_tld}/projectatomic/rhel-push-plugin
   ln -s $(dirs +1 -l)/%{repo}-lvm-plugin-%{commit_lvm} src/%{provider}.%{provider_tld}/projectatomic/%{repo}-lvm-plugin
 popd
 
@@ -330,10 +334,10 @@ pushd $(pwd)/_build/src
 %gobuild %{provider}.%{provider_tld}/projectatomic/%{repo}-novolume-plugin
 popd
 
-#export GOPATH=$(pwd)/rhel-push-plugin-%{commit_rhel_push}/Godeps/_workspace:$(pwd)/_build
-#pushd $(pwd)/_build/src
-#%gobuild %{provider}.%{provider_tld}/projectatomic/rhel-push-plugin
-#popd
+export GOPATH=$(pwd)/rhel-push-plugin-%{commit_rhel_push}/Godeps/_workspace:$(pwd)/_build
+pushd $(pwd)/_build/src
+%gobuild %{provider}.%{provider_tld}/projectatomic/rhel-push-plugin
+popd
 
 export GOPATH=$(pwd)/%{repo}-lvm-plugin-%{commit_lvm}/Godeps/_workspace:$(pwd)/_build
 pushd $(pwd)/_build/src
@@ -347,7 +351,7 @@ export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath}
 # build %%{name} manpages
 man/md2man-all.sh
 go-md2man -in %{repo}-novolume-plugin-%{commit_novolume}/man/%{repo}-novolume-plugin.8.md -out %{repo}-novolume-plugin.8
-#go-md2man -in rhel-push-plugin-%{commit_rhel_push}/man/rhel-push-plugin.8.md -out rhel-push-plugin.8
+go-md2man -in rhel-push-plugin-%{commit_rhel_push}/man/rhel-push-plugin.8.md -out rhel-push-plugin.8
 go-md2man -in %{repo}-lvm-plugin-%{commit_lvm}/man/%{repo}-lvm-plugin.8.md -out %{repo}-lvm-plugin.8
 
 # build %%{name} binary
@@ -504,12 +508,12 @@ install -d %{buildroot}%{_mandir}/man8
 install -p -m 644 %{repo}-novolume-plugin.8 %{buildroot}%{_mandir}/man8
 
 # install rhel-push-plugin executable, unitfile, socket and man
-#install -d %{buildroot}%{_libexecdir}/%{repo}
-#install -p -m 755 _build/src/rhel-push-plugin %{buildroot}%{_libexecdir}/%{repo}/rhel-push-plugin
-#install -p -m 644 rhel-push-plugin-%{commit_rhel_push}/systemd/rhel-push-plugin.service %{buildroot}%{_unitdir}/rhel-push-plugin.service
-#install -p -m 644 rhel-push-plugin-%{commit_rhel_push}/systemd/rhel-push-plugin.socket %{buildroot}%{_unitdir}/rhel-push-plugin.socket
-#install -d %{buildroot}%{_mandir}/man8
-#install -p -m 644 rhel-push-plugin.8 %{buildroot}%{_mandir}/man8
+install -d %{buildroot}%{_libexecdir}/%{repo}
+install -p -m 755 _build/src/rhel-push-plugin %{buildroot}%{_libexecdir}/%{repo}/rhel-push-plugin
+install -p -m 644 rhel-push-plugin-%{commit_rhel_push}/systemd/rhel-push-plugin.service %{buildroot}%{_unitdir}/rhel-push-plugin.service
+install -p -m 644 rhel-push-plugin-%{commit_rhel_push}/systemd/rhel-push-plugin.socket %{buildroot}%{_unitdir}/rhel-push-plugin.socket
+install -d %{buildroot}%{_mandir}/man8
+install -p -m 644 rhel-push-plugin.8 %{buildroot}%{_mandir}/man8
 
 # install %%{repo}-lvm-plugin executable, unitfile, socket and man
 install -d %{buildroot}/%{_libexecdir}/%{repo}
@@ -589,14 +593,14 @@ exit 0
 %postun novolume-plugin
 %systemd_postun_with_restart %{name}-novolume-plugin.service
 
-#%post rhel-push-plugin
-#%systemd_post rhel-push-plugin.service
+%post rhel-push-plugin
+%systemd_post rhel-push-plugin.service
 
-#%preun rhel-push-plugin
-#%systemd_preun rhel-push-plugin.service
+%preun rhel-push-plugin
+%systemd_preun rhel-push-plugin.service
 
-#%postun rhel-push-plugin
-#%systemd_postun_with_restart rhel-push-plugin.service
+%postun rhel-push-plugin
+%systemd_postun_with_restart rhel-push-plugin.service
 
 %posttrans
 # Install a default docker-storage-setup based on kernel version.
@@ -692,12 +696,12 @@ fi
 %{_libexecdir}/%{repo}/%{repo}-novolume-plugin
 %{_unitdir}/%{repo}-novolume-plugin.*
 
-#%files rhel-push-plugin
-#%license rhel-push-plugin-%{commit_rhel_push}/LICENSE
-#%doc rhel-push-plugin-%{commit_rhel_push}/README.md
-#%{_mandir}/man8/rhel-push-plugin.8.gz
-#%{_libexecdir}/%{repo}/rhel-push-plugin
-#%{_unitdir}/rhel-push-plugin.*
+%files rhel-push-plugin
+%license rhel-push-plugin-%{commit_rhel_push}/LICENSE
+%doc rhel-push-plugin-%{commit_rhel_push}/README.md
+%{_mandir}/man8/rhel-push-plugin.8.gz
+%{_libexecdir}/%{repo}/rhel-push-plugin
+%{_unitdir}/rhel-push-plugin.*
 
 %files lvm-plugin
 %license %{repo}-lvm-plugin-%{commit_lvm}/LICENSE
@@ -713,9 +717,49 @@ fi
 %{_bindir}/%{name}-v1.10-migrator-*
 
 %changelog
-* Mon Jul 16 2018 Johnny Hughes <johnny@centos.org> - 2:1.13.1-68.gitdded712
-- Manual CentOS Debranding
- 
+* Wed Aug 01 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 2:1.13.1-74.git6e3bb8e
+- Resolves: #1603201
+- built docker @projectatomic/docker-1.13.1-rhel commit 6e3bb8e
+- built docker-novolume-plugin commit 385ec70
+- built rhel-push-plugin commit af9107b
+- built docker-lvm-plugin commit 20a1f68
+- built docker-runc @projectatomic/docker-1.13.1-rhel commit 5eda6f6
+- built docker-containerd @projectatomic/docker-1.13.1-rhel commit c769d58
+- built docker-init commit fec3683
+- built libnetwork commit d00ceed
+
+* Tue Jul 17 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.13.1-73.git6f36bd4
+- enable debuginfo - no idea why it was removed, but that's wrong
+
+* Sun Jul 08 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.13.1-72.git6f36bd4
+- Resolves: #1598581, #1598630 - CVE-2018-10892
+- built docker @projectatomic/docker-1.13.1-rhel commit 6f36bd4
+- built docker-novolume-plugin commit 385ec70
+- built rhel-push-plugin commit af9107b
+- built docker-lvm-plugin commit 20a1f68
+- built docker-runc @projectatomic/docker-1.13.1-rhel commit 5eda6f6
+- built docker-containerd @projectatomic/docker-1.13.1-rhel commit c769d58
+- built docker-init commit fec3683
+- built libnetwork commit d00ceed
+- update comment about registries.conf in /etc/sysconfig/docker
+  From: Tom Sweeney <tsweeney@redhat.com>  
+
+* Tue Jun 26 2018 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.13.1-71.gitdded712
+- requires: subscription-manager-rhsm-certificates (centos only)
+
+* Tue Jun 26 2018 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.13.1-70.gitdded712
+- Resolves: #1595390 - NotifyAccess=main in unitfile
+
+* Tue Jun 19 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 2:1.13.1-69.gitdded712
+- built docker @projectatomic/docker-1.13.1-rhel commit dded712
+- built docker-novolume-plugin commit 385ec70
+- built rhel-push-plugin commit af9107b
+- built docker-lvm-plugin commit 6675634
+- built docker-runc @projectatomic/docker-1.13.1-rhel commit 5eda6f6
+- built docker-containerd @projectatomic/docker-1.13.1-rhel commit c769d58
+- built docker-init commit fec3683
+- built libnetwork commit 19279f0
+
 * Tue Jun 12 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.13.1-68.gitdded712
 - built docker @projectatomic/docker-1.13.1-rhel commit dded712
 - built docker-novolume-plugin commit 385ec70