Accepting request 981103 from Virtualization:containers
OBS-URL: https://build.opensuse.org/request/show/981103 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/containerd?expand=0&rev=49
This commit is contained in:
commit
07a16822a4
4
_service
4
_service
@ -3,8 +3,8 @@
|
|||||||
<param name="url">https://github.com/containerd/containerd.git</param>
|
<param name="url">https://github.com/containerd/containerd.git</param>
|
||||||
<param name="scm">git</param>
|
<param name="scm">git</param>
|
||||||
<param name="filename">containerd</param>
|
<param name="filename">containerd</param>
|
||||||
<param name="versionformat">1.5.11_%h</param>
|
<param name="versionformat">1.6.6_%h</param>
|
||||||
<param name="revision">v1.5.11</param>
|
<param name="revision">v1.6.6</param>
|
||||||
<param name="exclude">.git</param>
|
<param name="exclude">.git</param>
|
||||||
</service>
|
</service>
|
||||||
<service name="recompress" mode="disabled">
|
<service name="recompress" mode="disabled">
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:9c336dd3501a9a81e24d3385b84a946bc252e6379929e372bac58c31d757d688
|
|
||||||
size 4439804
|
|
3
containerd-1.6.6_10c12954828e.tar.xz
Normal file
3
containerd-1.6.6_10c12954828e.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:91a3145a069c223e7db9694c1c08f44457f15f9b6fc77a156d558587e01bcb0d
|
||||||
|
size 5209856
|
@ -1,3 +1,25 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jun 7 07:22:02 UTC 2022 - Aleksa Sarai <asarai@suse.com>
|
||||||
|
|
||||||
|
- Update to containerd v1.6.6 to fix CVE-2022-31030 and meet the requirements
|
||||||
|
of Docker v20.10.17-ce. bsc#1200145
|
||||||
|
- Remove upstreamed patches:
|
||||||
|
- bsc1200145-Limit-the-response-size-of-ExecSync.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 6 05:49:56 UTC 2022 - Aleksa Sarai <asarai@suse.com>
|
||||||
|
|
||||||
|
[ This patch was only released in SLES and Leap. ]
|
||||||
|
|
||||||
|
- Backport patch to fix GHSA-5ffw-gxpp-mxpf CVE-2022-31030. bsc#1200145
|
||||||
|
+ bsc1200145-Limit-the-response-size-of-ExecSync.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 6 05:41:10 UTC 2022 - Aleksa Sarai <asarai@suse.com>
|
||||||
|
|
||||||
|
- Update to containerd v1.5.12. Upstream release notes:
|
||||||
|
<https://github.com/containerd/containerd/releases/tag/v1.5.12>
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Apr 14 04:15:16 UTC 2022 - Aleksa Sarai <asarai@suse.com>
|
Thu Apr 14 04:15:16 UTC 2022 - Aleksa Sarai <asarai@suse.com>
|
||||||
|
|
||||||
|
@ -23,11 +23,11 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
# MANUAL: Update the git_version.
|
# MANUAL: Update the git_version.
|
||||||
%define git_version 3df54a852345ae127d1fa3092b95168e4a88e2f8
|
%define git_version 10c12954828e7c7c9b6e0ea9b0c02b01407d3ae1
|
||||||
%define git_short 3df54a852345
|
%define git_short 10c12954828e
|
||||||
|
|
||||||
Name: containerd
|
Name: containerd
|
||||||
Version: 1.5.11
|
Version: 1.6.6
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Standalone OCI Container Daemon
|
Summary: Standalone OCI Container Daemon
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
@ -43,8 +43,8 @@ BuildRequires: libbtrfs-devel >= 3.8
|
|||||||
BuildRequires: libseccomp-devel >= 2.2
|
BuildRequires: libseccomp-devel >= 2.2
|
||||||
BuildRequires: pkg-config
|
BuildRequires: pkg-config
|
||||||
# Due to a limitation in openSUSE's Go packaging we cannot have a BuildRequires
|
# Due to a limitation in openSUSE's Go packaging we cannot have a BuildRequires
|
||||||
# for 'golang(API) >= 1.16' here, so just require 1.16 exactly. bsc#1172608
|
# for 'golang(API) >= 1.18' here, so just require 1.18 exactly. bsc#1172608
|
||||||
BuildRequires: go1.16
|
BuildRequires: go1.18
|
||||||
# We provide a git revision so that Docker can require it properly.
|
# We provide a git revision so that Docker can require it properly.
|
||||||
Provides: %{name}-git = %{git_version}
|
Provides: %{name}-git = %{git_version}
|
||||||
# Currently runc is the only supported runtime for containerd. We pin the same
|
# Currently runc is the only supported runtime for containerd. We pin the same
|
||||||
@ -84,21 +84,8 @@ separately from Docker.
|
|||||||
%setup -q -n %{name}-%{version}_%{git_short}
|
%setup -q -n %{name}-%{version}_%{git_short}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# NOTE: containerd will switch to go.mod in 1.5.x so this can be removed after
|
|
||||||
# we update to that version.
|
|
||||||
|
|
||||||
# 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
|
|
||||||
export PROJECT=$HOME/go/src/github.com/containerd/containerd
|
|
||||||
export GO111MODULE=off
|
|
||||||
mkdir -p $PROJECT
|
|
||||||
rm -rf $PROJECT/*
|
|
||||||
cp -ar * $PROJECT
|
|
||||||
|
|
||||||
BUILDTAGS="apparmor selinux seccomp"
|
BUILDTAGS="apparmor selinux seccomp"
|
||||||
make -C "$PROJECT"\
|
%make_build \
|
||||||
BUILDTAGS="$BUILDTAGS" \
|
BUILDTAGS="$BUILDTAGS" \
|
||||||
VERSION="v%{version}" \
|
VERSION="v%{version}" \
|
||||||
REVISION="%{git_version}"
|
REVISION="%{git_version}"
|
||||||
|
Loading…
Reference in New Issue
Block a user