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.
80 lines
3.7 KiB
80 lines
3.7 KiB
Index: src/github.com/docker/cli/cli-plugins/manager/manager_unix.go |
|
--- src/github.com/docker/cli/cli-plugins/manager/manager_unix.go.orig 2021-11-03 11:16:50.000000000 +0100 |
|
+++ src/github.com/docker/cli/cli-plugins/manager/manager_unix.go 2021-11-03 11:22:03.504396000 +0100 |
|
@@ -3,6 +3,5 @@ |
|
package manager |
|
|
|
var defaultSystemPluginDirs = []string{ |
|
- "/usr/local/lib/docker/cli-plugins", "/usr/local/libexec/docker/cli-plugins", |
|
- "/usr/lib/docker/cli-plugins", "/usr/libexec/docker/cli-plugins", |
|
+ "@l_prefix@/lib/docker/cli-plugins", |
|
} |
|
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 2021-11-03 11:16:50.000000000 +0100 |
|
+++ src/github.com/docker/cli/cli/config/credentials/default_store_unsupported.go 2021-11-03 11:20:31.671933000 +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/docker/docker/pkg/archive/archive_unix.go |
|
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go.orig 2021-11-03 11:16:50.000000000 +0100 |
|
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go 2021-11-03 11:20:31.672071000 +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 2021-11-03 11:16:50.000000000 +0100 |
|
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go 2021-11-03 11:20:31.672182000 +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 2021-11-03 11:16:50.000000000 +0100 |
|
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/system/mknod.go 2021-11-03 11:20:31.672293000 +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 2021-11-03 11:16:50.000000000 +0100 |
|
+++ src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go 2021-11-03 11:20:31.672403000 +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 errors.WithStack(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 2021-11-03 11:16:50.000000000 +0100 |
|
+++ src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go 2021-11-03 11:20:31.672506000 +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 {
|
|
|