Merge containerd from Debian unstable for noble

[Bryce Harrington]

Upstream: tbd
Debian: 1.6.20~ds1-2 1.6.20~ds1-2
Ubuntu: 1.6.20~ds1-1ubuntu2

Debian new has 1.6.20~ds1-2, which may be available for merge soon.

If it turns out this needs a sync rather than a merge, please change the tag 'needs-merge' to 'needs-sync', and (optionally) update the title as desired.

### New Debian Changes ###

containerd (1.6.20~ds1-2) unstable; urgency=medium

  * Backport patch for Go1.21
  * Skip test adjusting oom score when initial is negative
  * Add pkg.containerd.onlydev build profile.
    To reduce delta with Ubuntu

 -- Shengjing Zhu <email address hidden> Wed, 23 Aug 2023 13:48:17 +0800

containerd (1.6.20~ds1-1) unstable; urgency=medium

  * New upstream version 1.6.20~ds1
  * Bump golang-github-containerd-ttrpc-dev to 1.1.1
  * Bump golang-github-opencontainers-image-spec-dev to 1.1.0~rc2-2

 -- Shengjing Zhu <email address hidden> Sat, 01 Apr 2023 01:27:11 +0800

containerd (1.6.18~ds1-1) unstable; urgency=medium

  * New upstream version 1.6.18~ds1
    + CVE-2023-25153: OCI image importer memory exhaustion
    + CVE-2023-25173: Supplementary groups are not set up properly
  * Install cni-bridge-fp to /usr/lib/cni in autopkgtest

 -- Shengjing Zhu <email address hidden> Thu, 16 Feb 2023 07:16:20 +0800

containerd (1.6.17~ds1-1) unstable; urgency=medium

  * New upstream version 1.6.17~ds1
  * Add missing failpoint binaries in cri-integration autopkgtest

 -- Shengjing Zhu <email address hidden> Sat, 11 Feb 2023 02:01:05 +0800

containerd (1.6.16~ds1-1) unstable; urgency=medium

  * New upstream version 1.6.16~ds1
  * Only track 1.6 LTS version in uscan watch file
  * Drop 'Skip failed TestUpdateOCILinuxResource' patch, fixed by
    https://github.com/containerd/containerd/commit/91a68edd

 -- Shengjing Zhu <email address hidden> Sun, 29 Jan 2023 03:07:20 +0800

containerd (1.6.14~ds1-1) unstable; urgency=medium

  * New upstream version 1.6.14~ds1
  * Update Standards-Version to 4.6.2 (no changes)
  * Skip failed TestUpdateOCILinuxResource since schroot doesn't have cgroup

 -- Shengjing Zhu <email address hidden> Tue, 20 Dec 2022 10:30:50 +0800

containerd (1.6.13~ds1-1) unstable; urgency=medium

  [ Benjamin Drung ]
  * Bump golang-google-grpc-dev to >= 1.30.
  * Let the dev package depend on golang-github-gotestyourself-gotest.tools-dev
    `pkg/testutil/helpers_unix.go` uses `gotest.tools/v3/assert` and
    therefore golang-github-containerd-containerd-dev needs to depend on
    golang-github-gotestyourself-gotest.tools-dev.

  [ Shengjing Zhu ]
  * New upstream version 1.6.13~ds1

 -- Shengjing Zhu <email address hidden> Fri, 16 Dec 2022 02:42:08 +0800

containerd (1.6.12~ds1-1) unstable; urgency=medium

  * New upstream version 1.6.12~ds1
    + CVE-2022-23471: CRI plugin: Fix goroutine leak during Exec

 -- Shengjing Zhu <email address hidden> Thu, 08 Dec 2022 10:02:21 +0800

containerd (1.6.11~ds1-1) unstable; urgency=medium

  * New upstream version 1.6.11~ds1

 -- Shengjing Zhu <email address hidden> Wed, 07 Dec 2022 10:24:32 +0800

containerd (1.6.9~ds1-1) unstable; urgency=medium

  * New upstream version 1.6.9~ds1
  * Unvendor klog and go-logr
  * Add golang-k8s-klog-dev to Build-Depends

 -- Shengjing Zhu <email address hidden> Tue, 25 Oct 2022 02:52:23 +0800

containerd (1.6.8~ds1-1) unstable; urgency=medium

  * New upstream version 1.6.8~ds1 (Closes: #1017917)
  * Remove compatibility patch for
    golang-github-containerd-stargz-snapshotter 0.8.0

 -- Shengjing Zhu <email address hidden> Tue, 23 Aug 2022 00:33:54 +0800

containerd (1.6.6~ds1-1) unstable; urgency=medium

  * New upstream version 1.6.6~ds1
    CVE-2022-31030: CRI plugin: Host memory exhaustion through ExecSync
  * Update Standards-Version to 4.6.1 (no changes)

 -- Shengjing Zhu <email address hidden> Tue, 07 Jun 2022 02:13:49 +0800

### Old Ubuntu Delta ###

containerd (1.6.20~ds1-1ubuntu2) mantic; urgency=medium

  * d/p/0009-Skip-test-trying-to-set-OOM-score.patch: fix FTBFS.

 -- Lucas Kanashiro <email address hidden> Wed, 21 Jun 2023 23:07:52 -0300

containerd (1.6.20~ds1-1ubuntu1) mantic; urgency=medium

  * Merge from Debian unstable (LP: #2022390). Make src:containerd
    follow Debian and src:containerd-app is going to ship the application with
    vendorized dependencies so we can keep updating just the application across
    all supported releases.
  * Added changes:
    - d/control: remove the binary paragraph for containerd.
    - d/containerd.*: remove all packaging related files associated to the
      containerd binary package.
    - d/tests/{cri-integration,integration}: remove since they depend on the
      containerd binary package which is not provided by this source package
      anymore.
    - d/rules: remove execute_after_dh_auto_build target, it is changing
      content in the containerd binary package. Also avoid installing binaries
      in the library package.
    - d/golang-github-containerd-containerd-dev.install: remove this file, it
      is causing a FTBFS, no need to have it in place, the library files are
      already installed correctly without it.
    - d/golang-github-containerd-containerd-dev.docs: install NOTICE file to
      be compliant with the Apache 2 license.

 -- Lucas Kanashiro <email address hidden> Wed, 21 Jun 2023 11:53:33 -0300

[Christian Ehrhardt  (paelzer)]

We are ahead anyway
 containerd | 1.7.2-0ubuntu2 | noble | amd64, arm64, armhf, ppc64el, riscv64, s390x

Plus having backported that to Focal and later.

But FYI CPC had an interest in 1.7.11 or later (released in December 2023) - if that seems doable I'm sure they' appreciate.

[Christian Ehrhardt  (paelzer)]

Should we track containerd-app here now?

[Lucas Kanashiro (lucaskanashiro)]

We could track containerd-app here as well. However, the containerd-app update is unrelated to what we have in Debian unstable (bug title).

[Launchpad Janitor (janitor)]

This bug was fixed in the package containerd - 1.6.24~ds1-1ubuntu1

---------------
containerd (1.6.24~ds1-1ubuntu1) noble; urgency=medium

  * Merge with Debian unstable (LP: #2040374). Remaining changes:
    - d/control: remove the binary paragraph for containerd.
    - d/containerd.*: remove all packaging related files associated to the
      containerd binary package.
    - d/tests/{cri-integration,integration}: remove since they depend on the
      containerd binary package which is not provided by this source package
      anymore.
    - d/rules: remove execute_after_dh_auto_build target, it is changing
      content in the containerd binary package. Also avoid installing binaries
      in the library package.
    - d/golang-github-containerd-containerd-dev.install: remove this file, it
      is causing a FTBFS, no need to have it in place, the library files are
      already installed correctly without it.
    - d/golang-github-containerd-containerd-dev.docs: install NOTICE file to
      be compliant with the Apache 2 license.
  * Dropped:
    - d/p/0009-Skip-test-trying-to-set-OOM-score.patch: fix FTBFS.
      [Not needed anymore]

 -- Lucas Kanashiro <email address hidden> Fri, 12 Jan 2024 19:00:15 -0300