diff --git a/sysutils/docker/Makefile b/sysutils/docker/Makefile --- a/sysutils/docker/Makefile +++ b/sysutils/docker/Makefile @@ -1,7 +1,7 @@ # Created by: Nikolai Lifanov PORTNAME= docker -PORTVERSION= 18.09.5 +PORTVERSION= 20.10.7 DISTVERSIONPREFIX= v PORTREVISION= 1 CATEGORIES= sysutils @@ -14,16 +14,15 @@ PLIST_FILES= bin/docker USE_GITHUB= yes -GH_PROJECT= docker-ce +GH_PROJECT= cli USES= go -GO_PKGNAME= github.com/${PORTNAME} -GO_TARGET= ${GO_PKGNAME}/cli/cmd/docker +GO_PKGNAME= github.com/${PORTNAME}/cli -pre-build: - @${MV} ${GO_WRKSRC}/components/* ${GO_WRKSRC}/ - @${CP} ${FILESDIR}/default_store_freebsd.go \ - ${GO_WRKSRC}/cli/cli/config/credentials/ +GO_BUILDFLAGS= -tags=docker,nomk,DISABLE_QUIC -ldflags '-s -w -extldflags "-static"' +GO_TARGET= ./cmd/docker + +PLIST_FILES= bin/docker .include diff --git a/sysutils/docker/distinfo b/sysutils/docker/distinfo --- a/sysutils/docker/distinfo +++ b/sysutils/docker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555548784 -SHA256 (docker-docker-ce-v18.09.5_GH0.tar.gz) = 57f2a5d3374d86a8eb680c91df4351f5cb648351b9b32520c6fd2d66e7e97fd5 -SIZE (docker-docker-ce-v18.09.5_GH0.tar.gz) = 15256899 +TIMESTAMP = 1630343964 +SHA256 (docker-cli-v20.10.7_GH0.tar.gz) = 0a7848b1b5031483de075433506d0448ddf834368d9c73770e453e0b89b49747 +SIZE (docker-cli-v20.10.7_GH0.tar.gz) = 7523515 diff --git a/sysutils/docker/files/default_store_freebsd.go b/sysutils/docker/files/default_store_freebsd.go deleted file mode 100644 --- a/sysutils/docker/files/default_store_freebsd.go +++ /dev/null @@ -1,13 +0,0 @@ -package credentials - -import ( - "os/exec" -) - -func defaultCredentialsStore() string { - if _, err := exec.LookPath("pass"); err == nil { - return "pass" - } - - return "secretservice" -} diff --git a/sysutils/docker/files/patch-components_cli_cli_config_credentials_default__store__unsupported.go b/sysutils/docker/files/patch-components_cli_cli_config_credentials_default__store__unsupported.go deleted file mode 100644 --- a/sysutils/docker/files/patch-components_cli_cli_config_credentials_default__store__unsupported.go +++ /dev/null @@ -1,8 +0,0 @@ ---- components/cli/cli/config/credentials/default_store_unsupported.go.orig 2017-12-27 17:03:35 UTC -+++ components/cli/cli/config/credentials/default_store_unsupported.go -@@ -1,4 +1,4 @@ --// +build !windows,!darwin,!linux -+// +build !windows,!darwin,!linux,!freebsd - - package credentials - diff --git a/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_archive_archive__unix.go b/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_archive_archive__unix.go deleted file mode 100644 --- a/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_archive_archive__unix.go +++ /dev/null @@ -1,11 +0,0 @@ ---- components/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go.orig 2017-12-27 17:03:35 UTC -+++ components/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go -@@ -62,7 +62,7 @@ func getInodeFromStat(stat interface{}) (inode uint64, - s, ok := stat.(*syscall.Stat_t) - - if ok { -- inode = s.Ino -+ inode = uint64(s.Ino) - } - - return diff --git a/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_archive_changes__unix.go b/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_archive_changes__unix.go deleted file mode 100644 --- a/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_archive_changes__unix.go +++ /dev/null @@ -1,11 +0,0 @@ ---- components/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go.orig 2017-12-27 17:03:35 UTC -+++ components/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go -@@ -29,7 +29,7 @@ func (info *FileInfo) isDir() bool { - } - - 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 { diff --git a/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go b/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go deleted file mode 100644 --- a/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go +++ /dev/null @@ -1,11 +0,0 @@ ---- components/cli/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go.orig 2018-08-03 16:04:11 UTC -+++ components/cli/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go -@@ -37,7 +37,7 @@ func parseMountTable(filter FilterFunc) - - if filter != nil { - // filter out entries we're not interested in -- skip, stop = filter(p) -+ skip, stop = filter(&mountinfo) - if skip { - continue - } diff --git a/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_chtimes__nolinux.go b/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_chtimes__nolinux.go deleted file mode 100644 --- a/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_chtimes__nolinux.go +++ /dev/null @@ -1,8 +0,0 @@ ---- components/cli/vendor/github.com/tonistiigi/fsutil/chtimes_nolinux.go.orig 2018-08-03 15:31:57 UTC -+++ components/cli/vendor/github.com/tonistiigi/fsutil/chtimes_nolinux.go -@@ -1,4 +1,4 @@ --// +build !linux -+// +build !linux,!freebsd - - package fsutil - diff --git a/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_diskwriter__freebsd.go b/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_diskwriter__freebsd.go deleted file mode 100644 --- a/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_diskwriter__freebsd.go +++ /dev/null @@ -1,23 +0,0 @@ ---- components/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_freebsd.go.orig 2018-01-03 19:54:52 UTC -+++ components/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_freebsd.go -@@ -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 -+} diff --git a/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_diskwriter__unix.go b/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_diskwriter__unix.go deleted file mode 100644 --- a/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_diskwriter__unix.go +++ /dev/null @@ -1,11 +0,0 @@ ---- components/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go.orig 2019-03-06 12:30:35 UTC -+++ components/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go -@@ -45,7 +45,7 @@ func handleTarTypeBlockCharFifo(path str - 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 diff --git a/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_stat__unix.go b/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_stat__unix.go deleted file mode 100644 --- a/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_stat__unix.go +++ /dev/null @@ -1,11 +0,0 @@ ---- components/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go.orig 2019-02-01 16:05:34 UTC -+++ components/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go -@@ -45,7 +45,7 @@ func setUnixOpt(fi os.FileInfo, stat *ty - stat.Devminor = int64(minor(uint64(s.Rdev))) - } - -- ino := s.Ino -+ ino := uint64(s.Ino) - if seenFiles != nil { - if s.Nlink > 1 { - if oldpath, ok := seenFiles[ino]; ok { diff --git a/sysutils/docker/files/patch-vendor_github.com_docker_docker_pkg_archive_archive__unix.go b/sysutils/docker/files/patch-vendor_github.com_docker_docker_pkg_archive_archive__unix.go new file mode 100644 --- /dev/null +++ b/sysutils/docker/files/patch-vendor_github.com_docker_docker_pkg_archive_archive__unix.go @@ -0,0 +1,13 @@ +--- vendor/github.com/docker/docker/pkg/archive/archive_unix.go.orig 2021-05-31 11:40:07.000000000 +0200 ++++ vendor/github.com/docker/docker/pkg/archive/archive_unix.go 2021-09-05 01:12:38.504212000 +0200 +@@ -49,8 +49,8 @@ + + if ok { + // Currently go does not fill in the major/minors +- if s.Mode&unix.S_IFBLK != 0 || +- s.Mode&unix.S_IFCHR != 0 { ++ if s.Rdev != 0xffffffffffffffff && (s.Mode&unix.S_IFBLK != 0 || ++ s.Mode&unix.S_IFCHR != 0) { + hdr.Devmajor = int64(unix.Major(uint64(s.Rdev))) // nolint: unconvert + hdr.Devminor = int64(unix.Minor(uint64(s.Rdev))) // nolint: unconvert + } diff --git a/sysutils/docker/files/patch-vendor_github.com_docker_docker_pkg_system_mknod.go b/sysutils/docker/files/patch-vendor_github.com_docker_docker_pkg_system_mknod.go new file mode 100644 --- /dev/null +++ b/sysutils/docker/files/patch-vendor_github.com_docker_docker_pkg_system_mknod.go @@ -0,0 +1,11 @@ +--- vendor/github.com/docker/docker/pkg/system/mknod.go.orig 2021-05-31 11:40:07.000000000 +0200 ++++ vendor/github.com/docker/docker/pkg/system/mknod.go 2021-09-05 00:08:18.633633000 +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 diff --git a/sysutils/docker/files/patch-vendor_github.com_tonistiigi_fsutil_diskwriter__unix.go b/sysutils/docker/files/patch-vendor_github.com_tonistiigi_fsutil_diskwriter__unix.go new file mode 100644 --- /dev/null +++ b/sysutils/docker/files/patch-vendor_github.com_tonistiigi_fsutil_diskwriter__unix.go @@ -0,0 +1,11 @@ +--- vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go.orig 2021-05-31 11:40:07.000000000 +0200 ++++ vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go 2021-09-05 00:08:18.871192000 +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 errors.WithStack(err) + } + return nil