diff --git a/apply-patch b/apply-patch index 9a5fa9ac5812252139ca808de4d25ab051546652..9aa055f8e11a43782686746431a0dbfe7d34d1a7 100755 --- a/apply-patch +++ b/apply-patch @@ -7,11 +7,11 @@ set -ex -pkg=containerd-1.6.20 +pkg=containerd-1.6.21 cwd=$PWD src=$cwd/$pkg -unzip v1.6.20.zip +unzip v1.6.21.zip if [[ ! -d patch ]]; then tar zxf patch.tar.gz fi @@ -35,4 +35,4 @@ done <"$series" cd $cwd cp -rf $src/* . mv $src/.git $cwd/.git -rm -rf containerd-1.6.20 +rm -rf containerd-1.6.21 diff --git a/containerd.spec b/containerd.spec index 892cde64430246b920d555265b81a6d568532888..0d1f3a96e11867514df2dd1477e5eb3d318afb61 100644 --- a/containerd.spec +++ b/containerd.spec @@ -1,12 +1,12 @@ %global goipath github.com/containerd/containerd %global debug_package %{nil} -Version: 1.6.20 +Version: 1.6.21 Name: containerd -Release: 3 +Release: 1 Summary: An industry-standard container runtime License: ASL 2.0 URL: https://containerd.io -Source0: https://github.com/containerd/containerd/archive/v1.6.20.zip +Source0: https://github.com/containerd/containerd/archive/v1.6.21.zip Source1: patch.tar.gz Source2: apply-patch Source3: series.conf @@ -67,6 +67,12 @@ install -D -p -m 0644 %{S:7} %{buildroot}%{_sysconfdir}/containerd/config.toml %exclude %{_bindir}/containerd-stress %changelog +* Fri July 21 2023 vegbir - 1.6.21-1 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:upgrade to contained 1.6.21 + * Mon May 15 2023 zhangzhihui - 1.6.20-3 - Type:bugfix - ID:NA diff --git a/git-commit b/git-commit index ea167eb886b6709c3b8b27a8a3b7ce11a6f25ec7..9f5223c27bdd886907fd5adba2fbf40cdeeb9f41 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -d2dfb1444fe48c86b6bbb291358d5b3f581d3b82 +aca8b96e269f3f28352f257b79e1fd53550fa91a diff --git a/v1.6.20.zip b/v1.6.21.zip similarity index 90% rename from v1.6.20.zip rename to v1.6.21.zip index 6b8e556d698c07c83c1157a671803adf88faced1..a0417dcf2686b7aaf13d7598e5fdc35eb822efda 100644 Binary files a/v1.6.20.zip and b/v1.6.21.zip differ