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.
 
 
 
 
 
 

69 lines
2.7 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 2017-10-20 20:05:16.000000000 +0200
+++ src/github.com/docker/cli/cli/config/credentials/default_store_unsupported.go 2017-10-22 00:23:24.546486000 +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/docker/docker/pkg/archive/archive_unix.go
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go.orig 2017-10-20 20:05:58.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go 2017-10-22 00:23:24.546644000 +0200
@@ -62,7 +62,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 2017-10-20 20:05:57.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go 2017-10-22 00:23:24.546764000 +0200
@@ -29,7 +29,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/tonistiigi/fsutil/diskwriter_freebsd.go
--- src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_freebsd.go.orig 2017-10-22 00:24:40.409147000 +0200
+++ src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_freebsd.go 2017-10-22 00:24:26.917354000 +0200
@@ -0,0 +1,20 @@
+// +build freebsd
+
+package fsutil
+
+import (
+ "github.com/pkg/errors"
+ "golang.org/x/sys/unix"
+)
+
+func chtimes(path string, un int64) error {
+ var utimes [2]unix.Timespec
+ utimes[0] = unix.NsecToTimespec(un)
+ utimes[1] = utimes[0]
+
+ if err := unix.UtimesNanoAt(unix.AT_FDCWD, path, utimes[0:], unix.AT_SYMLINK_NOFOLLOW); err != nil {
+ return errors.Wrap(err, "failed call to UtimesNanoAt")
+ }
+
+ return nil
+}
Index: src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/walker_unix.go
--- src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/walker_unix.go.orig 2017-10-20 20:05:34.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/walker_unix.go 2017-10-22 00:23:24.546887000 +0200
@@ -41,7 +41,7 @@
stat.Devminor = int64(minor(uint64(s.Rdev)))
}
- ino := s.Ino
+ ino := uint64(s.Ino)
if s.Nlink > 1 {
if oldpath, ok := seenFiles[ino]; ok {
stat.Linkname = oldpath