Index | Thread | Search

From:
Kirill A. Korinsky <kirill@korins.ky>
Subject:
sysutils/docker-buildx: update to 0.14.0
To:
OpenBSD ports <ports@openbsd.org>
Date:
Tue, 23 Apr 2024 22:33:09 +0200

Download raw body.

Thread
  • Kirill A. Korinsky:

    sysutils/docker-buildx: update to 0.14.0

Greetings,

This is the first patch in series to update docker related ports.

Here update dockeer-buildx which include adjustment our patches.

Tested on amd64 -curent.

diff --git sysutils/docker-buildx/Makefile sysutils/docker-buildx/Makefile
index 17aeac6d646..8695519b3b3 100644
--- sysutils/docker-buildx/Makefile
+++ sysutils/docker-buildx/Makefile
@@ -1,6 +1,6 @@
 COMMENT =		Docker CLI plugin for extended build capabilities
 
-V =			0.12.1
+V =			0.14.0
 GH_ACCOUNT =		docker
 GH_PROJECT =		buildx
 GH_TAGNAME =		v${V}
diff --git sysutils/docker-buildx/distinfo sysutils/docker-buildx/distinfo
index 1f3944370a2..74152c8f3d8 100644
--- sysutils/docker-buildx/distinfo
+++ sysutils/docker-buildx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (buildx-0.12.1.tar.gz) = nMF27VXnxCPCPeNb0x3ztEkmHxuQdlwX8AO9TehqaqQ=
-SIZE (buildx-0.12.1.tar.gz) = 10509403
+SHA256 (buildx-0.14.0.tar.gz) = ntJ9R7coKIUAuiU1NmeS2bAGNU4CF4aINgkZZj+Stj4=
+SIZE (buildx-0.14.0.tar.gz) = 11120356
diff --git sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_filter_go sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_filter_go
new file mode 100644
index 00000000000..03b8cdf9446
--- /dev/null
+++ sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_filter_go
@@ -0,0 +1,21 @@
+Index: vendor/github.com/tonistiigi/fsutil/filter.go
+--- vendor/github.com/tonistiigi/fsutil/filter.go.orig
++++ vendor/github.com/tonistiigi/fsutil/filter.go
+@@ -318,7 +318,7 @@ func (fs *filterFS) Walk(ctx context.Context, target s
+ 		}
+ 		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"})
+ 		}
+ 
+ 		select {
+@@ -346,7 +346,7 @@ func (fs *filterFS) Walk(ctx context.Context, target s
+ 				}
+ 				parentStat, ok := parentFi.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"})
+ 				}
+ 
+ 				select {
diff --git sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_followlinks_go sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_followlinks_go
new file mode 100644
index 00000000000..e85c7f5e8eb
--- /dev/null
+++ sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_followlinks_go
@@ -0,0 +1,12 @@
+Index: vendor/github.com/tonistiigi/fsutil/followlinks.go
+--- vendor/github.com/tonistiigi/fsutil/followlinks.go.orig
++++ vendor/github.com/tonistiigi/fsutil/followlinks.go
+@@ -122,7 +122,7 @@ func (r *symlinkResolver) readSymlink(p string, allowW
+ 	}
+ 	stat, ok := fi.Sys().(*types.Stat)
+ 	if !ok {
+-		return nil, errors.WithStack(&os.PathError{Path: p, Err: syscall.EBADMSG, Op: "fileinfo without stat info"})
++		return nil, errors.WithStack(&os.PathError{Path: p, Err: syscall.Errno(0x5c), Op: "fileinfo without stat info"})
+ 	}
+ 
+ 	link := filepath.Clean(stat.Linkname)
diff --git sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_fs_go sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_fs_go
index 698ed4b63be..d3b230d1e7b 100644
--- sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_fs_go
+++ sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_fs_go
@@ -1,8 +1,8 @@
 Index: vendor/github.com/tonistiigi/fsutil/fs.go
 --- vendor/github.com/tonistiigi/fsutil/fs.go.orig
 +++ vendor/github.com/tonistiigi/fsutil/fs.go
-@@ -79,7 +79,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 {
+@@ -144,7 +144,7 @@ func (fs *subDirFS) Walk(ctx context.Context, target s
+ 			}
  			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"})
diff --git sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_send_go sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_send_go
index 38f6bad6800..f9950f1f938 100644
--- sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_send_go
+++ sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_send_go
@@ -1,12 +1,12 @@
 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 {
+@@ -158,7 +158,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"})
  		}
- 
+ 		stat.Path = filepath.ToSlash(stat.Path)
  		p := &types.Packet{
diff --git sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_tarwriter_go sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_tarwriter_go
index 795cbf6d790..233d5667289 100644
--- sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_tarwriter_go
+++ sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_tarwriter_go
@@ -1,7 +1,7 @@
 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)
+@@ -26,7 +26,7 @@ func WriteTar(ctx context.Context, fs FS, w io.Writer)
  		}
  		stat, ok := fi.Sys().(*types.Stat)
  		if !ok {


-- 
wbr, Kirill