Update containerd to version 1.3.9 / rev 37 via SR 857815

https://build.opensuse.org/request/show/857815 by user cyphar + dimstar_suse - Update to containerd v1.3.9, which is needed for Docker v19.03.14-ce and fixes CVE-2020-15257. bsc#1178969 bsc#1180243
bmwiedemann · Dec 23, 2020 · df8f73f · df8f73f
1 parent f599ea7
commit df8f73f
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 26 deletions.
diff --git a/packages/c/containerd/.files b/packages/c/containerd/.files
diff --git a/packages/c/containerd/.rev b/packages/c/containerd/.rev
@@ -299,4 +299,13 @@ Docker 17.07.0_ce update. This SR is in conjunction with:
     <comment>- Use Go 1.13 for build.</comment>
     <requestid>817376</requestid>
   </revision>
+  <revision rev="37" vrev="1">
+    <srcmd5>5878d99d2b2165d616e7fd0f7506325e</srcmd5>
+    <version>1.3.9</version>
+    <time>1608729629</time>
+    <user>dimstar_suse</user>
+    <comment>- Update to containerd v1.3.9, which is needed for Docker v19.03.14-ce and
+  fixes CVE-2020-15257. bsc#1178969 bsc#1180243</comment>
+    <requestid>857815</requestid>
+  </revision>
 </revisionlist>
diff --git a/packages/c/containerd/.servicemark b/packages/c/containerd/.servicemark
@@ -1 +1 @@
-e5725d671d685ff8e1d494141a60e9c2
+98f5e4e5f018b9351f9dcec2f339c856
diff --git a/packages/c/containerd/0001-makefile-remove-emoji.patch b/packages/c/containerd/0001-makefile-remove-emoji.patch
@@ -12,12 +12,12 @@ Signed-off-by: Aleksa Sarai <[email protected]>
  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
+Index: containerd-1.3.7_8fba4e9a7d01/Makefile
+===================================================================
+--- containerd-1.3.7_8fba4e9a7d01.orig/Makefile
++++ containerd-1.3.7_8fba4e9a7d01/Makefile
+@@ -60,8 +60,8 @@ else
+ 	DEBUG_TAGS := static_build
  endif
 
 -WHALE = "🇩"
@@ -27,6 +27,3 @@ index 35021fd3b491..2fcee039d1a1 100644
 
  RELEASE=containerd-$(VERSION:v%=%).${GOOS}-${GOARCH}
 
--- 
-2.19.1
-
diff --git a/packages/c/containerd/_service b/packages/c/containerd/_service
@@ -3,8 +3,8 @@
     <param name="url">https://github.com/containerd/containerd.git</param>
     <param name="scm">git</param>
     <param name="filename">containerd</param>
-    <param name="versionformat">1.2.13_%h</param>
-    <param name="revision">v1.2.13</param>
+    <param name="versionformat">1.3.9_%h</param>
+    <param name="revision">v1.3.9</param>
     <param name="exclude">.git</param>
   </service>
   <service name="recompress" mode="disabled">

diff --git a/packages/c/containerd/containerd-1.2.13_7ad184331fa3.tar.xz b/packages/c/containerd/containerd-1.2.13_7ad184331fa3.tar.xz
diff --git a/packages/c/containerd/containerd-1.3.9_ea765aba0d05.tar.xz b/packages/c/containerd/containerd-1.3.9_ea765aba0d05.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeih5ndb52bv2hmgishzhut6z75dxtdiozrs2eg4avgyuerxuwjlpju
diff --git a/packages/c/containerd/containerd.changes b/packages/c/containerd/containerd.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Dec 21 06:53:15 UTC 2020 - Aleksa Sarai <[email protected]>
+
+- Update to containerd v1.3.9, which is needed for Docker v19.03.14-ce and
+  fixes CVE-2020-15257. bsc#1178969 bsc#1180243
+
+-------------------------------------------------------------------
+Fri Sep 18 08:16:20 UTC 2020 - Aleksa Sarai <[email protected]>
+
+- Update to containerd v1.3.7, which is required for Docker 19.03.13-ce.
+  boo#1176708
+- Refresh patches:
+  * 0001-makefile-remove-emoji.patch
+
 -------------------------------------------------------------------
 Thu Jun 25 22:32:08 UTC 2020 - Aleksa Sarai <[email protected]>
 

diff --git a/packages/c/containerd/containerd.spec b/packages/c/containerd/containerd.spec
@@ -34,11 +34,11 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 7ad184331fa3e55e52b890ea95e65ba581ae3429
-%define git_short   7ad184331fa3
+%define git_version ea765aba0d05254012b0b9e595e995c09186427f
+%define git_short   ea765aba0d05
 
 Name:           %{realname}%{name_suffix}
-Version:        1.2.13
+Version:        1.3.9
 Release:        0
 Summary:        Standalone OCI Container Daemon
 License:        Apache-2.0
@@ -127,7 +127,8 @@ make -C $PROJECT \
 	BUILDTAGS="$BUILDTAGS" \
 	VERSION="v%{version}" \
 	REVISION="%{git_version}"
-make man
+# TODO: Fix man-page generation.
+#make man
 
 cp $PROJECT/bin/ctr ctr-%{version}
 cp $PROJECT/bin/containerd containerd-%{version}
@@ -157,12 +158,13 @@ install -d -m755 %{buildroot}/%{_sysconfdir}/%{realname}
 echo "# See containerd-config.toml(5) for documentation." >%{buildroot}/%{_sysconfdir}/%{realname}/config.toml
 
 # Man pages.
-for file in man/*
-do
-	section="${file##*.}"
-	install -D -m644 "$file" "%{buildroot}/%{_mandir}/man$section/$(basename "$file")"
-done
-ln -s ctr.1 %{buildroot}/%{_mandir}/man1/%{realname}-ctr.1
+# TODO: Fix man page generation.
+#for file in man/*
+#do
+#	section="${file##*.}"
+#	install -D -m644 "$file" "%{buildroot}/%{_mandir}/man$section/$(basename "$file")"
+#done
+#ln -s ctr.1 %{buildroot}/%{_mandir}/man1/%{realname}-ctr.1
 
 %fdupes %{buildroot}
 
@@ -176,11 +178,13 @@ ln -s ctr.1 %{buildroot}/%{_mandir}/man1/%{realname}-ctr.1
 %{_sbindir}/docker-%{realname}
 %{_sbindir}/%{realname}-shim
 %{_sbindir}/docker-%{realname}-shim
-%{_mandir}/man*/%{realname}*
-%exclude %{_mandir}/man1/*ctr.1*
+# TODO: Fix man page generation.
+#%{_mandir}/man*/%{realname}*
+#%exclude %{_mandir}/man1/*ctr.1*
 
 %files ctr
 %{_sbindir}/%{realname}-ctr
-%{_mandir}/man1/*ctr.1*
+# TODO: Fix man page generation.
+#%{_mandir}/man1/*ctr.1*
 
 %changelog
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		e5725d671d685ff8e1d494141a60e9c2
		98f5e4e5f018b9351f9dcec2f339c856
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/ipfs/bafybeih5ndb52bv2hmgishzhut6z75dxtdiozrs2eg4avgyuerxuwjlpju