Merge ~lucaskanashiro/ubuntu/+source/containerd:sru-containerd-xenial into ubuntu/+source/containerd:ubuntu/xenial-devel

[Lucas Kanashiro]

Backport fix to avoid stopping docker daemon during containerd upgrade to Xenial. It should be landed together with:

https://code.launchpad.net/~lucaskanashiro/ubuntu/+source/docker.io/+git/docker.io/+merge/395171

PPA with the proposed package:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/containerd-upgrade-issue/+packages

DEP-8 tests are passing:

autopkgtest [11:13:44]: @@@@@@@@@@@@@@@@@@@@ summary
basic-smoke PASS

[Sergio Durigan Junior (sergiodj)]

LGTM.

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Uploaded:

$ git push pkg upload/1.2.6-0ubuntu1_16.04.5
Enumerating objects: 13, done.
Counting objects: 100% (13/13), done.
Delta compression using up to 8 threads
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 1.35 KiB | 1.35 MiB/s, done.
Total 9 (delta 6), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/containerd
 * [new tag] upload/1.2.6-0ubuntu1_16.04.5 -> upload/1.2.6-0ubuntu1_16.04.5
$ dput ubuntu ../containerd_1.2.6-0ubuntu1\~16.04.5_source.changes
Checking signature on .changes
gpg: ../containerd_1.2.6-0ubuntu1~16.04.5_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../containerd_1.2.6-0ubuntu1~16.04.5.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading containerd_1.2.6-0ubuntu1~16.04.5.dsc: done.
  Uploading containerd_1.2.6-0ubuntu1~16.04.5.debian.tar.xz: done.
  Uploading containerd_1.2.6-0ubuntu1~16.04.5_source.changes: done.
Successfully uploaded packages.

[Lucas Kanashiro (lucaskanashiro)]

Version 1.2.6-0ubuntu1~16.04.5 is already being used by the latest security update, the update was someway blocked by the archive admins but it is still in the archive and my upload got rejected. I missed it because git-ubuntu did not imported it.

I am going to import it manually and apply the same changes I proposed here on top of it.

diff --git a/debian/changelog b/debian/changelog
index 652d5a0..3797826 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+containerd (1.2.6-0ubuntu1~16.04.5) xenial; urgency=medium
+
+  * d/control: add a Breaks for docker.io lower than 18.09.7-0ubuntu1~16.04.7
+    (LP: #1870514). The previous versions stop the docker daemon when a
+    containerd update is performed, this Breaks statement will make sure we
+    have a newer version which has the appropriate fix.
+
+ -- Lucas Kanashiro <[e-mail]>  Fri, 11 Dec 2020 09:19:07 -0300
+
 containerd (1.2.6-0ubuntu1~16.04.4) xenial-security; urgency=medium
 
   * SECURITY UPDATE: Sensitive information disclosure
diff --git a/debian/control b/debian/control
index 79e8514..585281c 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ XS-Go-Import-Path: github.com/docker/containerd
 Package: containerd
 Architecture: linux-any
 Depends: runc (>= 1.0.0~rc7~), ${misc:Depends}, ${shlibs:Depends}
-Breaks: docker.io (<= 18.09.3~)
+Breaks: docker.io (<< 18.09.7-0ubuntu1~16.04.7)
 Built-Using: ${misc:Built-Using}
 Description: daemon to control runC
  Containerd is a daemon to control runC, built for performance and density.