Attachment #227677 for bug #258284

View | Details | Raw Unified | Return to bug 258284
Collapse All | Expand All




# Created by: Nikolai Lifanov <lifanov@FreeBSD.org>

PORTNAME=		docker
PORTVERSION=		20.10.8
DISTVERSIONPREFIX=	v
PORTREVISION=		1
CATEGORIES=		sysutils

MAINTAINER=		ports@FreeBSD.org

PLIST_FILES=		bin/docker

USE_GITHUB=		yes
GH_PROJECT=		cli

USES=	go

GO_PKGNAME=	github.com/docker/cli
GO_TARGET=	${GO_PKGNAME}/cmd/docker

pre-build:
		@${MV} ${GO_WRKSRC}/components/* ${GO_WRKSRC}/
		@${CP} ${FILESDIR}/default_store_freebsd.go \
			${GO_WRKSRC}/cli/config/credentials/

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/sysutils/docker/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1555548784	1	TIMESTAMP = 1630835546
2	SHA256 (docker-docker-ce-v18.09.5_GH0.tar.gz) = 57f2a5d3374d86a8eb680c91df4351f5cb648351b9b32520c6fd2d66e7e97fd5	2	SHA256 (docker-cli-v20.10.8_GH0.tar.gz) = cde34bbefd70fa27b44dfa904c40db84b89abf237e5267dcd08603b459a89253
3	SIZE (docker-docker-ce-v18.09.5_GH0.tar.gz) = 15256899	3	SIZE (docker-cli-v20.10.8_GH0.tar.gz) = 7526374

Added Link Here

(-)b/sysutils/docker/files/patch-cli_config_credentials_default__store__unsupported.go (+8 lines)
1	--- cli/config/credentials/default_store_unsupported.go.orig 2021-07-29 13:55:47 UTC
2	+++ cli/config/credentials/default_store_unsupported.go
3	@@ -1,4 +1,4 @@
4	-// +build !windows,!darwin,!linux
5	+// +build !windows,!darwin,!linux,!freebsd
6
7	package credentials
8

Removed Link Here

(-)a/sysutils/docker/files/patch-components_cli_cli_config_credentials_default__store__unsupported.go (-8 lines)
1	--- components/cli/cli/config/credentials/default_store_unsupported.go.orig 2017-12-27 17:03:35 UTC
2	+++ components/cli/cli/config/credentials/default_store_unsupported.go
3	@@ -1,4 +1,4 @@
4	-// +build !windows,!darwin,!linux
5	+// +build !windows,!darwin,!linux,!freebsd
6
7	package credentials
8

Removed Link Here

(-)a/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_archive_archive__unix.go (-11 lines)
1	--- components/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go.orig 2017-12-27 17:03:35 UTC
2	+++ components/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go
3	@@ -62,7 +62,7 @@ func getInodeFromStat(stat interface{}) (inode uint64,
4	s, ok := stat.(*syscall.Stat_t)
5
6	if ok {
7	- inode = s.Ino
8	+ inode = uint64(s.Ino)
9	}
10
11	return

Removed Link Here

(-)a/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_archive_changes__unix.go (-11 lines)
1	--- components/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go.orig 2017-12-27 17:03:35 UTC
2	+++ components/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go
3	@@ -29,7 +29,7 @@ func (info *FileInfo) isDir() bool {
4	}
5
6	func getIno(fi os.FileInfo) uint64 {
7	- return fi.Sys().(*syscall.Stat_t).Ino
8	+ return uint64(fi.Sys().(*syscall.Stat_t).Ino)
9	}
10
11	func hasHardlinks(fi os.FileInfo) bool {

Removed Link Here

(-)a/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go (-11 lines)
1	--- components/cli/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go.orig 2018-08-03 16:04:11 UTC
2	+++ components/cli/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go
3	@@ -37,7 +37,7 @@ func parseMountTable(filter FilterFunc)
4
5	if filter != nil {
6	// filter out entries we're not interested in
7	- skip, stop = filter(p)
8	+ skip, stop = filter(&mountinfo)
9	if skip {
10	continue
11	}

Removed Link Here

(-)a/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_chtimes__nolinux.go (-8 lines)
1	--- components/cli/vendor/github.com/tonistiigi/fsutil/chtimes_nolinux.go.orig 2018-08-03 15:31:57 UTC
2	+++ components/cli/vendor/github.com/tonistiigi/fsutil/chtimes_nolinux.go
3	@@ -1,4 +1,4 @@
4	-// +build !linux
5	+// +build !linux,!freebsd
6
7	package fsutil
8




--- 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
+}

Removed Link Here

(-)a/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_diskwriter__unix.go (-11 lines)
1	--- components/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go.orig 2019-03-06 12:30:35 UTC
2	+++ components/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go
3	@@ -45,7 +45,7 @@ func handleTarTypeBlockCharFifo(path str
4	mode \|= syscall.S_IFBLK
5	}
6
7	- if err := syscall.Mknod(path, mode, int(mkdev(stat.Devmajor, stat.Devminor))); err != nil {
8	+ if err := syscall.Mknod(path, mode, uint64(mkdev(stat.Devmajor, stat.Devminor))); err != nil {
9	return err
10	}
11	return nil

Removed Link Here

(-)a/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_stat__unix.go (-11 lines)
1	--- components/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go.orig 2019-02-01 16:05:34 UTC
2	+++ components/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go
3	@@ -45,7 +45,7 @@ func setUnixOpt(fi os.FileInfo, stat *ty
4	stat.Devminor = int64(minor(uint64(s.Rdev)))
5	}
6
7	- ino := s.Ino
8	+ ino := uint64(s.Ino)
9	if seenFiles != nil {
10	if s.Nlink > 1 {
11	if oldpath, ok := seenFiles[ino]; ok {

Added Link Here

(-)b/sysutils/docker/files/patch-vendor_github.com_docker_docker_pkg_system_mknod.go (+11 lines)
1	--- vendor/github.com/docker/docker/pkg/system/mknod.go.orig 2021-09-05 10:32:15 UTC
2	+++ vendor/github.com/docker/docker/pkg/system/mknod.go
3	@@ -9,7 +9,7 @@ import (
4	// Mknod creates a filesystem node (file, device special file or named pipe) named path
5	// with attributes specified by mode and dev.
6	func Mknod(path string, mode uint32, dev int) error {
7	- return unix.Mknod(path, mode, dev)
8	+ return unix.Mknod(path, mode, uint64(dev))
9	}
10
11	// Mkdev is used to build the value of linux devices (in /dev/) which specifies major

Added Link Here

(-)b/sysutils/docker/files/patch-vendor_github.com_tonistiigi_fsutil_diskwriter__unix.go (-1 / +11 lines)
0	-	1	--- vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go.orig 2021-09-05 10:25:57 UTC
		2	+++ vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go
		3	@@ -45,7 +45,7 @@ func handleTarTypeBlockCharFifo(path string, stat *typ
		4	mode \|= syscall.S_IFBLK
		5	}
		6
		7	- if err := syscall.Mknod(path, mode, int(mkdev(stat.Devmajor, stat.Devminor))); err != nil {
		8	+ if err := syscall.Mknod(path, mode, uint64(mkdev(stat.Devmajor, stat.Devminor))); err != nil {
		9	return errors.WithStack(err)
		10	}
		11	return nil

Return to bug 258284

Lines 1-9 Link Here

(-)b/sysutils/docker/Makefile (-7 / +5 lines)
1	# Created by: Nikolai Lifanov <lifanov@FreeBSD.org>	1	# Created by: Nikolai Lifanov <lifanov@FreeBSD.org>
2		2
3	PORTNAME= docker	3	PORTNAME= docker
4	PORTVERSION= 18.09.5	4	PORTVERSION= 20.10.8
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	PORTREVISION= 1
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8		7
9	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= ports@FreeBSD.org
Lines 14-29 LICENSE= APACHE20 Link Here
14	PLIST_FILES= bin/docker	13	PLIST_FILES= bin/docker
15		14
16	USE_GITHUB= yes	15	USE_GITHUB= yes
17	GH_PROJECT= docker-ce	16	GH_PROJECT= cli
18		17
19	USES= go	18	USES= go
20		19
21	GO_PKGNAME= github.com/${PORTNAME}	20	GO_PKGNAME= github.com/docker/cli
22	GO_TARGET= ${GO_PKGNAME}/cli/cmd/docker	21	GO_TARGET= ${GO_PKGNAME}/cmd/docker
23		22
24	pre-build:	23	pre-build:
25	@${MV} ${GO_WRKSRC}/components/* ${GO_WRKSRC}/
26	@${CP} ${FILESDIR}/default_store_freebsd.go \	24	@${CP} ${FILESDIR}/default_store_freebsd.go \
27	${GO_WRKSRC}/cli/cli/config/credentials/	25	${GO_WRKSRC}/cli/config/credentials/
28		26
29	.include <bsd.port.mk>	27	.include <bsd.port.mk>