|
|
|
|
Index: src/github.com/docker/cli/cli/config/credentials/default_store_unsupported.go
|
|
|
|
|
--- src/github.com/docker/cli/cli/config/credentials/default_store_unsupported.go.orig 2020-01-19 00:34:38.000000000 +0100
|
|
|
|
|
+++ src/github.com/docker/cli/cli/config/credentials/default_store_unsupported.go 2020-01-19 11:21:04.277960000 +0100
|
|
|
|
|
@@ -1,4 +1,4 @@
|
|
|
|
|
-// +build !windows,!darwin,!linux
|
|
|
|
|
+// +build !windows,!darwin,!linux,!freebsd
|
|
|
|
|
|
|
|
|
|
package credentials
|
|
|
|
|
|
|
|
|
|
Index: src/github.com/docker/cli/vendor/github.com/containerd/continuity/fs/copy_unix.go
|
|
|
|
|
--- src/github.com/docker/cli/vendor/github.com/containerd/continuity/fs/copy_unix.go.orig 2020-01-19 00:35:09.000000000 +0100
|
|
|
|
|
+++ src/github.com/docker/cli/vendor/github.com/containerd/continuity/fs/copy_unix.go 2020-01-19 11:21:07.250158000 +0100
|
|
|
|
|
@@ -108,5 +108,5 @@
|
|
|
|
|
if !ok {
|
|
|
|
|
return errors.New("unsupported stat type")
|
|
|
|
|
}
|
|
|
|
|
- return unix.Mknod(dst, uint32(fi.Mode()), int(st.Rdev))
|
|
|
|
|
+ return unix.Mknod(dst, uint32(fi.Mode()), uint64(st.Rdev))
|
|
|
|
|
}
|
|
|
|
|
Index: src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go
|
|
|
|
|
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go.orig 2020-01-19 00:36:08.000000000 +0100
|
|
|
|
|
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go 2020-01-19 11:21:07.250321000 +0100
|
|
|
|
|
@@ -63,7 +63,7 @@
|
|
|
|
|
s, ok := stat.(*syscall.Stat_t)
|
|
|
|
|
|
|
|
|
|
if ok {
|
|
|
|
|
- inode = s.Ino
|
|
|
|
|
+ inode = uint64(s.Ino)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return
|
|
|
|
|
Index: src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go
|
|
|
|
|
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go.orig 2020-01-19 00:36:08.000000000 +0100
|
|
|
|
|
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go 2020-01-19 11:21:07.250451000 +0100
|
|
|
|
|
@@ -35,7 +35,7 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func getIno(fi os.FileInfo) uint64 {
|
|
|
|
|
- return fi.Sys().(*syscall.Stat_t).Ino
|
|
|
|
|
+ return uint64(fi.Sys().(*syscall.Stat_t).Ino)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func hasHardlinks(fi os.FileInfo) bool {
|
|
|
|
|
Index: src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/system/mknod.go
|
|
|
|
|
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/system/mknod.go.orig 2020-01-19 00:36:08.000000000 +0100
|
|
|
|
|
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/system/mknod.go 2020-01-19 11:21:07.250579000 +0100
|
|
|
|
|
@@ -9,7 +9,7 @@
|
|
|
|
|
// Mknod creates a filesystem node (file, device special file or named pipe) named path
|
|
|
|
|
// with attributes specified by mode and dev.
|
|
|
|
|
func Mknod(path string, mode uint32, dev int) error {
|
|
|
|
|
- return unix.Mknod(path, mode, dev)
|
|
|
|
|
+ return unix.Mknod(path, mode, uint64(dev))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Mkdev is used to build the value of linux devices (in /dev/) which specifies major
|
|
|
|
|
Index: src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go
|
|
|
|
|
--- src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go.orig 2020-01-19 00:36:05.000000000 +0100
|
|
|
|
|
+++ src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go 2020-01-19 11:21:07.250718000 +0100
|
|
|
|
|
@@ -45,7 +45,7 @@
|
|
|
|
|
mode |= syscall.S_IFBLK
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- if err := syscall.Mknod(path, mode, int(mkdev(stat.Devmajor, stat.Devminor))); err != nil {
|
|
|
|
|
+ if err := syscall.Mknod(path, mode, uint64(mkdev(stat.Devmajor, stat.Devminor))); err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
return nil
|
|
|
|
|
Index: src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go
|
|
|
|
|
--- src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go.orig 2020-01-19 00:36:05.000000000 +0100
|
|
|
|
|
+++ src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go 2020-01-19 11:21:07.250841000 +0100
|
|
|
|
|
@@ -45,7 +45,7 @@
|
|
|
|
|
stat.Devminor = int64(minor(uint64(s.Rdev)))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- ino := s.Ino
|
|
|
|
|
+ ino := uint64(s.Ino)
|
|
|
|
|
linked := false
|
|
|
|
|
if seenFiles != nil {
|
|
|
|
|
if s.Nlink > 1 {
|
