diff -Nru containerd-1.5.9/debian/changelog containerd-1.5.9/debian/changelog --- containerd-1.5.9/debian/changelog 2022-03-03 10:17:25.000000000 -0600 +++ containerd-1.5.9/debian/changelog 2022-03-16 11:24:58.000000000 -0500 @@ -1,3 +1,10 @@ +containerd (1.5.9-0ubuntu3) jammy; urgency=medium + + * Remove redirect of containerd to .empty-mod to enable building with Go + 1.18 + + -- William 'jawn-smith' Wilson Wed, 16 Mar 2022 11:24:58 -0500 + containerd (1.5.9-0ubuntu2) jammy; urgency=medium * SECURITY UPDATE: Insecure handling of image volumes diff -Nru containerd-1.5.9/debian/patches/build-with-go1.18.patch containerd-1.5.9/debian/patches/build-with-go1.18.patch --- containerd-1.5.9/debian/patches/build-with-go1.18.patch 1969-12-31 18:00:00.000000000 -0600 +++ containerd-1.5.9/debian/patches/build-with-go1.18.patch 2022-03-16 11:24:50.000000000 -0500 @@ -0,0 +1,40 @@ +Index: containerd-1.5.9/go.mod +=================================================================== +--- containerd-1.5.9.orig/go.mod ++++ containerd-1.5.9/go.mod +@@ -71,7 +71,6 @@ + replace ( + // prevent transitional dependencies due to containerd having a circular + // dependency on itself through plugins. see .empty-mod/go.mod for details +- github.com/containerd/containerd => ./.empty-mod/ + github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2 + github.com/golang/protobuf => github.com/golang/protobuf v1.3.5 + // urfave/cli must be <= v1.22.1 due to a regression: https://github.com/urfave/cli/issues/1092 +Index: containerd-1.5.9/vendor/modules.txt +=================================================================== +--- containerd-1.5.9.orig/vendor/modules.txt ++++ containerd-1.5.9/vendor/modules.txt +@@ -541,7 +541,6 @@ + sigs.k8s.io/structured-merge-diff/v4/value + # sigs.k8s.io/yaml v1.2.0 + sigs.k8s.io/yaml +-# github.com/containerd/containerd => ./.empty-mod/ + # github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2 + # github.com/golang/protobuf => github.com/golang/protobuf v1.3.5 + # github.com/urfave/cli => github.com/urfave/cli v1.22.1 +Index: containerd-1.5.9/.empty-mod/go.mod +=================================================================== +--- containerd-1.5.9.orig/.empty-mod/go.mod ++++ /dev/null +@@ -1,11 +0,0 @@ +-// module empty-mod is an empty module that's used to help with containerd +-// having a circular dependency on itself through plugin modules. +-// +-// We use this module as a "replace" rule in containerd's go.mod, to prevent +-// relying on transitive dependencies (coming from older versions of containerd +-// defined on plugin go.mod). +-// +-// The replace rule forces go modules to consider the "current" version of +-// containerd to be the source of truth, helping us catch missing go.mod rules, +-// or version changes early. +-module empty-mod diff -Nru containerd-1.5.9/debian/patches/series containerd-1.5.9/debian/patches/series --- containerd-1.5.9/debian/patches/series 2022-03-03 10:16:19.000000000 -0600 +++ containerd-1.5.9/debian/patches/series 2022-03-16 11:02:28.000000000 -0500 @@ -1,3 +1,4 @@ skip-tests-with-privilege.patch preserve-debug-info.patch CVE-2022-23648.patch +build-with-go1.18.patch