diff -Nru opengcs-0.3.4+dfsg2/debian/changelog opengcs-0.3.4+dfsg2/debian/changelog --- opengcs-0.3.4+dfsg2/debian/changelog 2021-01-21 17:10:29.000000000 -0300 +++ opengcs-0.3.4+dfsg2/debian/changelog 2021-10-15 17:12:23.000000000 -0300 @@ -1,3 +1,10 @@ +opengcs (0.3.4+dfsg2-0ubuntu7) hirsute; urgency=medium + + * d/p/0003-Add-support-for-runc-1.0.x.patch: Comply with the libcontainer + API changes introduced in runc 1.0.x (LP: #1938908). + + -- Lucas Kanashiro Fri, 15 Oct 2021 17:12:23 -0300 + opengcs (0.3.4+dfsg2-0ubuntu6) hirsute; urgency=medium * d/p/0002-Simplify-ticks.patch: simplify ticks using a constant. This diff -Nru opengcs-0.3.4+dfsg2/debian/patches/0003-Add-support-for-runc-1.0.x.patch opengcs-0.3.4+dfsg2/debian/patches/0003-Add-support-for-runc-1.0.x.patch --- opengcs-0.3.4+dfsg2/debian/patches/0003-Add-support-for-runc-1.0.x.patch 1969-12-31 21:00:00.000000000 -0300 +++ opengcs-0.3.4+dfsg2/debian/patches/0003-Add-support-for-runc-1.0.x.patch 2021-10-15 17:12:23.000000000 -0300 @@ -0,0 +1,48 @@ +Description: Comply with libcontainer API changes in runc 1.0.x + docker and containerd upstream already fixed this but the embedded version in + opengcs is still affected. +Forwarded: not-needed +Author: Lucas Kanashiro +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/hirsute/+source/opengcs/+bug/1938908 +Last-Updated: 2021-08-12 + +--- a/containerd/sys/oom_unix.go ++++ b/containerd/sys/oom_unix.go +@@ -7,7 +7,7 @@ + "os" + "strconv" + +- "github.com/opencontainers/runc/libcontainer/system" ++ "github.com/opencontainers/runc/libcontainer/userns" + ) + + // OOMScoreMaxKillable is the maximum score keeping the process killable by the oom killer +@@ -22,7 +22,7 @@ + } + defer f.Close() + if _, err = f.WriteString(strconv.Itoa(score)); err != nil { +- if os.IsPermission(err) && system.RunningInUserNS() { ++ if os.IsPermission(err) && userns.RunningInUserNS() { + return nil + } + return err +--- a/docker/pkg/archive/archive_unix.go ++++ b/docker/pkg/archive/archive_unix.go +@@ -11,7 +11,7 @@ + + "github.com/docker/docker/pkg/idtools" + "github.com/docker/docker/pkg/system" +- rsystem "github.com/opencontainers/runc/libcontainer/system" ++ "github.com/opencontainers/runc/libcontainer/userns" + "golang.org/x/sys/unix" + ) + +@@ -88,7 +88,7 @@ + // handleTarTypeBlockCharFifo is an OS-specific helper function used by + // createTarFile to handle the following types of header: Block; Char; Fifo + func handleTarTypeBlockCharFifo(hdr *tar.Header, path string) error { +- if rsystem.RunningInUserNS() { ++ if userns.RunningInUserNS() { + // cannot create a device if running in user namespace + return nil + } diff -Nru opengcs-0.3.4+dfsg2/debian/patches/series opengcs-0.3.4+dfsg2/debian/patches/series --- opengcs-0.3.4+dfsg2/debian/patches/series 2021-01-21 17:00:33.000000000 -0300 +++ opengcs-0.3.4+dfsg2/debian/patches/series 2021-10-15 17:12:23.000000000 -0300 @@ -1,2 +1,3 @@ 0001-Fix-int-overflow-on-32-bit-architectures.patch 0002-Simplify-ticks.patch +0003-Add-support-for-runc-1.0.x.patch