@@ -3,7 +3,7 @@

 TOMLV_COMMIT=9baf8a8a9f2ed20a8e54160840c492f937eeaf9a

 # When updating RUNC_COMMIT, also update runc in vendor.conf accordingly

-RUNC_COMMIT=0351df1c5a66838d0c392b4ac4cf9450de844e2d

+RUNC_COMMIT=b2567b37d7b75eb4cf325b77297b140ea686ce8f

 CONTAINERD_COMMIT=v1.0.0-beta.3

 TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574

 LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e

@@ -65,7 +65,7 @@ github.com/pborman/uuid v1.0

 google.golang.org/grpc v1.3.0

 # When updating, also update RUNC_COMMIT in hack/dockerfile/binaries-commits accordingly

-github.com/opencontainers/runc 0351df1c5a66838d0c392b4ac4cf9450de844e2d

+github.com/opencontainers/runc b2567b37d7b75eb4cf325b77297b140ea686ce8f

 github.com/opencontainers/runtime-spec v1.0.0

 github.com/opencontainers/image-spec v1.0.0

 github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0

@@ -30,8 +30,8 @@ func DeviceFromPath(path, permissions string) (*configs.Device, error) {

 	}

 	var (

-		devNumber = int(stat.Rdev)

-		major     = Major(devNumber)

+		devNumber = stat.Rdev

+		major     = unix.Major(devNumber)

 	)

 	if major == 0 {

 		return nil, ErrNotADevice

@@ -50,8 +50,8 @@ func DeviceFromPath(path, permissions string) (*configs.Device, error) {

 	return &configs.Device{

 		Type:        devType,

 		Path:        path,

-		Major:       major,

-		Minor:       Minor(devNumber),

+		Major:       int64(major),

+		Minor:       int64(unix.Minor(devNumber)),

 		Permissions: permissions,

 		FileMode:    os.FileMode(mode),

 		Uid:         stat.Uid,

deleted file mode 100644

@@ -1,24 +0,0 @@

-// +build linux freebsd

-

-package devices

-

-/*

-

-This code provides support for manipulating linux device numbers.  It should be replaced by normal syscall functions once http://code.google.com/p/go/issues/detail?id=8106 is solved.

-

-You can read what they are here:

-

- - http://www.makelinux.net/ldd3/chp-3-sect-2

- - http://www.linux-tutorial.info/modules.php?name=MContent&pageid=94

-

-Note! These are NOT the same as the MAJOR(dev_t device);, MINOR(dev_t device); and MKDEV(int major, int minor); functions as defined in <linux/kdev_t.h> as the representation of device numbers used by go is different than the one used internally to the kernel! - https://github.com/torvalds/linux/blob/master/include/linux/kdev_t.h#L9

-

-*/

-

-func Major(devNumber int) int64 {

-	return int64((devNumber >> 8) & 0xfff)

-}

-

-func Minor(devNumber int) int64 {

-	return int64((devNumber & 0xff) | ((devNumber >> 12) & 0xfff00))

-}

new file mode 100644

@@ -0,0 +1,26 @@

+// +build linux

+// +build 386 arm

+

+package system

+

+import (

+	"golang.org/x/sys/unix"

+)

+

+// Setuid sets the uid of the calling thread to the specified uid.

+func Setuid(uid int) (err error) {

+	_, _, e1 := unix.RawSyscall(unix.SYS_SETUID32, uintptr(uid), 0, 0)

+	if e1 != 0 {

+		err = e1

+	}

+	return

+}

+

+// Setgid sets the gid of the calling thread to the specified gid.

+func Setgid(gid int) (err error) {

+	_, _, e1 := unix.RawSyscall(unix.SYS_SETGID32, uintptr(gid), 0, 0)

+	if e1 != 0 {

+		err = e1

+	}

+	return

+}

deleted file mode 100644

@@ -1,25 +0,0 @@

-// +build linux,386

-

-package system

-

-import (

-	"golang.org/x/sys/unix"

-)

-

-// Setuid sets the uid of the calling thread to the specified uid.

-func Setuid(uid int) (err error) {

-	_, _, e1 := unix.RawSyscall(unix.SYS_SETUID32, uintptr(uid), 0, 0)

-	if e1 != 0 {

-		err = e1

-	}

-	return

-}

-

-// Setgid sets the gid of the calling thread to the specified gid.

-func Setgid(gid int) (err error) {

-	_, _, e1 := unix.RawSyscall(unix.SYS_SETGID32, uintptr(gid), 0, 0)

-	if e1 != 0 {

-		err = e1

-	}

-	return

-}

@@ -1,4 +1,5 @@

-// +build linux,arm64 linux,amd64 linux,ppc linux,ppc64 linux,ppc64le linux,s390x

+// +build linux

+// +build arm64 amd64 mips mipsle mips64 mips64le ppc ppc64 ppc64le s390x

 package system

deleted file mode 100644

@@ -1,25 +0,0 @@

-// +build linux,arm

-

-package system

-

-import (

-	"golang.org/x/sys/unix"

-)

-

-// Setuid sets the uid of the calling thread to the specified uid.

-func Setuid(uid int) (err error) {

-	_, _, e1 := unix.RawSyscall(unix.SYS_SETUID32, uintptr(uid), 0, 0)

-	if e1 != 0 {

-		err = e1

-	}

-	return

-}

-

-// Setgid sets the gid of the calling thread to the specified gid.

-func Setgid(gid int) (err error) {

-	_, _, e1 := unix.RawSyscall(unix.SYS_SETGID32, uintptr(gid), 0, 0)

-	if e1 != 0 {

-		err = e1

-	}

-	return

-}

@@ -5,7 +5,7 @@ github.com/opencontainers/runtime-spec v1.0.0

 # Core libcontainer functionality.

 github.com/mrunalp/fileutils ed869b029674c0e9ce4c0dfa781405c2d9946d08

 github.com/opencontainers/selinux v1.0.0-rc1

-github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0

+github.com/seccomp/libseccomp-golang 84e90a91acea0f4e51e62bc1a75de18b1fc0790f

 github.com/sirupsen/logrus a3f95b5c423586578a4e099b11a46c2479628cac

 github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16

 github.com/vishvananda/netlink 1e2e08e8a2dcdacaae3f14ac44c5cfa31361f270

@@ -15,7 +15,7 @@ github.com/coreos/pkg v3

 github.com/godbus/dbus v3

 github.com/golang/protobuf 18c9bb3261723cd5401db4d0c9fbc5c3b6c70fe8

 # Command-line interface.

-github.com/docker/docker 0f5c9d301b9b1cca66b3ea0f9dec3b5317d3686d

+github.com/cyphar/filepath-securejoin v0.2.1

 github.com/docker/go-units v0.2.0

 github.com/urfave/cli d53eb991652b1d438abdd34ce4bfa3ef1539108e

 golang.org/x/sys 7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce https://github.com/golang/sys