commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2020-06-29 21:15:25
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new.3060 (New)
Package is "containerd"
Mon Jun 29 21:15:25 2020 rev:36 rq:817376 version:1.2.13
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2020-06-05
20:09:08.041529539 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new.3060/containerd.changes
2020-06-29 21:15:38.761279151 +0200
@@ -1,0 +2,5 @@
+Thu Jun 25 22:32:08 UTC 2020 - Aleksa Sarai
+
+- Use Go 1.13 for build.
+
+---
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.wZdI5e/_old 2020-06-29 21:15:40.341284040 +0200
+++ /var/tmp/diff_new_pack.wZdI5e/_new 2020-06-29 21:15:40.345284053 +0200
@@ -54,7 +54,9 @@
BuildRequires: libbtrfs-devel >= 3.8
BuildRequires: libseccomp-devel >= 2.2
BuildRequires: pkg-config
-BuildRequires: golang(API) >= 1.11
+# Due to a limitation in openSUSE's Go packaging we cannot have a BuildRequires
+# for 'golang(API) >= 1.13' here, so just require 1.13 exactly. bsc#1172608
+BuildRequires: go1.13
# We provide a git revision so that Docker can require it properly.
Provides: %{name}-git = %{git_version}
# Currently runc is the only supported runtime for containerd. We pin the same
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2020-06-05 20:05:22
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new.3606 (New)
Package is "containerd"
Fri Jun 5 20:05:22 2020 rev:35 rq:87 version:1.2.13
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2019-10-23
15:48:45.194558595 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new.3606/containerd.changes
2020-06-05 20:09:08.041529539 +0200
@@ -1,0 +2,6 @@
+Tue Jun 2 08:57:36 UTC 2020 - Aleksa Sarai
+
+- Update to containerd v1.2.13, which is required for Docker 19.03.11-ce.
+ bsc#1172377
+
+---
Old:
containerd-1.2.10_b34a5c8af56e.tar.xz
New:
containerd-1.2.13_7ad184331fa3.tar.xz
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.jmuF2w/_old 2020-06-05 20:09:09.429534017 +0200
+++ /var/tmp/diff_new_pack.jmuF2w/_new 2020-06-05 20:09:09.429534017 +0200
@@ -1,7 +1,7 @@
#
# spec file for package containerd
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -34,16 +34,16 @@
%endif
# MANUAL: Update the git_version.
-%define git_version b34a5c8af56e510852c35414db4c1f4fa6172339
-%define git_short b34a5c8af56e
+%define git_version 7ad184331fa3e55e52b890ea95e65ba581ae3429
+%define git_short 7ad184331fa3
Name: %{realname}%{name_suffix}
-Version:1.2.10
+Version:1.2.13
Release:0
Summary:Standalone OCI Container Daemon
License:Apache-2.0
Group: System/Management
-Url:https://containerd.tools
+URL:https://containerd.tools
Source: %{realname}-%{version}_%{git_short}.tar.xz
Source1:%{realname}-rpmlintrc
# OPENSUSE-FIX-UPSTREAM: Backport of
https://github.com/containerd/containerd/pull/2764.
++ _service ++
--- /var/tmp/diff_new_pack.jmuF2w/_old 2020-06-05 20:09:09.461534120 +0200
+++ /var/tmp/diff_new_pack.jmuF2w/_new 2020-06-05 20:09:09.465534133 +0200
@@ -3,8 +3,8 @@
https://github.com/containerd/containerd.git
git
containerd
-1.2.10_%h
-v1.2.10
+1.2.13_%h
+v1.2.13
.git
++ containerd-1.2.10_b34a5c8af56e.tar.xz ->
containerd-1.2.13_7ad184331fa3.tar.xz ++
17439 lines of diff (skipped)
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2019-10-23 15:48:42
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new.2352 (New)
Package is "containerd"
Wed Oct 23 15:48:42 2019 rev:34 rq:740817 version:1.2.10
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2019-08-05
13:40:50.496391943 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new.2352/containerd.changes
2019-10-23 15:48:45.194558595 +0200
@@ -1,0 +2,6 @@
+Tue Oct 8 23:35:36 UTC 2019 - Aleksa Sarai
+
+- Update to containerd v1.2.10, which is required for Docker 19.03.3-ce.
+ bsc#1153367
+
+---
Old:
containerd-1.2.6_894b81a4b802.tar.xz
New:
containerd-1.2.10_b34a5c8af56e.tar.xz
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.RoWWwE/_old 2019-10-23 15:48:46.106559580 +0200
+++ /var/tmp/diff_new_pack.RoWWwE/_new 2019-10-23 15:48:46.106559580 +0200
@@ -34,11 +34,11 @@
%endif
# MANUAL: Update the git_version.
-%define git_version 894b81a4b802e4eb2a91d1ce216b8817763c29fb
-%define git_short 894b81a4b802
+%define git_version b34a5c8af56e510852c35414db4c1f4fa6172339
+%define git_short b34a5c8af56e
Name: %{realname}%{name_suffix}
-Version:1.2.6
+Version:1.2.10
Release:0
Summary:Standalone OCI Container Daemon
License:Apache-2.0
++ _service ++
--- /var/tmp/diff_new_pack.RoWWwE/_old 2019-10-23 15:48:46.154559632 +0200
+++ /var/tmp/diff_new_pack.RoWWwE/_new 2019-10-23 15:48:46.154559632 +0200
@@ -3,8 +3,8 @@
https://github.com/containerd/containerd.git
git
containerd
-1.2.6_%h
-v1.2.6
+1.2.10_%h
+v1.2.10
.git
++ containerd-1.2.6_894b81a4b802.tar.xz ->
containerd-1.2.10_b34a5c8af56e.tar.xz ++
37587 lines of diff (skipped)
commit containerd for openSUSE:Factory
Hello community, here is the log from the commit of package containerd for openSUSE:Factory checked in at 2019-08-05 13:40:45 Comparing /work/SRC/openSUSE:Factory/containerd (Old) and /work/SRC/openSUSE:Factory/.containerd.new.4126 (New) Package is "containerd" Mon Aug 5 13:40:45 2019 rev:33 rq:720988 version:1.2.6 Changes: --- /work/SRC/openSUSE:Factory/containerd/containerd.changes2019-06-30 10:19:06.819397635 +0200 +++ /work/SRC/openSUSE:Factory/.containerd.new.4126/containerd.changes 2019-08-05 13:40:50.496391943 +0200 @@ -22 +22 @@ - * CVE-2019-5736 +bsc#1121967 CVE-2019-5736 Other differences: --
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2019-06-30 10:19:04
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new.4615 (New)
Package is "containerd"
Sun Jun 30 10:19:04 2019 rev:32 rq:712297 version:1.2.6
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2019-05-06
21:13:12.860412771 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new.4615/containerd.changes
2019-06-30 10:19:06.819397635 +0200
@@ -1,0 +2,7 @@
+Fri Jun 28 01:45:50 UTC 2019 - Aleksa Sarai
+
+- Update to containerd v1.2.6, which is required for Docker v18.09.7-ce.
+ bsc#1139649
+- Remove containerd-test (it's not useful for actual testing).
+
+---
Old:
containerd-1.2.5_bb71b10fd8f5.tar.xz
New:
containerd-1.2.6_894b81a4b802.tar.xz
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.ouNVah/_old 2019-06-30 10:19:07.259398319 +0200
+++ /var/tmp/diff_new_pack.ouNVah/_new 2019-06-30 10:19:07.259398319 +0200
@@ -34,11 +34,11 @@
%endif
# MANUAL: Update the git_version.
-%define git_version bb71b10fd8f58240ca47fbb579b9d1028eea7c84
-%define git_short bb71b10fd8f5
+%define git_version 894b81a4b802e4eb2a91d1ce216b8817763c29fb
+%define git_short 894b81a4b802
Name: %{realname}%{name_suffix}
-Version:1.2.5
+Version:1.2.6
Release:0
Summary:Standalone OCI Container Daemon
License:Apache-2.0
@@ -106,25 +106,6 @@
Standalone client for containerd, which allows management of containerd
containers
separately from Docker.
-%package test
-Summary:Test package for containerd
-Group: System/Management
-BuildArch: noarch
-# KUBIC-SPECIFIC: This was required when upgrading from the original kubic
-# packaging, when everything was renamed to -kubic. It also is
-# used to ensure that nothing complains too much when using
-# -kubic packages. Hopfully it can be removed one day.
-%if "%flavour" == "kubic"
-# Obsolete older package without -kubic suffix: v2 -> v3
-Obsoletes: %{realname}-test = 0.2.5+gitr569_2a5e70c
-# Conflict with non-kubic package, and provide equivalent
-Conflicts: %{realname}-test > 0.2.5+gitr569_2a5e70c
-Provides: %{realname}-test = %{version}
-%endif
-
-%description test
-Test package for containerd. It contains the source code and the tests.
-
%prep
%setup -q -n %{realname}-%{version}_%{git_short}
%patch1 -p1
@@ -181,12 +162,6 @@
done
ln -s ctr.1 %{buildroot}/%{_mandir}/man1/%{realname}-ctr.1
-# Source tree for containerd-test.
-install -d -m755 %{buildroot}/usr/src/containerd/
-cp -ar $HOME/go/src/github.com/containerd/containerd/*
%{buildroot}/usr/src/containerd/
-# Remove files we don't want to ship - exclude is the wrong usage here.
-rm -rf %{buildroot}/usr/src/containerd/bin
-
%fdupes %{buildroot}
%files
@@ -206,8 +181,4 @@
%{_sbindir}/%{realname}-ctr
%{_mandir}/man1/*ctr.1*
-%files test
-%defattr(-,root,root)
-/usr/src/containerd/
-
%changelog
++ _service ++
--- /var/tmp/diff_new_pack.ouNVah/_old 2019-06-30 10:19:07.295398375 +0200
+++ /var/tmp/diff_new_pack.ouNVah/_new 2019-06-30 10:19:07.295398375 +0200
@@ -3,8 +3,8 @@
https://github.com/containerd/containerd.git
git
containerd
-1.2.5_%h
-v1.2.5
+1.2.6_%h
+v1.2.6
.git
++ containerd-1.2.5_bb71b10fd8f5.tar.xz ->
containerd-1.2.6_894b81a4b802.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/containerd-1.2.5_bb71b10fd8f5/Makefile
new/containerd-1.2.6_894b81a4b802/Makefile
--- old/containerd-1.2.5_bb71b10fd8f5/Makefile 2019-03-13 06:41:42.0
+0100
+++ new/containerd-1.2.6_894b81a4b802/Makefile 2019-04-05 20:39:47.0
+0200
@@ -22,6 +22,7 @@
# Used to populate variables in version package.
VERSION=$(shell git describe --match 'v[0-9]*' --dirty='.m' --always)
REVISION=$(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff
--quiet --exit-code; then echo .m; fi)
+PACKAGE=github.com/containerd/containerd
ifneq "$(strip $(shell command -v go 2>/dev/null))" ""
GOOS ?= $(shell go env GOOS)
@@ -77,8 +78,8 @@
# Build tags seccomp and apparmor are needed by CRI plugin.
BUILDTAGS ?= seccomp apparmor
GO_TAGS=$(if $(BUILDTAGS),-tags "$(BUILDTAGS)",)
-GO_LDFLAGS=-ldflags '-s -w -X $(PKG)/version.Version=$(VERSION) -X
$(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PKG)
$(EXTRA_LDFLAGS)'
-SHIM_GO_LDFLAGS=-ldflags '-s -w -X $(PKG)/version.Version=$(VERSION) -X
$(PKG)/ve
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2019-05-06 21:13:09
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new.5148 (New)
Package is "containerd"
Mon May 6 21:13:09 2019 rev:31 rq:700632 version:1.2.5
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2019-03-26
22:28:05.68426 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new.5148/containerd.changes
2019-05-06 21:13:12.860412771 +0200
@@ -1,0 +2,7 @@
+Fri May 3 13:32:05 UTC 2019 - Aleksa Sarai
+
+- Update to containerd v1.2.5, which is required for v18.09.5-ce.
+ bsc#1128376 boo#1134068
+ https://github.com/containerd/containerd/releases/tag/v1.2.5
+
+---
@@ -31 +37,0 @@
-
Old:
containerd-git.e6b3f5632f50.tar.xz
New:
containerd-1.2.5_bb71b10fd8f5.tar.xz
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.UvXPZN/_old 2019-05-06 21:13:13.500414957 +0200
+++ /var/tmp/diff_new_pack.UvXPZN/_new 2019-05-06 21:13:13.504414971 +0200
@@ -34,18 +34,17 @@
%endif
# MANUAL: Update the git_version.
-%define containerd_version 1.2.4
-%define git_version e6b3f5632f50dbc4e9cb6288d911bf4f5e95b18e
-%define git_short e6b3f5632f50
+%define git_version bb71b10fd8f58240ca47fbb579b9d1028eea7c84
+%define git_short bb71b10fd8f5
Name: %{realname}%{name_suffix}
-Version:%{containerd_version}
+Version:1.2.5
Release:0
Summary:Standalone OCI Container Daemon
License:Apache-2.0
Group: System/Management
Url:https://containerd.tools
-Source: %{realname}-git.%{git_short}.tar.xz
+Source: %{realname}-%{version}_%{git_short}.tar.xz
Source1:%{realname}-rpmlintrc
# OPENSUSE-FIX-UPSTREAM: Backport of
https://github.com/containerd/containerd/pull/2764.
Patch1: 0001-makefile-remove-emoji.patch
@@ -55,7 +54,7 @@
BuildRequires: libbtrfs-devel >= 3.8
BuildRequires: libseccomp-devel >= 2.2
BuildRequires: pkg-config
-BuildRequires: golang(API) = 1.10
+BuildRequires: golang(API) >= 1.11
# We provide a git revision so that Docker can require it properly.
Provides: %{name}-git = %{git_version}
# Currently runc is the only supported runtime for containerd. We pin the same
@@ -91,7 +90,6 @@
Summary:Client for %{name}
Group: System/Management
Requires: %{name} = %{version}
-BuildRequires: golang(API) = 1.10
# KUBIC-SPECIFIC: This was required when upgrading from the original kubic
# packaging, when everything was renamed to -kubic. It also is
# used to ensure that nothing complains too much when using
@@ -111,7 +109,6 @@
%package test
Summary:Test package for containerd
Group: System/Management
-BuildRequires: golang(API) = 1.10
BuildArch: noarch
# KUBIC-SPECIFIC: This was required when upgrading from the original kubic
# packaging, when everything was renamed to -kubic. It also is
@@ -129,7 +126,7 @@
Test package for containerd. It contains the source code and the tests.
%prep
-%setup -q -n %{realname}-git.%{git_short}
+%setup -q -n %{realname}-%{version}_%{git_short}
%patch1 -p1
%build
++ _service ++
--- /var/tmp/diff_new_pack.UvXPZN/_old 2019-05-06 21:13:13.552415134 +0200
+++ /var/tmp/diff_new_pack.UvXPZN/_new 2019-05-06 21:13:13.556415148 +0200
@@ -3,8 +3,8 @@
https://github.com/containerd/containerd.git
git
containerd
-git.%h
-v1.2.4
+1.2.5_%h
+v1.2.5
.git
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2019-03-26 22:28:04
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new.25356 (New)
Package is "containerd"
Tue Mar 26 22:28:04 2019 rev:30 rq:688118 version:1.2.4
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2019-02-13
09:58:03.297669593 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new.25356/containerd.changes
2019-03-26 22:28:05.68426 +0100
@@ -1,0 +2,13 @@
+Thu Mar 21 14:30:03 UTC 2019 - Sascha Grunert
+
+- Update containerd to v1.2.4
+ * cri: Set /etc/hostname
+ * cri: Fix env performance issue
+ * runc updated to 6635b4f0c6af3810594d2770f662f34ddc15b40d to solve
+ * CVE-2019-5736
+ * cri updated to da0c016c830b2ea97fd1d737c49a568a816bf964
+ * Windows: NewDirectIOFromFIFOSet
+ * Changelogs from previous versions also included in this update:
+ https://github.com/containerd/containerd/releases/tag/v1.2.3
+
+---
@@ -5,0 +19,13 @@
+ * Fix rare deadlock on FIFO creation with timeout
+ * Fix a bug that a container can't be stopped or inspected when its
+corresponding image is deleted
+ * Fix a bug that the cri plugin handles containerd events outside of
+k8s.io namespace
+ more changes at:
+ https://github.com/containerd/containerd/releases/tag/v1.2.2
+ Changelogs from previous versions also included in this update:
+https://github.com/containerd/containerd/releases/tag/v1.2.1
+https://github.com/containerd/containerd/releases/tag/v1.2.0
+https://github.com/containerd/containerd/releases/tag/v1.1.4
+https://github.com/containerd/containerd/releases/tag/v1.1.3
+
Old:
containerd-git.9754871865f7.tar.xz
New:
containerd-git.e6b3f5632f50.tar.xz
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.sTmF1H/_old 2019-03-26 22:28:06.745768193 +0100
+++ /var/tmp/diff_new_pack.sTmF1H/_new 2019-03-26 22:28:06.745768193 +0100
@@ -34,12 +34,12 @@
%endif
# MANUAL: Update the git_version.
-%define containerd_version 1.2.2
-%define git_version 9754871865f7fe2f4e74d43e2fc7ccd237edcbce
-%define git_short 9754871865f7
+%define containerd_version 1.2.4
+%define git_version e6b3f5632f50dbc4e9cb6288d911bf4f5e95b18e
+%define git_short e6b3f5632f50
Name: %{realname}%{name_suffix}
-Version:1.2.2
+Version:%{containerd_version}
Release:0
Summary:Standalone OCI Container Daemon
License:Apache-2.0
++ _service ++
--- /var/tmp/diff_new_pack.sTmF1H/_old 2019-03-26 22:28:06.785768183 +0100
+++ /var/tmp/diff_new_pack.sTmF1H/_new 2019-03-26 22:28:06.785768183 +0100
@@ -4,7 +4,7 @@
git
containerd
git.%h
-v1.2.2
+v1.2.4
.git
++ containerd-git.9754871865f7.tar.xz -> containerd-git.e6b3f5632f50.tar.xz
++
83510 lines of diff (skipped)
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2019-02-13 09:57:49
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new.28833 (New)
Package is "containerd"
Wed Feb 13 09:57:49 2019 rev:29 rq:672796 version:1.2.2
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2019-01-21
10:07:10.718871787 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new.28833/containerd.changes
2019-02-13 09:58:03.297669593 +0100
@@ -1,0 +2,9 @@
+Tue Feb 5 11:16:46 UTC 2019 - Aleksa Sarai
+
+- Update to containerd v1.2.2, which is required for Docker v18.09.1-ce.
+ bsc#1124308
+- Remove required_dockerrunc commit pinning, as it just lead to issues.
+- Remove upstreamed patches.
+ - 0001-docs-man-rename-config.toml-5-to-be-more-descriptive.patch
+
+---
Old:
0001-docs-man-rename-config.toml-5-to-be-more-descriptive.patch
containerd-git.468a545b9edc.tar.xz
New:
containerd-git.9754871865f7.tar.xz
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.1Itzeg/_old 2019-02-13 09:58:04.905669205 +0100
+++ /var/tmp/diff_new_pack.1Itzeg/_new 2019-02-13 09:58:04.905669205 +0100
@@ -34,17 +34,12 @@
%endif
# MANUAL: Update the git_version.
-%define containerd_version 1.1.2
-%define git_version 468a545b9edcd5932818eb9de8e72413e616e86e
-%define git_short 468a545b9edc
-
-# These are the git commits required. We verify them against the source to make
-# sure we didn't miss anything important when doing upgrades. This MUST match
-# required_dockerrunc in docker.spec!
-%define required_dockerrunc 69663f0bd4b60df09991c08812a60108003fa340
+%define containerd_version 1.2.2
+%define git_version 9754871865f7fe2f4e74d43e2fc7ccd237edcbce
+%define git_short 9754871865f7
Name: %{realname}%{name_suffix}
-Version:1.1.2
+Version:1.2.2
Release:0
Summary:Standalone OCI Container Daemon
License:Apache-2.0
@@ -52,10 +47,8 @@
Url:https://containerd.tools
Source: %{realname}-git.%{git_short}.tar.xz
Source1:%{realname}-rpmlintrc
-# OPENSUSE-BACKPORT: Backport of
https://github.com/containerd/containerd/pull/2534.
-Patch1: 0001-docs-man-rename-config.toml-5-to-be-more-descriptive.patch
# OPENSUSE-FIX-UPSTREAM: Backport of
https://github.com/containerd/containerd/pull/2764.
-Patch2: 0001-makefile-remove-emoji.patch
+Patch1: 0001-makefile-remove-emoji.patch
BuildRequires: fdupes
BuildRequires: glibc-devel-static
BuildRequires: go-go-md2man
@@ -65,10 +58,9 @@
BuildRequires: golang(API) = 1.10
# We provide a git revision so that Docker can require it properly.
Provides: %{name}-git = %{git_version}
-# Currently runc is the only supported runtime for containerd. We match the
-# same version as the one pinned by Docker. Obviously we pin the same flavour
-# as us, to avoid mixing.
-Requires: docker-runc%{name_suffix}-git = %{required_dockerrunc}
+# Currently runc is the only supported runtime for containerd. We pin the same
+# flavour as us, to avoid mixing (the version pinning is done by docker.spec).
+Requires: docker-runc%{name_suffix}
Requires(post): %fillup_prereq
ExcludeArch:s390
# KUBIC-SPECIFIC: This was required when upgrading from the original kubic
@@ -139,7 +131,6 @@
%prep
%setup -q -n %{realname}-git.%{git_short}
%patch1 -p1
-%patch2 -p1
%build
# Do not use symlinks. If you want to run the unit tests for this package at
++ _service ++
--- /var/tmp/diff_new_pack.1Itzeg/_old 2019-02-13 09:58:04.941669196 +0100
+++ /var/tmp/diff_new_pack.1Itzeg/_new 2019-02-13 09:58:04.941669196 +0100
@@ -4,7 +4,7 @@
git
containerd
git.%h
-468a545b9edcd5932818eb9de8e72413e616e86e
+v1.2.2
.git
++ containerd-git.468a545b9edc.tar.xz -> containerd-git.9754871865f7.tar.xz
++
267233 lines of diff (skipped)
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2019-01-21 10:07:04
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new.28833 (New)
Package is "containerd"
Mon Jan 21 10:07:04 2019 rev:28 rq:664601 version:1.1.2
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2018-11-12
09:49:48.424430130 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new.28833/containerd.changes
2019-01-21 10:07:10.718871787 +0100
@@ -1,0 +2,15 @@
+Fri Jan 11 09:57:32 UTC 2019 - Sascha Grunert
+
+- Disable leap based builds for kubic flavor. bsc#1121412
+
+---
+Thu Dec 20 18:05:24 UTC 2018 - c...@suse.com
+
+- Update go requirements to >= go1.10 to fix
+ * bsc#1118897 CVE-2018-16873
+go#29230 cmd/go: remote command execution during "go get -u"
+ * bsc#1118898 CVE-2018-16874
+go#29231 cmd/go: directory traversal in "go get" via curly braces in
import paths
+ * bsc#1118899 CVE-2018-16875
+go#29233 crypto/x509: CPU denial of service
+---
@@ -362 +376,0 @@
-
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.E1aKwm/_old 2019-01-21 10:07:11.490871006 +0100
+++ /var/tmp/diff_new_pack.E1aKwm/_new 2019-01-21 10:07:11.494871002 +0100
@@ -1,7 +1,7 @@
#
# spec file for package containerd
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -82,6 +82,10 @@
# Conflict with non-kubic package, and provide equivalent
Conflicts: %{realname} > 0.2.5+gitr569_2a5e70c
Provides: %{realname} = %{version}
+# Disable leap based builds for kubic flavor (bsc#1121412)
+%if 0%{?suse_version} == 1500 && 0%{?is_opensuse}
+ExclusiveArch: do_not_build
+%endif
%endif
%description
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2018-11-12 09:49:46
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new (New)
Package is "containerd"
Mon Nov 12 09:49:46 2018 rev:27 rq:646394 version:1.1.2
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2018-09-05
13:46:36.910062374 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes
2018-11-12 09:49:48.424430130 +0100
@@ -1,0 +2,8 @@
+Mon Nov 5 10:28:13 UTC 2018 - Aleksa Sarai
+
+- Add backport of https://github.com/containerd/containerd/pull/2764, which is
+ required for us to build containerd on i586 SLE-12 (where /bin/sh doesn't
+ like emoji in shell scripts). bsc#1102522 bsc#1113313
+ + 0001-makefile-remove-emoji.patch
+
+---
New:
0001-makefile-remove-emoji.patch
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.v1d05G/_old 2018-11-12 09:49:49.176428999 +0100
+++ /var/tmp/diff_new_pack.v1d05G/_new 2018-11-12 09:49:49.176428999 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
# nodebuginfo
@@ -54,6 +54,8 @@
Source1:%{realname}-rpmlintrc
# OPENSUSE-BACKPORT: Backport of
https://github.com/containerd/containerd/pull/2534.
Patch1: 0001-docs-man-rename-config.toml-5-to-be-more-descriptive.patch
+# OPENSUSE-FIX-UPSTREAM: Backport of
https://github.com/containerd/containerd/pull/2764.
+Patch2: 0001-makefile-remove-emoji.patch
BuildRequires: fdupes
BuildRequires: glibc-devel-static
BuildRequires: go-go-md2man
@@ -133,6 +135,7 @@
%prep
%setup -q -n %{realname}-git.%{git_short}
%patch1 -p1
+%patch2 -p1
%build
# Do not use symlinks. If you want to run the unit tests for this package at
++ 0001-makefile-remove-emoji.patch ++
>From 285c7ac5d5027d45bbcdc49334243f2a3ba6dd05 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai
Date: Mon, 5 Nov 2018 21:12:41 +1100
Subject: [PATCH] makefile: remove emoji
These break the build on i386 in some very specific circumstances (where
/bin/sh breaks when handling unicode), and are completely useless when
it comes to actually building the project.
Signed-off-by: Aleksa Sarai
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 35021fd3b491..2fcee039d1a1 100644
--- a/Makefile
+++ b/Makefile
@@ -50,8 +50,8 @@ else
endif
endif
-WHALE = "🇩"
-ONI = "👹"
+WHALE = "[w]"
+ONI = "[o]"
RELEASE=containerd-$(VERSION:v%=%).${GOOS}-${GOARCH}
--
2.19.1
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2018-09-05 13:46:23
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new (New)
Package is "containerd"
Wed Sep 5 13:46:23 2018 rev:26 rq:632122 version:1.1.2
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2018-06-22
13:16:33.792412480 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes
2018-09-05 13:46:36.910062374 +0200
@@ -1,0 +2,38 @@
+Wed Aug 22 10:10:09 UTC 2018 - asa...@suse.com
+
+- Upgrade to containerd v1.1.2, which is required for Docker v18.06.1-ce.
+ bsc#1102522
+
+---
+Thu Aug 16 02:00:31 UTC 2018 - asa...@suse.com
+
+- Merge -kubic packages back into the main Virtualization:containers packages.
+ This is done using _multibuild to add a "kubic" flavour, which is then used
+ to conditionally compile patches and other kubic-specific features.
+ bsc#1105000
+
+---
+Wed Aug 1 09:40:59 UTC 2018 - asa...@suse.com
+
+- Enable seccomp support on SLE12, since libseccomp is now a new enough vintage
+ to work with Docker and containerd. fate#325877
+
+---
+Wed Jul 25 08:54:33 UTC 2018 - asa...@suse.com
+
+- Update to containerd v1.1.1, which is the required version for the Docker
+ v18.06.0-ce upgrade. bsc#1102522
+- Add backport of https://github.com/containerd/containerd/pull/2534 to make
+ the man page no longer pollute the global namespace.
+ + 0001-docs-man-rename-config.toml-5-to-be-more-descriptive.patch
+- Remove the following patch since it has already been merged upstream.
+ - bsc1065109-0001-makefile-add-support-for-build_flags.patch
+- Remove systemd-related files and add docker-containerd-* symlinks; this
+ aligns with the upstream defaults where dockerd will execute
+ docker-containerd. Version upgrades of docker are expected to work more
+ smoothly as much of the upgrade logic is implemented in dockerd.
+- Add containerd-rpmlintrc (or containerd-kubic-rpmlintrc) to deal with
+ /usr/src/containerd/* rpmlint errors (which don't affect normal users of this
+ package).
+
+---
@@ -11,0 +50,22 @@
+
+---
+Wed May 16 10:10:10 UTC 2018 - jmassaguer...@suse.com
+
+- Review obsoletes tag to fix bsc#1080978
+
+---
+Thu Apr 12 12:48:16 UTC 2018 - fcaste...@suse.com
+
+- Put containerd under the podruntime slice. This the recommended
+ deployment to allow fine resource control on Kubernetes.
+ bsc#1086185
+
+---
+Mon Feb 12 10:52:49 UTC 2018 - rbr...@suse.com
+
+- Add ${version} to equivalent non-kubic package provides
+
+---
+Thu Feb 8 12:34:13 UTC 2018 - rbr...@suse.com
+
+- Add Provides for equivalent non-kubic packages
Old:
bsc1065109-0001-makefile-add-support-for-build_flags.patch
containerd-git.06b9cb351610.tar.xz
containerd.service
containerd.socket
sysconfig.containerd
New:
0001-docs-man-rename-config.toml-5-to-be-more-descriptive.patch
_multibuild
containerd-git.468a545b9edc.tar.xz
containerd-rpmlintrc
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.E52iZR/_old 2018-09-05 13:46:38.370064822 +0200
+++ /var/tmp/diff_new_pack.E52iZR/_new 2018-09-05 13:46:38.370064822 +0200
@@ -22,47 +22,65 @@
%define _fillupdir /var/adm/fillup-templates
%endif
-%define go_tool go
-%define GO_BUILD_FLAGS -buildmode=pie
+# Handle _multibuild magic.
+%define flavour @BUILD_FLAVOR@%{nil}
-# MANUAL: Update the git_version and git_revision
-%define git_version 06b9cb35161009dcb7123345749fef02f7cea8e0
-%define git_short 06b9cb351610
-# How to get the git_revision
-# git clone https://github.com/containerd/containerd.git containerd-upstream
-# cd containerd
-# git checkout $git_version
-# git_revision=r$(git rev-list HEAD | wc -l)
-%define git_revision r706
+# We split the Name: into "realname" and "name_suffix".
+%define realname containerd
+%if "%flavour" == ""
+%define name_suffix %{nil}
+%else
+%define name_suffix -%{flavour}
+%endif
+
+# MANUAL: Update the git_version.
+%define containerd_version 1.1.2
+%define git_version 468a545b9edcd5932818eb9de8e72413e616e86e
+%define git_short 468a545b9edc
# These are the git commits required. We verify them against the sourc
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2018-06-22 13:16:31
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new (New)
Package is "containerd"
Fri Jun 22 13:16:31 2018 rev:25 rq:617849 version:0.2.9+gitr706_06b9cb351610
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2018-06-08
23:09:50.180260300 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes
2018-06-22 13:16:33.792412480 +0200
@@ -1,0 +2,5 @@
+Wed Jun 13 10:15:51 UTC 2018 - dcass...@suse.com
+
+- Make use of %license macro
+
+---
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.vcNFeM/_old 2018-06-22 13:16:34.396390083 +0200
+++ /var/tmp/diff_new_pack.vcNFeM/_new 2018-06-22 13:16:34.404389786 +0200
@@ -150,7 +150,8 @@
%files
%defattr(-,root,root)
-%doc LICENSE.code LICENSE.docs README.md
+%doc README.md
+%license LICENSE.code LICENSE.docs
%{_sbindir}/containerd
%{_sbindir}/containerd-shim
%{_unitdir}/%{name}.service
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2018-06-08 23:09:48
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new (New)
Package is "containerd"
Fri Jun 8 23:09:48 2018 rev:24 rq:614155 version:0.2.9+gitr706_06b9cb351610
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2018-02-05
10:45:43.692761735 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes
2018-06-08 23:09:50.180260300 +0200
@@ -1,0 +2,7 @@
+Tue Jun 5 06:38:40 UTC 2018 - asa...@suse.com
+
+- Remove 'go test' from %check section, as it has only ever caused us problems
+ and hasn't (as far as I remember) ever caught a release-blocking issue. Smoke
+ testing has been far more useful. boo#1095817
+
+---
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.XmLDNU/_old 2018-06-08 23:09:51.492212933 +0200
+++ /var/tmp/diff_new_pack.XmLDNU/_new 2018-06-08 23:09:51.496212788 +0200
@@ -111,12 +111,11 @@
cp $PROJECT/bin/containerd-shim containerd-shim-%{version}
%check
-export GOPATH=$HOME/go/src/github.com/containerd/containerd/vendor:$GOPATH
-cd $HOME/go/src/github.com/containerd/containerd
-%go_tool test %GO_BUILD_FLAGS -v $(%go_tool list ./... | \
- grepgithub.com/containerd/containerd | \
- grep -v github.com/containerd/containerd/vendor | \
- grep -v /integration-test)
+# We used to run 'go test' here, however we found that this actually didn't
+# catch any issues that were caught by smoke testing, and %check would
+# continually cause package builds to fail due to flaky tests. If you ever need
+# to know how the testing was done, you can always look in the package history.
+# boo#1095817
%install
install -D -m755 containerd-%{version} %{buildroot}/%{_sbindir}/containerd
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2018-02-05 10:45:26
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new (New)
Package is "containerd"
Mon Feb 5 10:45:26 2018 rev:23 rq:571971 version:0.2.9+gitr706_06b9cb351610
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2018-01-07
17:21:30.768882809 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes
2018-02-05 10:45:43.692761735 +0100
@@ -1,0 +2,5 @@
+Thu Feb 1 16:57:14 CET 2018 - r...@suse.de
+
+- do not build on s390, only on s390x (no go on s390)
+
+---
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.mS7nHn/_old 2018-02-05 10:45:44.420727652 +0100
+++ /var/tmp/diff_new_pack.mS7nHn/_new 2018-02-05 10:45:44.424727465 +0100
@@ -1,7 +1,7 @@
#
# spec file for package containerd
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -62,6 +62,7 @@
# same version as the one pinned by Docker.
Requires: docker-runc-git = %{required_dockerrunc}
Requires(post): %fillup_prereq
+ExcludeArch:s390
%description
Containerd is a daemon with an API and a command line client, to manage
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2018-01-07 17:21:29
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new (New)
Package is "containerd"
Sun Jan 7 17:21:29 2018 rev:22 rq:561515 version:0.2.9+gitr706_06b9cb351610
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2017-12-21
11:25:30.794755227 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes
2018-01-07 17:21:30.768882809 +0100
@@ -1,0 +2,8 @@
+Wed Dec 27 11:15:36 UTC 2017 - dims...@opensuse.org
+
+- Fix build with RPM 4.14: exclude is not meant for files to NOT be
+ packaged, but should only be used if the files are to be excluded
+ from a glob when they end up in a different package. Rather
+ remove the unwanted files in the install section.
+
+---
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.5UJj2V/_old 2018-01-07 17:21:31.340855999 +0100
+++ /var/tmp/diff_new_pack.5UJj2V/_new 2018-01-07 17:21:31.344855812 +0100
@@ -130,6 +130,8 @@
install -d -m755 %{buildroot}/usr/src/containerd/
cp -ar $HOME/go/src/github.com/containerd/containerd/*
%{buildroot}/usr/src/containerd/
+# remove files we don't want to ship - exclude is the wrong usage here
+rm -rf %{buildroot}/usr/src/containerd/bin
%fdupes %{buildroot}
@@ -162,6 +164,5 @@
%files test
%defattr(-,root,root)
/usr/src/containerd/
-%exclude /usr/src/containerd/bin
%changelog
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2017-12-21 11:25:26
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new (New)
Package is "containerd"
Thu Dec 21 11:25:26 2017 rev:21 rq:558283 version:0.2.9+gitr706_06b9cb351610
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2017-11-30
12:41:08.939173007 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes
2017-12-21 11:25:30.794755227 +0100
@@ -1,0 +2,6 @@
+Mon Dec 11 12:30:31 UTC 2017 - asa...@suse.com
+
+- Update to containerd@06b9cb35161009dcb7123345749fef02f7cea8e0, which is
+ requried by Docker 17.09.1_ce.
+
+---
Old:
containerd-git.3addd8406531.tar.xz
New:
containerd-git.06b9cb351610.tar.xz
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.Os92hk/_old 2017-12-21 11:25:31.654713295 +0100
+++ /var/tmp/diff_new_pack.Os92hk/_new 2017-12-21 11:25:31.654713295 +0100
@@ -26,17 +26,22 @@
%define GO_BUILD_FLAGS -buildmode=pie
# MANUAL: Update the git_version and git_revision
-%define git_version 3addd840653146c90a254301d6c3a663c7fd6429
-%define git_short 3addd8406531
+%define git_version 06b9cb35161009dcb7123345749fef02f7cea8e0
+%define git_short 06b9cb351610
# How to get the git_revision
# git clone https://github.com/containerd/containerd.git containerd-upstream
# cd containerd
# git checkout $git_version
# git_revision=r$(git rev-list HEAD | wc -l)
-%define git_revision r671
+%define git_revision r706
+
+# These are the git commits required. We verify them against the source to make
+# sure we didn't miss anything important when doing upgrades. This MUST match
+# required_dockerrunc in docker.spec!
+%define required_dockerrunc 3f2f8b84a77f73d38244dd690525642a72156c64
Name: containerd
-Version:0.2.8+git%{git_revision}_%{git_short}
+Version:0.2.9+git%{git_revision}_%{git_short}
Release:0
Summary:Standalone OCI Container Daemon
License:Apache-2.0
@@ -51,12 +56,11 @@
BuildRequires: fdupes
BuildRequires: golang(API) = 1.8
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# Currently runC is the only supported runtime for containerd. NOTE:
-# This version pinning is done to follow (as well as we can) upstream's
-# 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: docker-runc = 1.0.0rc3+gitr3201_2d41c04
+# We provide a git revision so that Docker can require it properly.
+Provides: %{name}-git = %{git_version}
+# Currently runC is the only supported runtime for containerd. We match the
+# same version as the one pinned by Docker.
+Requires: docker-runc-git = %{required_dockerrunc}
Requires(post): %fillup_prereq
%description
@@ -94,20 +98,24 @@
# Do not use symlinks. If you want to run the unit tests for this package at
# some point during the build and you need to directly use go list directly it
# will get confused by symlinks.
-export GOPATH=${HOME}/go:${HOME}/go/src/github.com/containerd/containerd/vendor
-mkdir -p $HOME/go/src/github.com/containerd/containerd
-rm -rf $HOME/go/src/github.com/containerd/containerd/*
-cp -ar * $HOME/go/src/github.com/containerd/containerd
-
-make GIT_COMMIT=%{git_version}
-cp bin/ctr ctr-%{version}
-cp bin/containerd containerd-%{version}
-cp bin/containerd-shim containerd-shim-%{version}
+export GOPATH=$HOME/go
+export PROJECT=$HOME/go/src/github.com/containerd/containerd
+mkdir -p $PROJECT
+rm -rf $PROJECT/*
+cp -ar * $PROJECT
+
+make -C $PROJECT GIT_COMMIT=%{git_version}
+cp $PROJECT/bin/ctr ctr-%{version}
+cp $PROJECT/bin/containerd containerd-%{version}
+cp $PROJECT/bin/containerd-shim containerd-shim-%{version}
%check
export GOPATH=$HOME/go/src/github.com/containerd/containerd/vendor:$GOPATH
cd $HOME/go/src/github.com/containerd/containerd
-%go_tool test %GO_BUILD_FLAGS -v $(%go_tool list ./... | grep
github.com/containerd/containerd | grep -v /integration-test)
+%go_tool test %GO_BUILD_FLAGS -v $(%go_tool list ./... | \
+ grepgithub.com/containerd/containerd | \
+ grep -v github.com/containerd/containerd/vendor | \
+ grep -v /integration-test)
%install
install -D -m755 containerd-%{version} %{buildroot}/%{_sbindir}/containerd
++ _service ++
--- /var/tmp/diff_new_pack.Os92hk/_old 2017-12-21 11:25:31.682711930 +0100
+++ /var/tmp/diff_new_pack.Os92hk/_new 2017-12-21 11:25:31.682711930 +0100
@@ -4,7 +4,7 @@
git
contain
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2017-11-30 12:41:05
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new (New)
Package is "containerd"
Thu Nov 30 12:41:05 2017 rev:20 rq:545161 version:0.2.8+gitr671_3addd8406531
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2017-11-03
16:33:14.961868534 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes
2017-11-30 12:41:08.939173007 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 13:48:04 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new
+ %_fillupdir macro (boo#1069468)
+
+---
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.VOsssV/_old 2017-11-30 12:41:09.919137377 +0100
+++ /var/tmp/diff_new_pack.VOsssV/_new 2017-11-30 12:41:09.923137231 +0100
@@ -17,6 +17,11 @@
# nodebuginfo
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+ %define _fillupdir /var/adm/fillup-templates
+%endif
+
%define go_tool go
%define GO_BUILD_FLAGS -buildmode=pie
@@ -113,7 +118,7 @@
install -D -m644 %SOURCE1 %{buildroot}/%{_unitdir}/%{name}.service
install -D -m644 %SOURCE2 %{buildroot}/%{_unitdir}/%{name}.socket
ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rccontainerd
-install -D -m644 %SOURCE3
%{buildroot}/var/adm/fillup-templates/sysconfig.%{name}
+install -D -m644 %SOURCE3 %{buildroot}%{_fillupdir}/sysconfig.%{name}
install -d -m755 %{buildroot}/usr/src/containerd/
cp -ar $HOME/go/src/github.com/containerd/containerd/*
%{buildroot}/usr/src/containerd/
@@ -140,7 +145,7 @@
%{_sbindir}/containerd-shim
%{_unitdir}/%{name}.service
%{_unitdir}/%{name}.socket
-/var/adm/fillup-templates/sysconfig.%{name}
+%{_fillupdir}/sysconfig.%{name}
%{_sbindir}/rccontainerd
%files ctr
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2017-11-03 16:32:13
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new (New)
Package is "containerd"
Fri Nov 3 16:32:13 2017 rev:19 rq:536962 version:0.2.8+gitr671_3addd8406531
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2017-10-20
14:39:35.009888959 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes
2017-11-03 16:33:14.961868534 +0100
@@ -1,0 +2,15 @@
+Thu Oct 26 19:27:48 UTC 2017 - asa...@suse.com
+
+- Set --start-timeout=2m by default to match upstream. bsc#1064926
+
+---
+Thu Oct 26 17:31:18 UTC 2017 - asa...@suse.com
+
+- Use the upstream makefile so that Docker can get the commit ID in `docker
+ info`. This also will avoid possible future warnings being spit out like
+ bsc#1065109 and boo#1053532.
+- Backport https://github.com/containerd/containerd/pull/1686, which is
+ required for the above fix. bsc#1065109 boo#1053532
+ + bsc1065109-0001-makefile-add-support-for-build_flags.patch
+
+---
New:
bsc1065109-0001-makefile-add-support-for-build_flags.patch
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.Krw7wP/_old 2017-11-03 16:33:15.785838543 +0100
+++ /var/tmp/diff_new_pack.Krw7wP/_new 2017-11-03 16:33:15.785838543 +0100
@@ -14,32 +14,36 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+# nodebuginfo
%define go_tool go
%define GO_BUILD_FLAGS -buildmode=pie
# MANUAL: Update the git_version and git_revision
-%define git_version 3addd8406531
+%define git_version 3addd840653146c90a254301d6c3a663c7fd6429
+%define git_short 3addd8406531
# How to get the git_revision
# git clone https://github.com/containerd/containerd.git containerd-upstream
# cd containerd
# git checkout $git_version
# git_revision=r$(git rev-list HEAD | wc -l)
%define git_revision r671
-%define version_unconverted %{git_version}
Name: containerd
-Version:0.2.8+git%{git_revision}_%{git_version}
+Version:0.2.8+git%{git_revision}_%{git_short}
Release:0
Summary:Standalone OCI Container Daemon
License:Apache-2.0
Group: System/Management
Url:https://containerd.tools
-Source: %{name}-git.%{git_version}.tar.xz
+Source: %{name}-git.%{git_short}.tar.xz
Source1:%{name}.service
Source2:%{name}.socket
Source3:sysconfig.%{name}
+# OPENSUSE-FIX-UPSTREAM: Backport of
https://github.com/containerd/containerd/pull/1686. bsc#1065109 boo#1053532
+Patch100: bsc1065109-0001-makefile-add-support-for-build_flags.patch
+BuildRequires: fdupes
BuildRequires: golang(API) = 1.8
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Currently runC is the only supported runtime for containerd. NOTE:
@@ -50,10 +54,6 @@
Requires: docker-runc = 1.0.0rc3+gitr3201_2d41c04
Requires(post): %fillup_prereq
-%define client ctr
-%define daemon %{name}
-%define shim %{name}-shim
-
%description
Containerd is a daemon with an API and a command line client, to manage
containers on one machine. It uses runC to run containers according to the OCI
@@ -81,7 +81,9 @@
Test package for containerd. It contains the source code and the tests.
%prep
-%setup -q -n %{name}-git.%{git_version}
+%setup -q -n %{name}-git.%{git_short}
+# bsc#1065109 boo#1053532
+%patch100 -p1
%build
# Do not use symlinks. If you want to run the unit tests for this package at
@@ -92,14 +94,10 @@
rm -rf $HOME/go/src/github.com/containerd/containerd/*
cp -ar * $HOME/go/src/github.com/containerd/containerd
-# Build daemon.
-%go_tool build %GO_BUILD_FLAGS -x -o %{daemon}-%{version}
github.com/containerd/%{name}/%{daemon}
-
-# Build shim.
-%go_tool build %GO_BUILD_FLAGS -x -o %{shim}-%{version}
github.com/containerd/%{name}/%{shim}
-
-# Build client.
-%go_tool build %GO_BUILD_FLAGS -x -o %{client}-%{version}
github.com/containerd/%{name}/%{client}
+make GIT_COMMIT=%{git_version}
+cp bin/ctr ctr-%{version}
+cp bin/containerd containerd-%{version}
+cp bin/containerd-shim containerd-shim-%{version}
%check
export GOPATH=$HOME/go/src/github.com/containerd/containerd/vendor:$GOPATH
@@ -107,9 +105,9 @@
%go_tool test %GO_BUILD_FLAGS -v $(%go_tool list ./... | grep
github.com/containerd/containerd | grep -v /integration-test)
%install
-install -D -m755 %{daemon}-%{version} %{buildroot}/%{_sbindir}/%{daemon}
-install -D -m755 %{shim}-%{version} %{buildroot}/%{_sbindir}/%{shim}
-install -D
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2017-10-20 14:39:32
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new (New)
Package is "containerd"
Fri Oct 20 14:39:32 2017 rev:18 rq:535048 version:0.2.8+gitr671_3addd8406531
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2017-08-17
11:43:58.203006058 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes
2017-10-20 14:39:35.009888959 +0200
@@ -1,0 +2,7 @@
+Wed Oct 18 04:40:53 UTC 2017 - asa...@suse.com
+
+- Update to containerd@3addd840653146c90a254301d6c3a663c7fd6429, which is
+ required by Docker 17.07.0_ce (this commit is effectively v0.2.9 with a few
+ bugfixes missing).
+
+---
Old:
containerd-git.422e31c.tar.xz
New:
containerd-git.3addd8406531.tar.xz
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.nm68zS/_old 2017-10-20 14:39:37.585768422 +0200
+++ /var/tmp/diff_new_pack.nm68zS/_new 2017-10-20 14:39:37.589768236 +0200
@@ -20,17 +20,17 @@
%define GO_BUILD_FLAGS -buildmode=pie
# MANUAL: Update the git_version and git_revision
-%define git_version 422e31c
+%define git_version 3addd8406531
# How to get the git_revision
-# git clone https://github.com/docker/containerd.git containerd-upstream
+# git clone https://github.com/containerd/containerd.git containerd-upstream
# cd containerd
# git checkout $git_version
# git_revision=r$(git rev-list HEAD | wc -l)
-%define git_revision r639
+%define git_revision r671
%define version_unconverted %{git_version}
Name: containerd
-Version:0.2.5+git%{git_revision}_%{git_version}
+Version:0.2.8+git%{git_revision}_%{git_version}
Release:0
Summary:Standalone OCI Container Daemon
License:Apache-2.0
@@ -40,15 +40,14 @@
Source1:%{name}.service
Source2:%{name}.socket
Source3:sysconfig.%{name}
-# Make sure we require go 1.7
-BuildRequires: golang(API) = 1.7
+BuildRequires: golang(API) = 1.8
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Currently runC is the only supported runtime for containerd. NOTE:
# This version pinning is done to follow (as well as we can) upstream's
# 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: docker-runc = 0.1.1+gitr2947_9c2d8d1
+Requires: docker-runc = 1.0.0rc3+gitr3201_2d41c04
Requires(post): %fillup_prereq
%define client ctr
@@ -66,8 +65,7 @@
Summary:Client for %{name}
Group: System/Management
Requires: %{name} = %{version}
-# Make sure we require go 1.7
-BuildRequires: golang(API) = 1.7
+BuildRequires: golang(API) = 1.8
%description ctr
Standalone client for containerd, which allows management of containerd
containers
@@ -75,9 +73,8 @@
%package test
Summary:Test package for containerd
-# Make sure we require go 1.7
Group: System/Management
-BuildRequires: golang(API) = 1.7
+BuildRequires: golang(API) = 1.8
BuildArch: noarch
%description test
@@ -90,24 +87,24 @@
# Do not use symlinks. If you want to run the unit tests for this package at
# some point during the build and you need to directly use go list directly it
# will get confused by symlinks.
-export GOPATH=${HOME}/go:${HOME}/go/src/github.com/docker/containerd/vendor
-mkdir -pv $HOME/go/src/github.com/docker/containerd
-rm -rf $HOME/go/src/github.com/docker/containerd/*
-cp -avr * $HOME/go/src/github.com/docker/containerd
+export GOPATH=${HOME}/go:${HOME}/go/src/github.com/containerd/containerd/vendor
+mkdir -p $HOME/go/src/github.com/containerd/containerd
+rm -rf $HOME/go/src/github.com/containerd/containerd/*
+cp -ar * $HOME/go/src/github.com/containerd/containerd
# Build daemon.
-%go_tool build %GO_BUILD_FLAGS -x -o %{daemon}-%{version}
github.com/docker/%{name}/%{daemon}
+%go_tool build %GO_BUILD_FLAGS -x -o %{daemon}-%{version}
github.com/containerd/%{name}/%{daemon}
# Build shim.
-%go_tool build %GO_BUILD_FLAGS -x -o %{shim}-%{version}
github.com/docker/%{name}/%{shim}
+%go_tool build %GO_BUILD_FLAGS -x -o %{shim}-%{version}
github.com/containerd/%{name}/%{shim}
# Build client.
-%go_tool build %GO_BUILD_FLAGS -x -o %{client}-%{version}
github.com/docker/%{name}/%{client}
+%go_tool build %GO_BUILD_FLAGS -x -o %{client}-%{version}
github.com/containerd/%{name}/%{client}
%check
-export GOPATH=$HOME/go/src/github.com/docker/containerd/vendor:$GOPATH
-cd $HOME/go/src/githu
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2017-08-17 11:43:56
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new (New)
Package is "containerd"
Thu Aug 17 11:43:56 2017 rev:17 rq:516136 version:0.2.5+gitr639_422e31c
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2017-07-30
11:22:42.308974384 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes
2017-08-17 11:43:58.203006058 +0200
@@ -1,0 +2,5 @@
+Thu Aug 3 14:50:09 UTC 2017 - asa...@suse.com
+
+- Use -buildmode=pie for tests and binary build. bsc#1048046 bsc#1051429
+
+---
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.elyz01/_old 2017-08-17 11:44:00.222720999 +0200
+++ /var/tmp/diff_new_pack.elyz01/_new 2017-08-17 11:44:00.230719870 +0200
@@ -17,7 +17,7 @@
%define go_tool go
-%define GO_BUILD_FLAGS %{nil}
+%define GO_BUILD_FLAGS -buildmode=pie
# MANUAL: Update the git_version and git_revision
%define git_version 422e31c
@@ -107,7 +107,7 @@
%check
export GOPATH=$HOME/go/src/github.com/docker/containerd/vendor:$GOPATH
cd $HOME/go/src/github.com/docker/containerd
-go test -v $(go list ./... | grep github.com/docker/containerd | grep -v
/integration-test)
+%go_tool test %GO_BUILD_FLAGS -v $(%go_tool list ./... | grep
github.com/docker/containerd | grep -v /integration-test)
%install
install -D -m755 %{daemon}-%{version} %{buildroot}/%{_sbindir}/%{daemon}
commit containerd for openSUSE:Factory
Hello community, here is the log from the commit of package containerd for openSUSE:Factory checked in at 2017-07-30 11:22:41 Comparing /work/SRC/openSUSE:Factory/containerd (Old) and /work/SRC/openSUSE:Factory/.containerd.new (New) Package is "containerd" Sun Jul 30 11:22:41 2017 rev:16 rq:509156 version:0.2.5+gitr639_422e31c Changes: --- /work/SRC/openSUSE:Factory/containerd/containerd.changes2017-05-20 10:13:24.586032281 +0200 +++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes 2017-07-30 11:22:42.308974384 +0200 @@ -1,0 +2,5 @@ +Thu Jul 6 14:22:16 UTC 2017 - th...@suse.de + +- change dependency to docker-runc + +--- Other differences: -- ++ containerd.spec ++ --- /var/tmp/diff_new_pack.0mRfVc/_old 2017-07-30 11:22:43.384822573 +0200 +++ /var/tmp/diff_new_pack.0mRfVc/_new 2017-07-30 11:22:43.388822008 +0200 @@ -48,7 +48,7 @@ # 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+gitr2947_9c2d8d1 +Requires: docker-runc = 0.1.1+gitr2947_9c2d8d1 Requires(post): %fillup_prereq %define client ctr
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2017-05-20 10:13:11
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new (New)
Package is "containerd"
Sat May 20 10:13:11 2017 rev:15 rq:494717 version:0.2.5+gitr639_422e31c
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2017-04-17
10:26:33.376132371 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes
2017-05-20 10:13:24.586032281 +0200
@@ -1,0 +2,34 @@
+Thu May 4 19:02:18 UTC 2017 - jmassaguer...@suse.com
+
+- fix golang requirement to 1.7 for the subpackages
+
+---
+Tue May 2 15:48:53 UTC 2017 - jmassaguer...@suse.com
+
+- fix golang requirement to 1.7
+
+---
+Fri Apr 28 16:18:44 UTC 2017 - jeng...@inai.de
+
+- Replace %__-type macro indirections
+
+---
+Thu Apr 13 16:17:55 UTC 2017 - jmassaguer...@suse.com
+
+- update containerd to the commit version needed for
+ docker-v17.04.0-ce (bsc#1034053)
+
+ fix bsc#1032769: containerd spurious messages filling journal
+
+---
+Wed Apr 12 09:56:54 UTC 2017 - jmassaguer...@suse.com
+
+- make sure this package is being built with go 1.7
+
+---
+Wed Apr 12 09:13:44 UTC 2017 - jmassaguer...@suse.com
+
+- remove the go_arches macro because we are using go1.7 which
+ is available in all archs
+
+---
Old:
containerd-git.03e5862.tar.xz
New:
containerd-git.422e31c.tar.xz
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.VCOKf3/_old 2017-05-20 10:13:25.749867841 +0200
+++ /var/tmp/diff_new_pack.VCOKf3/_new 2017-05-20 10:13:25.753867276 +0200
@@ -16,36 +16,17 @@
#
-# Check if go_arches is defined in the project configuration
-# Otherwise, define it here
-# In order to define it in the project configuration, see
-#
-# https://en.opensuse.org/openSUSE:Build%20Service%20prjconf#Macros
-#
-# The Macros tag is the one that defines the go_arches variable to be used
-# in the spec file.
-# The "define" one is to help the specfile parser of the buildservice
-# to see what packages are being built. You also want to define it here
-# for keeping things consistent.
-
-%{!?go_arches: %global go_arches %ix86 x86_64 aarch64 ppc64le}
-
-%ifarch %go_arches
%define go_tool go
%define GO_BUILD_FLAGS %{nil}
-%else
-%define go_tool go-6
-%define GO_BUILD_FLAGS "-gccgoflags=-Wl,--add-needed -Wl,--no-as-needed
-static-libgo -ldl"
-%endif
# MANUAL: Update the git_version and git_revision
-%define git_version 03e5862
+%define git_version 422e31c
# How to get the git_revision
# git clone https://github.com/docker/containerd.git containerd-upstream
# cd containerd
# git checkout $git_version
# git_revision=r$(git rev-list HEAD | wc -l)
-%define git_revision r608
+%define git_revision r639
%define version_unconverted %{git_version}
Name: containerd
@@ -59,18 +40,15 @@
Source1:%{name}.service
Source2:%{name}.socket
Source3:sysconfig.%{name}
-%ifarch %go_arches
-BuildRequires: go >= 1.5
-%else
-BuildRequires: gcc6-go >= 6.1
-%endif
+# Make sure we require go 1.7
+BuildRequires: golang(API) = 1.7
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Currently runC is the only supported runtime for containerd. NOTE:
# This version pinning is done to follow (as well as we can) upstream's
# 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+gitr2942_2f7393a
+Requires: runc = 0.1.1+gitr2947_9c2d8d1
Requires(post): %fillup_prereq
%define client ctr
@@ -88,11 +66,8 @@
Summary:Client for %{name}
Group: System/Management
Requires: %{name} = %{version}
-%ifarch %go_arches
-BuildRequires: go >= 1.5
-%else
-BuildRequires: gcc6-go >= 6.1
-%endif
+# Make sure we require go 1.7
+BuildRequires: golang(API) = 1.7
%description ctr
Standalone client for containerd, which allows management of containerd
containers
@@ -100,12 +75,9 @@
%package test
Summary:Test package for containerd
+# Make sure we require go 1.7
Group: System/Management
-%ifarch %go_arches
-Requires: go >= 1.5
-%else
-Requires: gcc5-go >= 5.0
-%endif
+BuildRequires: g
commit containerd for openSUSE:Factory
Hello community, here is the log from the commit of package containerd for openSUSE:Factory checked in at 2017-04-17 10:26:32 Comparing /work/SRC/openSUSE:Factory/containerd (Old) and /work/SRC/openSUSE:Factory/.containerd.new (New) Package is "containerd" Mon Apr 17 10:26:32 2017 rev:14 rq:487505 version:0.2.5+gitr608_03e5862 Changes: --- /work/SRC/openSUSE:Factory/containerd/containerd.changes2017-03-12 20:05:54.253589780 +0100 +++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes 2017-04-17 10:26:33.376132371 +0200 @@ -1,0 +2,5 @@ +Wed Apr 12 08:02:59 UTC 2017 - asa...@suse.com + +- Set TasksMax=infinity to make sure runC doesn't start failing randomly. + +--- Other differences: -- ++ containerd.service ++ --- /var/tmp/diff_new_pack.OkvIcD/_old 2017-04-17 10:26:34.859922240 +0200 +++ /var/tmp/diff_new_pack.OkvIcD/_new 2017-04-17 10:26:34.859922240 +0200 @@ -10,10 +10,15 @@ LimitNOFILE=1048576 LimitNPROC=1048576 LimitCORE=infinity + # While containerd doesn't directly modify cgroups, we have to make sure that # systemd doesn't suddenly decide to mess around with runC's cgroup setup. Delegate=true +# TasksMax is set to a silly value by default, so we need to bump it up to +# infinity so that containers don't randomly fail to spawn. +TasksMax=infinity + [Install] WantedBy=multi-user.target
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2017-03-12 20:05:53
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new (New)
Package is "containerd"
Sun Mar 12 20:05:53 2017 rev:13 rq:478793 version:0.2.5+gitr608_03e5862
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2017-01-23
11:36:12.223970852 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes
2017-03-12 20:05:54.253589780 +0100
@@ -1,0 +2,5 @@
+Fri Feb 24 18:08:41 UTC 2017 - jmassaguer...@suse.com
+
+- update to docker 1.13.0 requirement
+
+---
Old:
containerd-git.2a5e70c.tar.xz
New:
containerd-git.03e5862.tar.xz
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.OJGEv8/_old 2017-03-12 20:05:55.049477158 +0100
+++ /var/tmp/diff_new_pack.OJGEv8/_new 2017-03-12 20:05:55.053476592 +0100
@@ -39,13 +39,13 @@
%endif
# MANUAL: Update the git_version and git_revision
-%define git_version 2a5e70c
+%define git_version 03e5862
# How to get the git_revision
# git clone https://github.com/docker/containerd.git containerd-upstream
# cd containerd
# git checkout $git_version
# git_revision=r$(git rev-list HEAD | wc -l)
-%define git_revision r569
+%define git_revision r608
%define version_unconverted %{git_version}
Name: containerd
@@ -70,7 +70,7 @@
# 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+gitr2819_50a19c6
+Requires: runc = 0.1.1+gitr2942_2f7393a
Requires(post): %fillup_prereq
%define client ctr
++ _service ++
--- /var/tmp/diff_new_pack.OJGEv8/_old 2017-03-12 20:05:55.089471499 +0100
+++ /var/tmp/diff_new_pack.OJGEv8/_new 2017-03-12 20:05:55.089471499 +0100
@@ -4,7 +4,7 @@
git
containerd
git.%h
-2a5e70cbf65457815ee76b7e5dd2a01292d9eca8
+03e5862ec0d8d3b3f750e19fca3ee367e13c090e
.git
++ containerd-git.2a5e70c.tar.xz -> containerd-git.03e5862.tar.xz ++
11011 lines of diff (skipped)
commit containerd for openSUSE:Factory
Hello community, here is the log from the commit of package containerd for openSUSE:Factory checked in at 2017-01-23 11:36:11 Comparing /work/SRC/openSUSE:Factory/containerd (Old) and /work/SRC/openSUSE:Factory/.containerd.new (New) Package is "containerd" Changes: --- /work/SRC/openSUSE:Factory/containerd/containerd.changes2017-01-10 10:44:26.971170352 +0100 +++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes 2017-01-23 11:36:12.223970852 +0100 @@ -1,0 +2,6 @@ +Sat Jan 14 06:38:29 UTC 2017 - asa...@suse.com + +- Update docker to the version used in Docker 1.12.6. This is necessary to fix + CVE-2016-9962 (bsc#1012568). + +--- Other differences: -- ++ containerd.spec ++ --- /var/tmp/diff_new_pack.UdRsAV/_old 2017-01-23 11:36:12.795889746 +0100 +++ /var/tmp/diff_new_pack.UdRsAV/_new 2017-01-23 11:36:12.795889746 +0100 @@ -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 @@ # 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
commit containerd for openSUSE:Factory
Hello community, here is the log from the commit of package containerd for openSUSE:Factory checked in at 2016-12-06 14:26:57 Comparing /work/SRC/openSUSE:Factory/containerd (Old) and /work/SRC/openSUSE:Factory/.containerd.new (New) Package is "containerd" Changes: --- /work/SRC/openSUSE:Factory/containerd/containerd.changes2016-11-29 12:49:41.0 +0100 +++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes 2016-12-06 14:26:58.0 +0100 @@ -163,12 +162,0 @@ -Thu Mar 31 03:42:39 UTC 2016 - asa...@suse.de - -* Update to containerd 0.1.0. This required quite a few fixes. -* Use socket activation with the containerd daemon. This requires a - not-yet-upstream patchset (https://github.com/docker/containerd/pull/178): - + socket-activation-01-vendor.patch - + socket-activation-02-daemon.patch - + socket-activation-03-ctr.patch -* Remove MountFlags=slave since it's not relevant to containerd and might cause - issues in the future. - @@ -182,6 +169,0 @@ -Sun Mar 27 10:19:02 UTC 2016 - asa...@suse.de - -* Add initial packaging of containerd 0.0.5. -* Install to /usr/sbin. -* Separately package the client from the server. Other differences: --
commit containerd for openSUSE:Factory
Hello community, here is the log from the commit of package containerd for openSUSE:Factory checked in at 2016-11-29 12:49:39 Comparing /work/SRC/openSUSE:Factory/containerd (Old) and /work/SRC/openSUSE:Factory/.containerd.new (New) Package is "containerd" Changes: --- /work/SRC/openSUSE:Factory/containerd/containerd.changes2016-11-24 21:25:52.0 +0100 +++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes 2016-11-29 12:49:41.0 +0100 @@ -1,0 +2,6 @@ +Thu Nov 24 16:10:41 UTC 2016 - jmassaguer...@suse.com + +- fix runc version + fix bsc#1009961 + +--- Other differences: -- ++ containerd.spec ++ --- /var/tmp/diff_new_pack.4uZkdf/_old 2016-11-29 12:49:42.0 +0100 +++ /var/tmp/diff_new_pack.4uZkdf/_new 2016-11-29 12:49:42.0 +0100 @@ -70,7 +70,7 @@ # 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+git02f8fa7 +Requires: runc = 0.1.1+gitr2816_02f8fa7 Requires(post): %fillup_prereq %define client ctr
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2016-11-24 21:25:51
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new (New)
Package is "containerd"
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2016-10-26
13:29:23.0 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes
2016-11-24 21:25:52.0 +0100
@@ -1,0 +2,6 @@
+Thu Nov 24 12:09:48 UTC 2016 - jmassaguer...@suse.com
+
+- fix version so that it contains a sequence number and zypper does
+ not think is a downgrade
+
+---
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.AiBN1O/_old 2016-11-24 21:25:53.0 +0100
+++ /var/tmp/diff_new_pack.AiBN1O/_new 2016-11-24 21:25:53.0 +0100
@@ -38,11 +38,18 @@
%define GO_BUILD_FLAGS "-gccgoflags=-Wl,--add-needed -Wl,--no-as-needed
-static-libgo -ldl"
%endif
+# MANUAL: Update the git_version and git_revision
%define git_version 0366d7e
+# How to get the git_revision
+# git clone https://github.com/docker/containerd.git containerd-upstream
+# cd containerd
+# git checkout $git_version
+# git_revision=r$(git rev-list HEAD | wc -l)
+%define git_revision r565
%define version_unconverted %{git_version}
Name: containerd
-Version:0.2.4+git%{git_version}
+Version:0.2.4+git%{git_revision}_%{git_version}
Release:0
Summary:Standalone OCI Container Daemon
License:Apache-2.0
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2016-10-26 13:29:22
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new (New)
Package is "containerd"
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2016-09-21
18:49:25.0 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes
2016-10-26 13:29:23.0 +0200
@@ -1,0 +2,19 @@
+Tue Oct 25 11:15:13 UTC 2016 - jmassaguer...@suse.com
+
+- fix bsc#1006368: docker/containerd is broken when installed by
+ SuSE Studio in an appliance: We were missing the
+Requires(post): %fillup_prereq
+
+---
+Tue Oct 25 08:32:22 UTC 2016 - jmassaguer...@suse.com
+
+- update runc requirement to 02f8fa7863dd3f82909a73e2061897828460d52f
+ (see RUNC_COMMIT in Dockerfile)
+
+---
+Thu Oct 13 11:14:39 UTC 2016 - jmassaguer...@suse.com
+
+- update to commit 0366d7e which is the one required for docker-1.12.2
+ (bsc#1004490)
+
+---
Old:
containerd-0.2.3.tar.xz
New:
containerd-git.0366d7e.tar.xz
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.L0adWu/_old 2016-10-26 13:29:26.0 +0200
+++ /var/tmp/diff_new_pack.L0adWu/_new 2016-10-26 13:29:26.0 +0200
@@ -38,17 +38,17 @@
%define GO_BUILD_FLAGS "-gccgoflags=-Wl,--add-needed -Wl,--no-as-needed
-static-libgo -ldl"
%endif
-%define git_version 973f21f
-%define version_unconverted 0.2.3
+%define git_version 0366d7e
+%define version_unconverted %{git_version}
Name: containerd
-Version:0.2.3
+Version:0.2.4+git%{git_version}
Release:0
Summary:Standalone OCI Container Daemon
License:Apache-2.0
Group: System/Management
Url:https://containerd.tools
-Source: %{name}-%{version}.tar.xz
+Source: %{name}-git.%{git_version}.tar.xz
Source1:%{name}.service
Source2:%{name}.socket
Source3:sysconfig.%{name}
@@ -63,7 +63,8 @@
# 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+gitcc29e3d
+Requires: runc = 0.1.1+git02f8fa7
+Requires(post): %fillup_prereq
%define client ctr
%define daemon %{name}
@@ -104,7 +105,7 @@
Test package for containerd. It contains the source code and the tests.
%prep
-%setup -q
+%setup -q -n %{name}-git.%{git_version}
%build
# Do not use symlinks. If you want to run the unit tests for this package at
++ _service ++
--- /var/tmp/diff_new_pack.L0adWu/_old 2016-10-26 13:29:26.0 +0200
+++ /var/tmp/diff_new_pack.L0adWu/_new 2016-10-26 13:29:26.0 +0200
@@ -3,8 +3,8 @@
https://github.com/docker/containerd.git
git
containerd
-0.2.3
-v0.2.3
+git.%h
+0366d7e9693c930cf18c0f50cc16acec064e96c5
.git
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2016-09-21 18:49:24
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new (New)
Package is "containerd"
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2016-08-20
12:27:23.0 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes
2016-09-21 18:49:25.0 +0200
@@ -1,0 +2,43 @@
+Mon Sep 19 11:58:44 UTC 2016 - jmassaguer...@suse.com
+
+- fix go_arches definition: use global instead of define, otherwise
+ it fails to build
+
+---
+Thu Aug 25 15:54:38 UTC 2016 - jmassaguer...@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
+
+---
+Wed Aug 24 12:25:46 UTC 2016 - jmassaguer...@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.
+
+---
+Mon Aug 22 18:14:40 UTC 2016 - jmassaguer...@suse.com
+
+- update to v2.3.0 (bsc#995058)
+- Remove patches which were already merged upstream:
+ * socket-activation-01-vendor.patch
+ * socket-activation-02-daemon.patch
+ * socket-activation-03-ctr.patch
+
+---
+Thu Aug 18 10:34:29 UTC 2016 - jmassaguer...@suse.com
+
+- use gcc6-go instead of gcc5-go (bsc#988408)
+- build ppc64le with gc-go because this version builds with gc-go 1.6
+
+---
+Thu Aug 18 10:33:29 UTC 2016 - cbrau...@suse.com
+
+- bump git commit id to the one required by docker v1.12.0
+- run test during build
+- only run tests on architectures that provide the go list and got test tools
+- add aarch64 to go arches
+
+---
@@ -88,0 +132,12 @@
+Thu Mar 31 03:42:39 UTC 2016 - asa...@suse.de
+
+* Update to containerd 0.1.0. This required quite a few fixes.
+* Use socket activation with the containerd daemon. This requires a
+ not-yet-upstream patchset (https://github.com/docker/containerd/pull/178):
+ + socket-activation-01-vendor.patch
+ + socket-activation-02-daemon.patch
+ + socket-activation-03-ctr.patch
+* Remove MountFlags=slave since it's not relevant to containerd and might cause
+ issues in the future.
+
+---
@@ -95,0 +151,6 @@
+---
+Sun Mar 27 10:19:02 UTC 2016 - asa...@suse.de
+
+* Add initial packaging of containerd 0.0.5.
+* Install to /usr/sbin.
+* Separately package the client from the server.
Old:
containerd-0.2.2.tar.xz
socket-activation-01-vendor.patch
socket-activation-02-daemon.patch
socket-activation-03-ctr.patch
New:
containerd-0.2.3.tar.xz
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.KTw9p0/_old 2016-09-21 18:49:27.0 +0200
+++ /var/tmp/diff_new_pack.KTw9p0/_new 2016-09-21 18:49:27.0 +0200
@@ -16,20 +16,33 @@
#
-%define go_arches %ix86 x86_64 aarch64
+# Check if go_arches is defined in the project configuration
+# Otherwise, define it here
+# In order to define it in the project configuration, see
+#
+# https://en.opensuse.org/openSUSE:Build%20Service%20prjconf#Macros
+#
+# The Macros tag is the one that defines the go_arches variable to be used
+# in the spec file.
+# The "define" one is to help the specfile parser of the buildservice
+# to see what packages are being built. You also want to define it here
+# for keeping things consistent.
+
+%{!?go_arches: %global go_arches %ix86 x86_64 aarch64 ppc64le}
%ifarch %go_arches
%define go_tool go
%define GO_BUILD_FLAGS %{nil}
%else
-%define go_tool go-5
+%define go_tool go-6
%define GO_BUILD_FLAGS "-gccgoflags=-Wl,--add-needed -Wl,--no-as-needed
-static-libgo -ldl"
%endif
-%define version_unconverted 0.2.2
+%define git_version 973f21f
+%define version_unconverted 0.2.3
Name: containerd
-Version:0.2.2
+Version:0.2.3
Release:0
Summary:Standalone OCI Container Daemon
License:Apache-2.0
@@ -39,15 +52,10 @@
Source1:%{name}.service
Source2:%{name}.socket
Source3:sysconfig.%{name}
-# Patches to implement systemd socket activation.
-# https://github.com/docker/conta
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2016-08-20 12:27:21
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new (New)
Package is "containerd"
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2016-08-17
12:06:04.0 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes
2016-08-20 12:27:23.0 +0200
@@ -1,0 +2,9 @@
+Thu Aug 18 09:44:56 UTC 2016 - cbrau...@suse.de
+
+- Add containerd-test package which contains the source code and the test. This
+ package will be used to run the integration tests.
+- Simplify package build and check sections: Instead of symlinking we default
to
+ cp -avr. go list gets confused by symlinks hence, we need to copy the source
+ code anyway if we want to run unit tests during package build at some point.
+
+---
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.MUsFlq/_old 2016-08-20 12:27:24.0 +0200
+++ /var/tmp/diff_new_pack.MUsFlq/_new 2016-08-20 12:27:24.0 +0200
@@ -82,6 +82,19 @@
Standalone client for containerd, which allows management of containerd
containers
separately from Docker.
+%package test
+Summary:Test package for containerd
+Group: System/Management
+%ifarch %go_arches
+Requires: go >= 1.5
+%else
+Requires: gcc5-go >= 5.0
+%endif
+BuildArch: noarch
+
+%description test
+Test package for containerd. It contains the source code and the tests.
+
%prep
%setup -q
# Systemd socket activation patches.
@@ -90,10 +103,13 @@
%patch103 -p1
%build
-# Create buildir,
-export GOPATH=$PWD/vendor
-mkdir -pv $GOPATH/src/github.com/docker/
-ln -svfn $PWD $GOPATH/src/github.com/docker/containerd
+# Do not use symlinks. If you want to run the unit tests for this package at
+# some point during the build and you need to directly use go list directly it
+# will get confused by symlinks.
+export
GOPATH=${HOME}/go:${HOME}/go/src/github.com/docker/containerd/vendor:${GOPATH}
+mkdir -pv $HOME/go/src/github.com/docker/containerd
+rm -rf $HOME/go/src/github.com/docker/containerd/*
+cp -avr * $HOME/go/src/github.com/docker/containerd
# Build deamon.
%go_tool build %GO_BUILD_FLAGS -x -o %{daemon}-%{version}
github.com/docker/%{name}/%{daemon}
@@ -115,6 +131,9 @@
ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rccontainerd
%{__install} -D -m644 %SOURCE3
%{buildroot}/var/adm/fillup-templates/sysconfig.%{name}
+install -d -m755 %{buildroot}/usr/src/containerd/
+cp -avr $HOME/go/src/github.com/docker/containerd/*
%{buildroot}/usr/src/containerd/
+
%pre
%service_add_pre %{name}.service %{name}.socket
@@ -141,4 +160,9 @@
%files ctr
%{_sbindir}/%{name}-%{client}
+%files test
+%defattr(-,root,root)
+/usr/src/containerd/
+%exclude /usr/src/containerd/bin
+
%changelog
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2016-08-17 12:06:03
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new (New)
Package is "containerd"
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2016-07-21
08:19:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes
2016-08-17 12:06:04.0 +0200
@@ -1,0 +2,9 @@
+Tue Aug 16 09:51:37 UTC 2016 - asa...@suse.com
+
+* Explicitly state the version dependency for runC, to avoid potential
+ issues with incompatible component versions. These must be updated
+ *each time we do a release*. Unfortunately we cannot create a hard
+ dependency because that would conflict with Docker, and was a mistake
+ on upstream's part. bsc#993847
+
+---
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.bidQkp/_old 2016-08-17 12:06:06.0 +0200
+++ /var/tmp/diff_new_pack.bidQkp/_new 2016-08-17 12:06:06.0 +0200
@@ -50,7 +50,12 @@
BuildRequires: gcc5-go >= 5.0
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: runc
+# Currently runC is the only supported runtime for containerd. NOTE:
+# This version pinning is done to follow (as well as we can) upstream's
+# 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.0
%define client ctr
%define daemon %{name}
commit containerd for openSUSE:Factory
Hello community, here is the log from the commit of package containerd for openSUSE:Factory checked in at 2016-07-21 08:19:03 Comparing /work/SRC/openSUSE:Factory/containerd (Old) and /work/SRC/openSUSE:Factory/.containerd.new (New) Package is "containerd" Changes: --- /work/SRC/openSUSE:Factory/containerd/containerd.changes2016-06-23 13:36:06.0 +0200 +++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes 2016-07-21 08:19:07.0 +0200 @@ -1,0 +2,5 @@ +Wed Jul 20 10:32:45 UTC 2016 - asa...@suse.com + +* Set --runtime option specifically to runC. bsc#978260 + +--- @@ -4 +9 @@ -* Update to containerd v0.2.2. +* Update to containerd v0.2.2. (bsc#989566 FATE#320763) Other differences: -- ++ containerd.service ++ --- /var/tmp/diff_new_pack.ixkYKt/_old 2016-07-21 08:19:07.0 +0200 +++ /var/tmp/diff_new_pack.ixkYKt/_new 2016-07-21 08:19:07.0 +0200 @@ -6,7 +6,7 @@ [Service] EnvironmentFile=/etc/sysconfig/containerd -ExecStart=/usr/sbin/containerd --listen fd:// $CONTAINERD_OPTS +ExecStart=/usr/sbin/containerd --listen fd:// --runtime /usr/sbin/runc $CONTAINERD_OPTS LimitNOFILE=1048576 LimitNPROC=1048576 LimitCORE=infinity
commit containerd for openSUSE:Factory
Hello community,
here is the log from the commit of package containerd for openSUSE:Factory
checked in at 2016-06-23 13:36:06
Comparing /work/SRC/openSUSE:Factory/containerd (Old)
and /work/SRC/openSUSE:Factory/.containerd.new (New)
Package is "containerd"
Changes:
--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2016-05-04
08:20:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes
2016-06-23 13:36:06.0 +0200
@@ -1,0 +2,6 @@
+Fri Jun 17 14:42:43 UTC 2016 - asa...@suse.de
+
+* Update to containerd v0.2.2.
+* Includes updates to the out-of-tree patches.
+
+---
Old:
containerd-0.2.1.tar.xz
New:
containerd-0.2.2.tar.xz
Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.m7Lenu/_old 2016-06-23 13:36:07.0 +0200
+++ /var/tmp/diff_new_pack.m7Lenu/_new 2016-06-23 13:36:07.0 +0200
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%define go_arches %ix86 x86_64 aarch64
%ifarch %go_arches
@@ -25,15 +26,15 @@
%define GO_BUILD_FLAGS "-gccgoflags=-Wl,--add-needed -Wl,--no-as-needed
-static-libgo -ldl"
%endif
-%define version_unconverted 0.2.1
+%define version_unconverted 0.2.2
Name: containerd
-Version:0.2.1
+Version:0.2.2
Release:0
-License:Apache-2.0
Summary:Standalone OCI Container Daemon
-Url:https://containerd.tools
+License:Apache-2.0
Group: System/Management
+Url:https://containerd.tools
Source: %{name}-%{version}.tar.xz
Source1:%{name}.service
Source2:%{name}.socket
@@ -134,3 +135,5 @@
%files ctr
%{_sbindir}/%{name}-%{client}
+
+%changelog
++ _service ++
--- /var/tmp/diff_new_pack.m7Lenu/_old 2016-06-23 13:36:08.0 +0200
+++ /var/tmp/diff_new_pack.m7Lenu/_new 2016-06-23 13:36:08.0 +0200
@@ -3,8 +3,8 @@
https://github.com/docker/containerd.git
git
containerd
-0.2.1
-v0.2.1
+0.2.2
+v0.2.2
.git
++ containerd-0.2.1.tar.xz -> containerd-0.2.2.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/containerd-0.2.1/api/grpc/server/server_linux.go
new/containerd-0.2.2/api/grpc/server/server_linux.go
--- old/containerd-0.2.1/api/grpc/server/server_linux.go2016-04-29
10:59:28.0 +0200
+++ new/containerd-0.2.2/api/grpc/server/server_linux.go2016-06-17
16:39:42.0 +0200
@@ -142,6 +142,7 @@
Failcnt: memSt.KernelUsage.Failcnt,
Limit:memSt.KernelUsage.Limit,
},
+ Stats: memSt.Stats,
}
blkSt := lcSt.CgroupStats.BlkioStats
pbSt.CgroupStats.BlkioStats = &types.BlkioStats{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/containerd-0.2.1/version.go
new/containerd-0.2.2/version.go
--- old/containerd-0.2.1/version.go 2016-04-29 10:59:28.0 +0200
+++ new/containerd-0.2.2/version.go 2016-06-17 16:39:42.0 +0200
@@ -1,5 +1,5 @@
package containerd
-const Version = "0.1.0"
+const Version = "0.2.2"
var GitCommit = ""
++ socket-activation-01-vendor.patch ++
--- /var/tmp/diff_new_pack.m7Lenu/_old 2016-06-23 13:36:08.0 +0200
+++ /var/tmp/diff_new_pack.m7Lenu/_new 2016-06-23 13:36:08.0 +0200
@@ -79,11 +79,11 @@
create mode 100644 vendor/src/golang.org/x/net/proxy/proxy.go
create mode 100644 vendor/src/golang.org/x/net/proxy/socks5.go
-diff --git a/hack/vendor.sh b/hack/vendor.sh
-index 6848552..31c7df2 100755
a/hack/vendor.sh
-+++ b/hack/vendor.sh
-@@ -9,7 +9,7 @@ clone git github.com/cloudfoundry/gosigar
3ed7c74352dae6dc00bdc8c74045375352e3ec
+Index: containerd-0.2.2/hack/vendor.sh
+===
+--- containerd-0.2.2.orig/hack/vendor.sh
containerd-0.2.2/hack/vendor.sh
+@@ -9,7 +9,7 @@ clone git github.com/cloudfoundry/gosiga
clone git github.com/codegangsta/cli 9fec0fad02befc9209347cc6d620e68e1b45f74d
clone git github.com/coreos/go-systemd
7b2428fec40033549c68f54e26e89e7ca9a9ce31
clone git github.com/cyberdelia/go-metrics-graphite
7e54b5c2aa6eaff4286c44129c3def899dff528c
@@ -92,7 +92,7 @@
clone git github.com/docker/go-units 5d2041e26a699eaca682e2ea41c8f891e1060444
clone git github.com/godbus/dbus e2cf28118e66a6a63db46cf6088a35d2054d3bb0
clone git github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998
-@@ -28,4 +28,8 @@ clone git github.com/seccomp/libseccomp-golang
1b506fc7
