diff -Nru golang-github-containers-storage-1.15.8+dfsg1/debian/changelog golang-github-containers-storage-1.15.8+dfsg1/debian/changelog --- golang-github-containers-storage-1.15.8+dfsg1/debian/changelog 2020-02-04 21:05:13.000000000 -0300 +++ golang-github-containers-storage-1.15.8+dfsg1/debian/changelog 2021-10-18 09:29:32.000000000 -0300 @@ -1,3 +1,10 @@ +golang-github-containers-storage (1.15.8+dfsg1-1ubuntu1) focal; urgency=medium + + * d/p/support-runc-1.x.patch: Add patch to comply with API changes in + libcontainer inside runc (LP: #1938908). + + -- Lucas Kanashiro Mon, 18 Oct 2021 09:29:32 -0300 + golang-github-containers-storage (1.15.8+dfsg1-1) unstable; urgency=medium * New upstream release. diff -Nru golang-github-containers-storage-1.15.8+dfsg1/debian/control golang-github-containers-storage-1.15.8+dfsg1/debian/control --- golang-github-containers-storage-1.15.8+dfsg1/debian/control 2020-02-04 21:02:05.000000000 -0300 +++ golang-github-containers-storage-1.15.8+dfsg1/debian/control 2021-10-18 09:29:32.000000000 -0300 @@ -1,7 +1,8 @@ Source: golang-github-containers-storage Section: devel Priority: optional -Maintainer: Debian Go Packaging Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Go Packaging Team Uploaders: Reinhard Tartler , Dmitry Smirnov Build-Depends: debhelper-compat (= 11), diff -Nru golang-github-containers-storage-1.15.8+dfsg1/debian/patches/series golang-github-containers-storage-1.15.8+dfsg1/debian/patches/series --- golang-github-containers-storage-1.15.8+dfsg1/debian/patches/series 2019-12-10 05:11:49.000000000 -0300 +++ golang-github-containers-storage-1.15.8+dfsg1/debian/patches/series 2021-10-18 09:22:34.000000000 -0300 @@ -0,0 +1 @@ +support-runc-1.x.patch diff -Nru golang-github-containers-storage-1.15.8+dfsg1/debian/patches/support-runc-1.x.patch golang-github-containers-storage-1.15.8+dfsg1/debian/patches/support-runc-1.x.patch --- golang-github-containers-storage-1.15.8+dfsg1/debian/patches/support-runc-1.x.patch 1969-12-31 21:00:00.000000000 -0300 +++ golang-github-containers-storage-1.15.8+dfsg1/debian/patches/support-runc-1.x.patch 2021-10-18 09:29:30.000000000 -0300 @@ -0,0 +1,202 @@ +Description: Comply with libcontainer API changes introduced in runc latest version +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/golang-github-containers-storage/+bug/1938908 +Origin: backport, https://github.com/containers/storage/commit/b3531c3df8c37 +Author: Lucas Kanashiro +Last-Updated: 2021-10-18 + +--- a/drivers/aufs/aufs.go ++++ b/drivers/aufs/aufs.go +@@ -44,7 +44,7 @@ + mountpk "github.com/containers/storage/pkg/mount" + "github.com/containers/storage/pkg/parsers" + "github.com/containers/storage/pkg/system" +- rsystem "github.com/opencontainers/runc/libcontainer/system" ++ "github.com/opencontainers/runc/libcontainer/userns" + "github.com/opencontainers/selinux/go-selinux/label" + "github.com/pkg/errors" + "github.com/sirupsen/logrus" +@@ -196,7 +196,7 @@ + // proc/filesystems for when aufs is supported + exec.Command("modprobe", "aufs").Run() + +- if rsystem.RunningInUserNS() { ++ if userns.RunningInUserNS() { + return ErrAufsNested + } + +--- a/drivers/copy/copy_linux.go ++++ b/drivers/copy/copy_linux.go +@@ -23,7 +23,7 @@ + "github.com/containers/storage/pkg/idtools" + "github.com/containers/storage/pkg/pools" + "github.com/containers/storage/pkg/system" +- rsystem "github.com/opencontainers/runc/libcontainer/system" ++ "github.com/opencontainers/runc/libcontainer/userns" + "golang.org/x/sys/unix" + ) + +@@ -197,7 +197,7 @@ + } + + case mode&os.ModeDevice != 0: +- if rsystem.RunningInUserNS() { ++ if userns.RunningInUserNS() { + // cannot create a device if running in user namespace + return nil + } +--- a/drivers/fsdiff.go ++++ b/drivers/fsdiff.go +@@ -8,7 +8,7 @@ + "github.com/containers/storage/pkg/chrootarchive" + "github.com/containers/storage/pkg/idtools" + "github.com/containers/storage/pkg/ioutils" +- rsystem "github.com/opencontainers/runc/libcontainer/system" ++ "github.com/opencontainers/runc/libcontainer/userns" + "github.com/sirupsen/logrus" + ) + +@@ -170,7 +170,7 @@ + defer driver.Put(id) + + tarOptions := &archive.TarOptions{ +- InUserNS: rsystem.RunningInUserNS(), ++ InUserNS: userns.RunningInUserNS(), + IgnoreChownErrors: options.IgnoreChownErrors, + } + if options.Mappings != nil { +--- a/drivers/overlay/overlay.go ++++ b/drivers/overlay/overlay.go +@@ -29,7 +29,7 @@ + "github.com/containers/storage/pkg/parsers" + "github.com/containers/storage/pkg/system" + units "github.com/docker/go-units" +- rsystem "github.com/opencontainers/runc/libcontainer/system" ++ "github.com/opencontainers/runc/libcontainer/userns" + "github.com/opencontainers/selinux/go-selinux/label" + "github.com/pkg/errors" + "github.com/sirupsen/logrus" +@@ -1114,7 +1114,7 @@ + GIDMaps: idMappings.GIDs(), + IgnoreChownErrors: d.options.ignoreChownErrors, + WhiteoutFormat: d.getWhiteoutFormat(), +- InUserNS: rsystem.RunningInUserNS(), ++ InUserNS: userns.RunningInUserNS(), + }); err != nil { + return 0, err + } +--- a/pkg/archive/archive.go ++++ b/pkg/archive/archive.go +@@ -23,7 +23,7 @@ + "github.com/containers/storage/pkg/promise" + "github.com/containers/storage/pkg/system" + gzip "github.com/klauspost/pgzip" +- rsystem "github.com/opencontainers/runc/libcontainer/system" ++ "github.com/opencontainers/runc/libcontainer/userns" + "github.com/pkg/errors" + "github.com/sirupsen/logrus" + ) +@@ -1110,7 +1110,7 @@ + GIDMaps: tarMappings.GIDs(), + Compression: Uncompressed, + CopyPass: true, +- InUserNS: rsystem.RunningInUserNS(), ++ InUserNS: userns.RunningInUserNS(), + } + archive, err := TarWithOptions(src, options) + if err != nil { +@@ -1125,7 +1125,7 @@ + UIDMaps: untarMappings.UIDs(), + GIDMaps: untarMappings.GIDs(), + ChownOpts: archiver.ChownOpts, +- InUserNS: rsystem.RunningInUserNS(), ++ InUserNS: userns.RunningInUserNS(), + } + return archiver.Untar(archive, dst, options) + } +@@ -1145,7 +1145,7 @@ + UIDMaps: untarMappings.UIDs(), + GIDMaps: untarMappings.GIDs(), + ChownOpts: archiver.ChownOpts, +- InUserNS: rsystem.RunningInUserNS(), ++ InUserNS: userns.RunningInUserNS(), + } + return archiver.Untar(archive, dst, options) + } +@@ -1245,7 +1245,7 @@ + UIDMaps: archiver.UntarIDMappings.UIDs(), + GIDMaps: archiver.UntarIDMappings.GIDs(), + ChownOpts: archiver.ChownOpts, +- InUserNS: rsystem.RunningInUserNS(), ++ InUserNS: userns.RunningInUserNS(), + } + err = archiver.Untar(r, filepath.Dir(dst), options) + if err != nil { +--- a/pkg/archive/archive_unix.go ++++ b/pkg/archive/archive_unix.go +@@ -11,7 +11,7 @@ + + "github.com/containers/storage/pkg/idtools" + "github.com/containers/storage/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 + } +--- a/pkg/chrootarchive/archive.go ++++ b/pkg/chrootarchive/archive.go +@@ -11,7 +11,7 @@ + + "github.com/containers/storage/pkg/archive" + "github.com/containers/storage/pkg/idtools" +- rsystem "github.com/opencontainers/runc/libcontainer/system" ++ "github.com/opencontainers/runc/libcontainer/userns" + "github.com/pkg/errors" + ) + +@@ -67,7 +67,7 @@ + } + if options == nil { + options = &archive.TarOptions{} +- options.InUserNS = rsystem.RunningInUserNS() ++ options.InUserNS = userns.RunningInUserNS() + } + if options.ExcludePatterns == nil { + options.ExcludePatterns = []string{} +--- a/pkg/chrootarchive/diff_unix.go ++++ b/pkg/chrootarchive/diff_unix.go +@@ -16,7 +16,7 @@ + "github.com/containers/storage/pkg/archive" + "github.com/containers/storage/pkg/reexec" + "github.com/containers/storage/pkg/system" +- rsystem "github.com/opencontainers/runc/libcontainer/system" ++ "github.com/opencontainers/runc/libcontainer/userns" + ) + + type applyLayerResponse struct { +@@ -36,7 +36,7 @@ + runtime.LockOSThread() + flag.Parse() + +- inUserns := rsystem.RunningInUserNS() ++ inUserns := userns.RunningInUserNS() + if err := chroot(flag.Arg(0)); err != nil { + fatal(err) + } +@@ -95,7 +95,7 @@ + } + if options == nil { + options = &archive.TarOptions{} +- if rsystem.RunningInUserNS() { ++ if userns.RunningInUserNS() { + options.InUserNS = true + } + }