On 12/18/20 11:13 PM, Muhammad Kaisar Arkhan wrote:
Hello,
Attached is a diff to update sysutils/docker-cli from 19.03.13 to 20.10.1.
I would like to also note that it appears there's a mistake with the
port inside the ports tree, PKGNAME is docker despite the fact that it
should be docker-cli.
OK?
Ping.
Also, solene@ has made a diff to rename the docker package:
https://marc.info/?l=openbsd-ports&m=160865701926336&w=2
Assuming it's all good, this should be good to commit.
--
Muhammad Kaisar Arkhan
h...@yukiisbo.red - kai...@arkhan.io
https://yukiisbo.red - https://arkhan.io
diff --git a/sysutils/docker-cli/Makefile b/sysutils/docker-cli/Makefile
index a7fbe60..ae4c5d8 100644
--- a/sysutils/docker-cli/Makefile
+++ b/sysutils/docker-cli/Makefile
@@ -1,15 +1,14 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2020/10/03 20:38:46 solene Exp $
+# $OpenBSD$
COMMENT = command-line tool for controlling Docker
-V = 19.03.13
-PKGNAME = docker-${V}
+V = 20.10.1
+PKGNAME = docker-cli-${V}
GH_ACCOUNT = docker
GH_PROJECT = cli
GH_TAGNAME = v${V}
-
CATEGORIES = sysutils
HOMEPAGE = https://docs.docker.com/engine/reference/commandline/cli/
diff --git a/sysutils/docker-cli/distinfo b/sysutils/docker-cli/distinfo
index 6f5d748..1cf31ef 100644
--- a/sysutils/docker-cli/distinfo
+++ b/sysutils/docker-cli/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cli-19.03.13.tar.gz) = IbiKAOj3oxlMCuHeWjHj4XKO9qooBBWNy1Aqi1/Wris=
-SIZE (cli-19.03.13.tar.gz) = 7798694
+SHA256 (cli-20.10.1.tar.gz) = TufMnD9ih8qDQWaqoalFeQxU2ag0WhtEmhk9nHOfKn0=
+SIZE (cli-20.10.1.tar.gz) = 7705467
diff --git a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_containerd_content_local_store_unix_go b/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_containerd_content_local_store_unix_go
index af18b64..6a2ab58 100644
--- a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_containerd_content_local_store_unix_go
+++ b/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_containerd_content_local_store_unix_go
@@ -1,11 +1,11 @@
-$OpenBSD: patch-vendor_github_com_containerd_containerd_content_local_store_unix_go,v 1.1.1.1 2020/10/03 20:38:46 solene Exp $
+$OpenBSD$
Index: vendor/github.com/containerd/containerd/content/local/store_unix.go
--- vendor/github.com/containerd/containerd/content/local/store_unix.go.orig
+++ vendor/github.com/containerd/containerd/content/local/store_unix.go
@@ -1,4 +1,4 @@
--// +build linux solaris darwin freebsd
-+// +build linux solaris darwin freebsd openbsd
+-// +build linux solaris darwin freebsd netbsd
++// +build linux solaris darwin freebsd netbsd openbsd
/*
Copyright The containerd Authors.
diff --git a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_containerd_snapshotter_default_unix_go b/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_containerd_snapshotter_default_unix_go
deleted file mode 100644
index 0564b4a..0000000
--- a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_containerd_snapshotter_default_unix_go
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-vendor_github_com_containerd_containerd_snapshotter_default_unix_go,v 1.1.1.1 2020/10/03 20:38:46 solene Exp $
-
-Index: vendor/github.com/containerd/containerd/snapshotter_default_unix.go
---- vendor/github.com/containerd/containerd/snapshotter_default_unix.go.orig
-+++ vendor/github.com/containerd/containerd/snapshotter_default_unix.go
-@@ -1,4 +1,4 @@
--// +build darwin freebsd solaris
-+// +build darwin freebsd solaris openbsd
-
- /*
- Copyright The containerd Authors.
diff --git a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_fs_stat_openbsd_go b/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_containerd_sys_stat_openbsd_go
similarity index 79%
rename from sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_fs_stat_openbsd_go
rename to sysutils/docker-cli/patches/patch-vendor_github_com_containerd_containerd_sys_stat_openbsd_go
index ae7eafe..4637037 100644
--- a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_fs_stat_openbsd_go
+++ b/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_containerd_sys_stat_openbsd_go
@@ -1,8 +1,8 @@
-$OpenBSD: patch-vendor_github_com_containerd_continuity_fs_stat_openbsd_go,v 1.1.1.1 2020/10/03 20:38:46 solene Exp $
+$OpenBSD$
-Index: vendor/github.com/containerd/continuity/fs/stat_openbsd.go
---- vendor/github.com/containerd/continuity/fs/stat_openbsd.go.orig
-+++ vendor/github.com/containerd/continuity/fs/stat_openbsd.go
+Index: vendor/github.com/containerd/containerd/sys/stat_openbsd.go
+--- vendor/github.com/containerd/containerd/sys/stat_openbsd.go.orig
++++ vendor/github.com/containerd/containerd/sys/stat_openbsd.go
@@ -0,0 +1,44 @@
+// +build openbsd
+/*
@@ -21,7 +21,7 @@ Index: vendor/github.com/containerd/continuity/fs/stat_openbsd.go
+ limitations under the License.
+*/
+
-+package fs
++package sys
+
+import (
+ "syscall"
diff --git a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_containerd_sys_stat_unix_go b/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_containerd_sys_stat_unix_go
deleted file mode 100644
index f4404bd..0000000
--- a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_containerd_sys_stat_unix_go
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-vendor_github_com_containerd_containerd_sys_stat_unix_go,v 1.1.1.1 2020/10/03 20:38:46 solene Exp $
-
-Index: vendor/github.com/containerd/containerd/sys/stat_unix.go
---- vendor/github.com/containerd/containerd/sys/stat_unix.go.orig
-+++ vendor/github.com/containerd/containerd/sys/stat_unix.go
-@@ -1,4 +1,4 @@
--// +build linux solaris
-+// +build linux solaris openbsd
-
- /*
- Copyright The containerd Authors.
diff --git a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_devices_devices_unix_go b/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_devices_devices_unix_go
deleted file mode 100644
index ade54ef..0000000
--- a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_devices_devices_unix_go
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-vendor_github_com_containerd_continuity_devices_devices_unix_go,v 1.1.1.1 2020/10/03 20:38:46 solene Exp $
-
-Index: vendor/github.com/containerd/continuity/devices/devices_unix.go
---- vendor/github.com/containerd/continuity/devices/devices_unix.go.orig
-+++ vendor/github.com/containerd/continuity/devices/devices_unix.go
-@@ -1,4 +1,4 @@
--// +build linux darwin freebsd solaris
-+// +build linux darwin freebsd solaris openbsd
-
- /*
- Copyright The containerd Authors.
diff --git a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_driver_driver_unix_go b/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_driver_driver_unix_go
deleted file mode 100644
index 70e2c5a..0000000
--- a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_driver_driver_unix_go
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-vendor_github_com_containerd_continuity_driver_driver_unix_go,v 1.1.1.1 2020/10/03 20:38:46 solene Exp $
-
-Index: vendor/github.com/containerd/continuity/driver/driver_unix.go
---- vendor/github.com/containerd/continuity/driver/driver_unix.go.orig
-+++ vendor/github.com/containerd/continuity/driver/driver_unix.go
-@@ -1,4 +1,4 @@
--// +build linux darwin freebsd solaris
-+// +build linux darwin freebsd solaris openbsd
-
- /*
- Copyright The containerd Authors.
diff --git a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_driver_lchmod_unix_go b/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_driver_lchmod_unix_go
deleted file mode 100644
index c4c21c9..0000000
--- a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_driver_lchmod_unix_go
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-vendor_github_com_containerd_continuity_driver_lchmod_unix_go,v 1.1.1.1 2020/10/03 20:38:46 solene Exp $
-
-Index: vendor/github.com/containerd/continuity/driver/lchmod_unix.go
---- vendor/github.com/containerd/continuity/driver/lchmod_unix.go.orig
-+++ vendor/github.com/containerd/continuity/driver/lchmod_unix.go
-@@ -1,4 +1,4 @@
--// +build darwin freebsd solaris
-+// +build darwin freebsd solaris openbsd
-
- /*
- Copyright The containerd Authors.
diff --git a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_fs_copy_unix_go b/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_fs_copy_unix_go
deleted file mode 100644
index fd5b84f..0000000
--- a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_fs_copy_unix_go
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-vendor_github_com_containerd_continuity_fs_copy_unix_go,v 1.1.1.1 2020/10/03 20:38:46 solene Exp $
-
-Index: vendor/github.com/containerd/continuity/fs/copy_unix.go
---- vendor/github.com/containerd/continuity/fs/copy_unix.go.orig
-+++ vendor/github.com/containerd/continuity/fs/copy_unix.go
-@@ -1,4 +1,4 @@
--// +build solaris darwin freebsd
-+// +build solaris darwin freebsd openbsd
-
- /*
- Copyright The containerd Authors.
diff --git a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_hardlinks_unix_go b/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_hardlinks_unix_go
deleted file mode 100644
index a9e5b74..0000000
--- a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_hardlinks_unix_go
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-vendor_github_com_containerd_continuity_hardlinks_unix_go,v 1.1.1.1 2020/10/03 20:38:46 solene Exp $
-
-Index: vendor/github.com/containerd/continuity/hardlinks_unix.go
---- vendor/github.com/containerd/continuity/hardlinks_unix.go.orig
-+++ vendor/github.com/containerd/continuity/hardlinks_unix.go
-@@ -1,4 +1,4 @@
--// +build linux darwin freebsd solaris
-+// +build linux darwin freebsd solaris openbsd
-
- /*
- Copyright The containerd Authors.
diff --git a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_resource_unix_go b/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_resource_unix_go
deleted file mode 100644
index 1d67899..0000000
--- a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_resource_unix_go
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-vendor_github_com_containerd_continuity_resource_unix_go,v 1.1.1.1 2020/10/03 20:38:46 solene Exp $
-
-Index: vendor/github.com/containerd/continuity/resource_unix.go
---- vendor/github.com/containerd/continuity/resource_unix.go.orig
-+++ vendor/github.com/containerd/continuity/resource_unix.go
-@@ -1,4 +1,4 @@
--// +build linux darwin freebsd solaris
-+// +build linux darwin freebsd solaris openbsd
-
- /*
- Copyright The containerd Authors.
diff --git a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_sysx_nodata_unix_go b/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_sysx_nodata_unix_go
deleted file mode 100644
index 49240f9..0000000
--- a/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_sysx_nodata_unix_go
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-vendor_github_com_containerd_continuity_sysx_nodata_unix_go,v 1.1.1.1 2020/10/03 20:38:46 solene Exp $
-
-Index: vendor/github.com/containerd/continuity/sysx/nodata_unix.go
---- vendor/github.com/containerd/continuity/sysx/nodata_unix.go.orig
-+++ vendor/github.com/containerd/continuity/sysx/nodata_unix.go
-@@ -1,4 +1,4 @@
--// +build darwin freebsd
-+// +build darwin freebsd openbsd
-
- /*
- Copyright The containerd Authors.
diff --git a/sysutils/docker-cli/patches/patch-vendor_github_com_moby_sys_mount_mounter_bsd_go b/sysutils/docker-cli/patches/patch-vendor_github_com_moby_sys_mount_mounter_bsd_go
new file mode 100644
index 0000000..fb8b48a
--- /dev/null
+++ b/sysutils/docker-cli/patches/patch-vendor_github_com_moby_sys_mount_mounter_bsd_go
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: vendor/github.com/moby/sys/mount/mounter_bsd.go
+--- vendor/github.com/moby/sys/mount/mounter_bsd.go.orig
++++ vendor/github.com/moby/sys/mount/mounter_bsd.go
+@@ -1,4 +1,4 @@
+-// +build freebsd,cgo openbsd,cgo
++// +build freebsd,cgo
+
+ package mount
+
diff --git a/sysutils/docker-cli/patches/patch-vendor_github_com_moby_sys_mount_mounter_openbsd_go b/sysutils/docker-cli/patches/patch-vendor_github_com_moby_sys_mount_mounter_openbsd_go
new file mode 100644
index 0000000..eb17eea
--- /dev/null
+++ b/sysutils/docker-cli/patches/patch-vendor_github_com_moby_sys_mount_mounter_openbsd_go
@@ -0,0 +1,71 @@
+$OpenBSD$
+
+Index: vendor/github.com/moby/sys/mount/mounter_openbsd.go
+--- vendor/github.com/moby/sys/mount/mounter_openbsd.go.orig
++++ vendor/github.com/moby/sys/mount/mounter_openbsd.go
+@@ -0,0 +1,65 @@
++// +build openbsd,cgo
++
++package mount
++
++/*
++#include <sys/types.h>
++#include <sys/mount.h>
++*/
++import "C"
++
++import (
++ "fmt"
++ "syscall"
++ "unsafe"
++)
++
++func createExportInfo(readOnly bool) C.struct_export_args {
++ exportFlags := C.int(0)
++ if readOnly {
++ exportFlags = C.MNT_EXRDONLY
++ }
++ out := C.struct_export_args{
++ ex_root: 0,
++ ex_flags: exportFlags,
++ }
++ return out
++}
++
++func createUfsArgs(device string, readOnly bool) unsafe.Pointer {
++ out := &C.struct_ufs_args{
++ fspec: C.CString(device),
++ export_info: createExportInfo(readOnly),
++ }
++ return unsafe.Pointer(out)
++}
++
++func mount(device, target, mType string, flag uintptr, data string) error {
++ readOnly := flag&RDONLY == 1
++
++ var fsArgs unsafe.Pointer
++
++ if mType == "ffs" {
++ fsArgs = createUfsArgs(device, readOnly)
++ } else {
++ return &mountError{
++ op: "mount",
++ source: device,
++ target: target,
++ flags: flag,
++ err: fmt.Errorf("unsupported type"),
++ }
++ }
++
++ if errno := C.mount(C.CString(mType), C.CString(target), C.int(flag), fsArgs); errno != 0 {
++ return &mountError{
++ op: "mount",
++ source: device,
++ target: target,
++ flags: flag,
++ err: syscall.Errno(errno),
++ }
++ }
++
++ return nil
++}
diff --git a/sysutils/docker-cli/patches/patch-vendor_github_com_tonistiigi_fsutil_diskwriter_go b/sysutils/docker-cli/patches/patch-vendor_github_com_tonistiigi_fsutil_diskwriter_go
new file mode 100644
index 0000000..b8e0d51
--- /dev/null
+++ b/sysutils/docker-cli/patches/patch-vendor_github_com_tonistiigi_fsutil_diskwriter_go
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: vendor/github.com/tonistiigi/fsutil/diskwriter.go
+--- vendor/github.com/tonistiigi/fsutil/diskwriter.go.orig
++++ vendor/github.com/tonistiigi/fsutil/diskwriter.go
+@@ -104,7 +104,7 @@ func (dw *DiskWriter) HandleChange(kind ChangeKind, p
+
+ stat, ok := fi.Sys().(*types.Stat)
+ if !ok {
+- return errors.WithStack(&os.PathError{Path: p, Err: syscall.EBADMSG, Op: "change without stat info"})
++ return errors.WithStack(&os.PathError{Path: p, Err: syscall.Errno(0x5c), Op: "change without stat info"})
+ }
+
+ statCopy := *stat
diff --git a/sysutils/docker-cli/patches/patch-vendor_github_com_tonistiigi_fsutil_fs_go b/sysutils/docker-cli/patches/patch-vendor_github_com_tonistiigi_fsutil_fs_go
new file mode 100644
index 0000000..a947705
--- /dev/null
+++ b/sysutils/docker-cli/patches/patch-vendor_github_com_tonistiigi_fsutil_fs_go
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: vendor/github.com/tonistiigi/fsutil/fs.go
+--- vendor/github.com/tonistiigi/fsutil/fs.go.orig
++++ vendor/github.com/tonistiigi/fsutil/fs.go
+@@ -80,7 +80,7 @@ func (fs *subDirFS) Walk(ctx context.Context, fn filep
+ if err := d.FS.Walk(ctx, func(p string, fi os.FileInfo, err error) error {
+ stat, ok := fi.Sys().(*types.Stat)
+ if !ok {
+- return errors.WithStack(&os.PathError{Path: d.Stat.Path, Err: syscall.EBADMSG, Op: "fileinfo without stat info"})
++ return errors.WithStack(&os.PathError{Path: d.Stat.Path, Err: syscall.Errno(0x5c), Op: "fileinfo without stat info"})
+ }
+ stat.Path = path.Join(d.Stat.Path, stat.Path)
+ if stat.Linkname != "" {
diff --git a/sysutils/docker-cli/patches/patch-vendor_github_com_tonistiigi_fsutil_hardlinks_go b/sysutils/docker-cli/patches/patch-vendor_github_com_tonistiigi_fsutil_hardlinks_go
new file mode 100644
index 0000000..930b702
--- /dev/null
+++ b/sysutils/docker-cli/patches/patch-vendor_github_com_tonistiigi_fsutil_hardlinks_go
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: vendor/github.com/tonistiigi/fsutil/hardlinks.go
+--- vendor/github.com/tonistiigi/fsutil/hardlinks.go.orig
++++ vendor/github.com/tonistiigi/fsutil/hardlinks.go
+@@ -29,7 +29,7 @@ func (v *Hardlinks) HandleChange(kind ChangeKind, p st
+
+ stat, ok := fi.Sys().(*types.Stat)
+ if !ok {
+- return errors.WithStack(&os.PathError{Path: p, Err: syscall.EBADMSG, Op: "change without stat info"})
++ return errors.WithStack(&os.PathError{Path: p, Err: syscall.Errno(0x5c), Op: "change without stat info"})
+ }
+
+ if fi.IsDir() || fi.Mode()&os.ModeSymlink != 0 {
diff --git a/sysutils/docker-cli/patches/patch-vendor_github_com_tonistiigi_fsutil_send_go b/sysutils/docker-cli/patches/patch-vendor_github_com_tonistiigi_fsutil_send_go
new file mode 100644
index 0000000..656e2a5
--- /dev/null
+++ b/sysutils/docker-cli/patches/patch-vendor_github_com_tonistiigi_fsutil_send_go
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: vendor/github.com/tonistiigi/fsutil/send.go
+--- vendor/github.com/tonistiigi/fsutil/send.go.orig
++++ vendor/github.com/tonistiigi/fsutil/send.go
+@@ -150,7 +150,7 @@ func (s *sender) walk(ctx context.Context) error {
+ }
+ stat, ok := fi.Sys().(*types.Stat)
+ if !ok {
+- return errors.WithStack(&os.PathError{Path: path, Err: syscall.EBADMSG, Op: "fileinfo without stat info"})
++ return errors.WithStack(&os.PathError{Path: path, Err: syscall.Errno(0x5c), Op: "fileinfo without stat info"})
+ }
+
+ p := &types.Packet{
diff --git a/sysutils/docker-cli/patches/patch-vendor_github_com_tonistiigi_fsutil_tarwriter_go b/sysutils/docker-cli/patches/patch-vendor_github_com_tonistiigi_fsutil_tarwriter_go
new file mode 100644
index 0000000..6640249
--- /dev/null
+++ b/sysutils/docker-cli/patches/patch-vendor_github_com_tonistiigi_fsutil_tarwriter_go
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: vendor/github.com/tonistiigi/fsutil/tarwriter.go
+--- vendor/github.com/tonistiigi/fsutil/tarwriter.go.orig
++++ vendor/github.com/tonistiigi/fsutil/tarwriter.go
+@@ -21,7 +21,7 @@ func WriteTar(ctx context.Context, fs FS, w io.Writer)
+ }
+ stat, ok := fi.Sys().(*types.Stat)
+ if !ok {
+- return errors.WithStack(&os.PathError{Path: path, Err: syscall.EBADMSG, Op: "fileinfo without stat info"})
++ return errors.WithStack(&os.PathError{Path: path, Err: syscall.Errno(0x5c), Op: "fileinfo without stat info"})
+ }
+ hdr, err := tar.FileInfoHeader(fi, stat.Linkname)
+ if err != nil {
diff --git a/sysutils/docker-cli/pkg/PLIST b/sysutils/docker-cli/pkg/PLIST
index f8b704b..c782b47 100644
--- a/sysutils/docker-cli/pkg/PLIST
+++ b/sysutils/docker-cli/pkg/PLIST
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2020/10/03 20:38:46 solene Exp $
+@comment $OpenBSD: PLIST,v$
@bin bin/docker
--
2.29.2
