diff -Nru golang-github-containers-common-0.33.4+ds1/debian/changelog golang-github-containers-common-0.33.4+ds1/debian/changelog --- golang-github-containers-common-0.33.4+ds1/debian/changelog 2021-02-12 10:56:18.000000000 -0300 +++ golang-github-containers-common-0.33.4+ds1/debian/changelog 2021-10-15 18:12:13.000000000 -0300 @@ -1,3 +1,10 @@ +golang-github-containers-common (0.33.4+ds1-1ubuntu1) hirsute; urgency=medium + + * d/p/support-runc-1.x.patch: Add patch to comply with API changes in + libcontainer inside runc (LP: #1938908). + + -- Lucas Kanashiro Fri, 15 Oct 2021 18:12:13 -0300 + golang-github-containers-common (0.33.4+ds1-1) unstable; urgency=medium * New upstream point release, only focused changes for podman 3.0 diff -Nru golang-github-containers-common-0.33.4+ds1/debian/control golang-github-containers-common-0.33.4+ds1/debian/control --- golang-github-containers-common-0.33.4+ds1/debian/control 2021-02-12 10:56:18.000000000 -0300 +++ golang-github-containers-common-0.33.4+ds1/debian/control 2021-10-15 18:12:13.000000000 -0300 @@ -1,5 +1,6 @@ Source: golang-github-containers-common -Maintainer: Debian Go Packaging Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Go Packaging Team Uploaders: Reinhard Tartler Section: devel Testsuite: autopkgtest-pkg-go diff -Nru golang-github-containers-common-0.33.4+ds1/debian/patches/series golang-github-containers-common-0.33.4+ds1/debian/patches/series --- golang-github-containers-common-0.33.4+ds1/debian/patches/series 1969-12-31 21:00:00.000000000 -0300 +++ golang-github-containers-common-0.33.4+ds1/debian/patches/series 2021-10-15 18:08:26.000000000 -0300 @@ -0,0 +1 @@ +support-runc-1.x.patch diff -Nru golang-github-containers-common-0.33.4+ds1/debian/patches/support-runc-1.x.patch golang-github-containers-common-0.33.4+ds1/debian/patches/support-runc-1.x.patch --- golang-github-containers-common-0.33.4+ds1/debian/patches/support-runc-1.x.patch 1969-12-31 21:00:00.000000000 -0300 +++ golang-github-containers-common-0.33.4+ds1/debian/patches/support-runc-1.x.patch 2021-10-15 18:12:13.000000000 -0300 @@ -0,0 +1,33 @@ +Description: Comply with libcontainer API changes introduced in runc latest version +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/golang-github-containers-common/+bug/1938908 +Origin: backport, https://github.com/containers/common/commit/430a86a653f649e +Author: Lucas Kanashiro +Last-Updated: 2021-10-15 + +--- a/pkg/parse/parse_unix.go ++++ b/pkg/parse/parse_unix.go +@@ -7,13 +7,12 @@ + "path/filepath" + + "github.com/containers/storage/pkg/unshare" +- "github.com/opencontainers/runc/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/devices" + "github.com/pkg/errors" + ) + +-func DeviceFromPath(device string) ([]configs.Device, error) { +- var devs []configs.Device ++func DeviceFromPath(device string) ([]devices.Device, error) { ++ var devs []devices.Device + src, dst, permissions, err := Device(device) + if err != nil { + return nil, err +@@ -44,7 +43,7 @@ + } + for _, d := range srcDevices { + d.Path = filepath.Join(dst, filepath.Base(d.Path)) +- d.Permissions = configs.DevicePermissions(permissions) ++ d.Permissions = devices.Permissions(permissions) + devs = append(devs, *d) + } + return devs, nil