up to 1.12.6, Fix runC privilege escalation (CVE-2016-9962)

[packages/docker.git] / docker.spec

diff --git a/docker.spec b/docker.spec
index 84e0405733d2bf93bc8e98ba44da078b7ed104c7..77359a7df4736aa206479d6c776031a6ae04ff10 100644 (file)
--- a/docker.spec
+++ b/docker.spec
@@ -7,45 +7,48 @@
 # NOTES
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
 
-# v1.0.0-rc1-39-gcc29e3d
-%define        runc_commit cc29e3d
-# v0.2.0-125-g0ac3cd1
-%define        containerd_commit 0ac3cd1
+# v1.0.0-rc2-9-g50a19c6
+%define        runc_commit 50a19c6
+# v0.2.4-10-g2a5e70c
+%define        containerd_commit 2a5e70c
+#define        subver -rc2
 Summary:       Docker: the open-source application container engine
 Name:          docker
-Version:       1.12.0
-Release:       3
+Version:       1.12.6
+Release:       1
 License:       Apache v2.0
 Group:         Applications/System
 # https://github.com/docker/docker/releases
 Source0:       https://github.com/docker/docker/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 7990440b022e93f3e7036bcfd12970f2
-Source1:       https://github.com/opencontainers/runc/archive/%{runc_commit}/runc-%{runc_commit}.tar.gz
-# Source1-md5: 716d0b284ce42490eeb83befba10fafb
+# Source0-md5: 2db317ab9811641449784fe0fb29d74f
+Source1:       https://github.com/docker/runc/archive/%{runc_commit}/runc-%{runc_commit}.tar.gz
+# Source1-md5: b8f0f19983f641c53a997a58b37dc63e
 Source2:       https://github.com/docker/containerd/archive/%{containerd_commit}/containerd-%{containerd_commit}.tar.gz
-# Source2-md5: f0a0c1101ad259b84fb457c8c7036723
-Source4:       %{name}.sh
-Source5:       %{name}.service
-Source6:       %{name}.socket
+# Source2-md5: 143556e1e7a4e8fa678dce1e0b766e12
+Source4:       %{name}d.sh
 Source7:       %{name}.init
 Source8:       %{name}.sysconfig
+Patch0:                systemd.patch
 URL:           http://www.docker.com/
 BuildRequires: btrfs-progs-devel >= 3.16.1
 BuildRequires: device-mapper-devel >= 2.02.89
 BuildRequires: golang >= 1.6
 BuildRequires: libseccomp-devel >= 2.2.1
-BuildRequires: rpmbuild(macros) >= 1.228
+BuildRequires: rpmbuild(macros) >= 1.644
 BuildRequires: sqlite3-devel >= 3.7.9
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
+Requires:      ca-certificates
 Requires:      iproute2 >= 3.5
 Requires:      iptables
 Requires:      rc-scripts >= 0.4.0.10
+Requires:      systemd-units >= 38
 Requires:      tar >= 1:1.26
 Requires:      uname(release) >= 3.8
 Requires:      xz
+Suggests:      docker-credential-helpers
 Suggests:      git-core >= 1.7
 Suggests:      libcgroup
 Suggests:      xz >= 1:4.9
@@ -130,9 +133,9 @@ This plugin provides syntax highlighting in Dockerfile.
 
 %prep
 %setup -q %{?subver:-n %{name}-%{version}%{subver}} -a1 -a2
-
 mv runc-%{runc_commit}* runc
 mv containerd-%{containerd_commit}* containerd
+%patch0 -p1
 
 install -d vendor/src/github.com/docker
 ln -s $(pwd) vendor/src/github.com/docker/docker
@@ -176,10 +179,10 @@ install -p containerd/bin/containerd $RPM_BUILD_ROOT%{_sbindir}/docker-container
 install -p containerd/bin/containerd-shim $RPM_BUILD_ROOT%{_sbindir}/docker-containerd-shim
 install -p containerd/bin/ctr $RPM_BUILD_ROOT%{_sbindir}/docker-containerd-ctr
 
-cp -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir}
-cp -p %{SOURCE6} $RPM_BUILD_ROOT%{systemdunitdir}
+cp -p contrib/init/systemd/docker.service $RPM_BUILD_ROOT%{systemdunitdir}
+cp -p contrib/init/systemd/docker.socket $RPM_BUILD_ROOT%{systemdunitdir}
 install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/docker
-install -p %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/docker
+install -p %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/dockerd
 cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/docker
 
 # install udev rules
@@ -235,7 +238,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/docker-proxy
 %attr(755,root,root) %{_sbindir}/docker-runc
 %attr(755,root,root) %{_sbindir}/dockerd
-%attr(755,root,root) %{_libexecdir}/docker
+%attr(755,root,root) %{_libexecdir}/dockerd
 %{systemdunitdir}/docker.service
 %{systemdunitdir}/docker.socket
 /lib/udev/rules.d/80-docker.rules