Accepting request 450292 from home:cyphar:containers

clean up containerd update as well [install was broken]

OBS-URL: https://build.opensuse.org/request/show/450292
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=42
This commit is contained in:
Jordi Massaguer 2017-01-16 09:37:31 +00:00 committed by Git OBS Bridge
parent 6fc641897a
commit c7fd3b15c6
2 changed files with 14 additions and 8 deletions

View File

@ -1,14 +1,20 @@
-------------------------------------------------------------------
Sat Jan 14 06:38:29 UTC 2017 - asarai@suse.com
- Update docker to the version used in Docker 1.12.6. This is necessary to fix
CVE-2016-9962 (bsc#1012568).
-------------------------------------------------------------------
Mon Dec 19 12:46:14 UTC 2016 - jmassaguerpla@suse.com
- update containerd to the version used in docker 1.12.5 (bsc#1016307).
This fixes bsc#1015661
This fixes bsc#1015661
-------------------------------------------------------------------
Thu Nov 24 16:10:41 UTC 2016 - jmassaguerpla@suse.com
- fix runc version
fix bsc#1009961
fix bsc#1009961
-------------------------------------------------------------------
Thu Nov 24 12:09:48 UTC 2016 - jmassaguerpla@suse.com
@ -39,21 +45,21 @@ Thu Oct 13 11:14:39 UTC 2016 - jmassaguerpla@suse.com
Mon Sep 19 11:58:44 UTC 2016 - jmassaguerpla@suse.com
- fix go_arches definition: use global instead of define, otherwise
it fails to build
it fails to build
-------------------------------------------------------------------
Thu Aug 25 15:54:38 UTC 2016 - jmassaguerpla@suse.com
- Remove GOPATH at the end of the GOPATH assignment
cause GOPATH is empty and if we do that, we get the path ""
appended, which causes gcc6-go to complain
appended, which causes gcc6-go to complain
-------------------------------------------------------------------
Wed Aug 24 12:25:46 UTC 2016 - jmassaguerpla@suse.com
- add go_arches in project configuration: this way, we can use the
same spec file but decide in the project configuration if to
use gc-go or gcc-go for some archs.
use gc-go or gcc-go for some archs.
-------------------------------------------------------------------
Mon Aug 22 18:14:40 UTC 2016 - jmassaguerpla@suse.com
@ -67,7 +73,7 @@ Mon Aug 22 18:14:40 UTC 2016 - jmassaguerpla@suse.com
-------------------------------------------------------------------
Thu Aug 18 10:34:29 UTC 2016 - jmassaguerpla@suse.com
- use gcc6-go instead of gcc5-go (bsc#988408)
- use gcc6-go instead of gcc5-go (bsc#988408)
- build ppc64le with gc-go because this version builds with gc-go 1.6
-------------------------------------------------------------------

View File

@ -1,7 +1,7 @@
#
# spec file for package containerd
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -70,7 +70,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Dockerfile. However, for some reason the Dockerfile for containerd
# diverges from the one for Docker. As such, this cannot be a hard
# requirement (that would break Docker).
Requires: runc = 0.1.1+gitr2818_f59ba3cdd76f
Requires: runc = 0.1.1+gitr2819_50a19c6
Requires(post): %fillup_prereq
%define client ctr