You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
104 lines
4.8 KiB
104 lines
4.8 KiB
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-05-20 08:49:06.000000000 +0200 |
|
+++ src/github.com/docker/cli/cli/config/credentials/default_store_unsupported.go 2020-05-20 08:52:24.196058000 +0200 |
|
@@ -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-05-20 08:49:06.000000000 +0200 |
|
+++ src/github.com/docker/cli/vendor/github.com/containerd/continuity/fs/copy_unix.go 2020-05-20 08:52:24.196206000 +0200 |
|
@@ -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-05-20 08:49:07.000000000 +0200 |
|
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go 2020-05-20 08:52:24.196344000 +0200 |
|
@@ -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-05-20 08:49:07.000000000 +0200 |
|
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go 2020-05-20 08:52:24.196458000 +0200 |
|
@@ -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-05-20 08:49:07.000000000 +0200 |
|
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/system/mknod.go 2020-05-20 08:52:24.196571000 +0200 |
|
@@ -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/moby/sys/mountinfo/mountinfo.go |
|
--- src/github.com/docker/cli/vendor/github.com/moby/sys/mountinfo/mountinfo.go.orig 2020-05-20 08:49:07.000000000 +0200 |
|
+++ src/github.com/docker/cli/vendor/github.com/moby/sys/mountinfo/mountinfo.go 2020-05-20 08:52:51.774313000 +0200 |
|
@@ -1,21 +1,11 @@ |
|
package mountinfo |
|
|
|
-import "io" |
|
- |
|
// GetMounts retrieves a list of mounts for the current running process, |
|
// with an optional filter applied (use nil for no filter). |
|
func GetMounts(f FilterFunc) ([]*Info, error) { |
|
return parseMountTable(f) |
|
} |
|
|
|
-// GetMountsFromReader retrieves a list of mounts from the |
|
-// reader provided, with an optional filter applied (use nil |
|
-// for no filter). This can be useful in tests or benchmarks |
|
-// that provide a fake mountinfo data. |
|
-func GetMountsFromReader(reader io.Reader, f FilterFunc) ([]*Info, error) { |
|
- return parseInfoFile(reader, f) |
|
-} |
|
- |
|
// Mounted determines if a specified mountpoint has been mounted. |
|
// On Linux it looks at /proc/self/mountinfo. |
|
func Mounted(mountpoint string) (bool, error) { |
|
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-05-20 08:49:07.000000000 +0200 |
|
+++ src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go 2020-05-20 08:52:24.196824000 +0200 |
|
@@ -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-05-20 08:49:07.000000000 +0200 |
|
+++ src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go 2020-05-20 08:52:24.196937000 +0200 |
|
@@ -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 {
|
|
|