diff -Nru golang-github-containers-buildah-1.19.6+dfsg1/debian/changelog golang-github-containers-buildah-1.19.6+dfsg1/debian/changelog
--- golang-github-containers-buildah-1.19.6+dfsg1/debian/changelog	2021-02-23 09:10:49.000000000 -0300
+++ golang-github-containers-buildah-1.19.6+dfsg1/debian/changelog	2021-10-15 18:29:47.000000000 -0300
@@ -1,3 +1,10 @@
+golang-github-containers-buildah (1.19.6+dfsg1-1ubuntu1) hirsute; urgency=medium
+
+  * d/p/support-runc-1.0.1.patch: Add patch to comply with API changes in
+    libcontainer inside runc (LP: #1938908).
+
+ -- Lucas Kanashiro <kanashiro@ubuntu.com>  Fri, 15 Oct 2021 18:29:47 -0300
+
 golang-github-containers-buildah (1.19.6+dfsg1-1) unstable; urgency=medium
 
   * New upstream version targeted at podman 3.0
diff -Nru golang-github-containers-buildah-1.19.6+dfsg1/debian/control golang-github-containers-buildah-1.19.6+dfsg1/debian/control
--- golang-github-containers-buildah-1.19.6+dfsg1/debian/control	2021-02-23 09:10:49.000000000 -0300
+++ golang-github-containers-buildah-1.19.6+dfsg1/debian/control	2021-10-15 18:29:47.000000000 -0300
@@ -1,7 +1,8 @@
 Source: golang-github-containers-buildah
 Section: devel
 Priority: optional
-Maintainer: Debian Go Packaging Team <team+pkg-go@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Go Packaging Team <team+pkg-go@tracker.debian.org>
 Uploaders: Reinhard Tartler <siretart@tauware.de>,
            Dmitry Smirnov <onlyjob@debian.org>,
 Build-Conflicts: golang-github-dnephin-cobra-dev
diff -Nru golang-github-containers-buildah-1.19.6+dfsg1/debian/patches/series golang-github-containers-buildah-1.19.6+dfsg1/debian/patches/series
--- golang-github-containers-buildah-1.19.6+dfsg1/debian/patches/series	2021-02-23 09:10:49.000000000 -0300
+++ golang-github-containers-buildah-1.19.6+dfsg1/debian/patches/series	2021-10-15 18:28:40.000000000 -0300
@@ -1,2 +1,3 @@
 man.patch
 path.patch
+support-runc-1.0.1.patch
diff -Nru golang-github-containers-buildah-1.19.6+dfsg1/debian/patches/support-runc-1.0.1.patch golang-github-containers-buildah-1.19.6+dfsg1/debian/patches/support-runc-1.0.1.patch
--- golang-github-containers-buildah-1.19.6+dfsg1/debian/patches/support-runc-1.0.1.patch	1969-12-31 21:00:00.000000000 -0300
+++ golang-github-containers-buildah-1.19.6+dfsg1/debian/patches/support-runc-1.0.1.patch	2021-10-15 18:29:45.000000000 -0300
@@ -0,0 +1,52 @@
+Description: Comply with libcontainer API changes introduced in runc latest version
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/golang-github-containers-buildah/+bug/1938908
+Origin: backport, https://github.com/containers/buildah/commit/dfc3875f35d8bb11
+Reviewed-By: Lucas Kanashiro <kanashiro@ubuntu.com>
+Last-Updated: 2021-10-15
+
+--- a/add.go
++++ b/add.go
+@@ -20,7 +20,7 @@
+ 	"github.com/containers/storage/pkg/fileutils"
+ 	"github.com/containers/storage/pkg/idtools"
+ 	"github.com/hashicorp/go-multierror"
+-	rsystem "github.com/opencontainers/runc/libcontainer/system"
++	"github.com/opencontainers/runc/libcontainer/userns"
+ 	"github.com/opencontainers/runtime-spec/specs-go"
+ 	"github.com/pkg/errors"
+ 	"github.com/sirupsen/logrus"
+@@ -361,7 +361,7 @@
+ 						ChmodDirs:     nil,
+ 						ChownFiles:    nil,
+ 						ChmodFiles:    nil,
+-						IgnoreDevices: rsystem.RunningInUserNS(),
++						IgnoreDevices: userns.RunningInUserNS(),
+ 					}
+ 					putErr = copier.Put(mountPoint, extractDirectory, putOptions, io.TeeReader(pipeReader, hasher))
+ 				}
+@@ -496,7 +496,7 @@
+ 						ChmodDirs:       nil,
+ 						ChownFiles:      nil,
+ 						ChmodFiles:      nil,
+-						IgnoreDevices:   rsystem.RunningInUserNS(),
++						IgnoreDevices:   userns.RunningInUserNS(),
+ 					}
+ 					putErr = copier.Put(mountPoint, extractDirectory, putOptions, io.TeeReader(pipeReader, hasher))
+ 				}
+--- a/run_unix.go
++++ b/run_unix.go
+@@ -3,12 +3,12 @@
+ package buildah
+ 
+ import (
+-	"github.com/opencontainers/runc/libcontainer/configs"
++	"github.com/containers/buildah/define"
+ 	"github.com/pkg/errors"
+ )
+ 
+ // ContainerDevices is an alias for a slice of github.com/opencontainers/runc/libcontainer/configs.Device structures.
+-type ContainerDevices = []configs.Device
++type ContainerDevices define.ContainerDevices
+ 
+ func setChildProcess() error {
+ 	return errors.New("function not supported on non-linux systems")