Index | Thread | Search

From:
Kirill A. Korinsky <kirill@korins.ky>
Subject:
[maintainer update] sysutils/docker-buildx: update to 0.15.0
To:
OpenBSD ports <ports@openbsd.org>
Date:
Thu, 13 Jun 2024 14:55:21 +0100

Download raw body.

Thread
@ports,

Here an update for sysutils/docker-buildx

Changelog: https://github.com/docker/buildx/releases/tag/v0.15.0

Notable changes that one of OpenBSD specific patch were merged, and it isn't
required anymore.

Tested on -current/amd64.

The diff:

diff --git sysutils/docker-buildx/Makefile sysutils/docker-buildx/Makefile
index b36934facaa..3b7e93676d1 100644
--- sysutils/docker-buildx/Makefile
+++ sysutils/docker-buildx/Makefile
@@ -1,6 +1,6 @@
 COMMENT =		Docker CLI plugin for extended build capabilities
 
-V =			0.14.1
+V =			0.15.0
 GH_ACCOUNT =		docker
 GH_PROJECT =		buildx
 GH_TAGNAME =		v${V}
diff --git sysutils/docker-buildx/distinfo sysutils/docker-buildx/distinfo
index 743fcfd64f1..47e8b9f7fef 100644
--- sysutils/docker-buildx/distinfo
+++ sysutils/docker-buildx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (buildx-0.14.1.tar.gz) = AeOcxtZ04gVHpi9S2AvDy9bBz/Z2TXhp4YK9zdSawpc=
-SIZE (buildx-0.14.1.tar.gz) = 11127501
+SHA256 (buildx-0.15.0.tar.gz) = K5IuwzqFpB5HoO0Na+CG0y/DPJit+lnaxxSCE3XzBL4=
+SIZE (buildx-0.15.0.tar.gz) = 11354505
diff --git sysutils/docker-buildx/patches/patch-vendor_github_com_moby_buildkit_cmd_buildkitd_config_gcpolicy_unix_go sysutils/docker-buildx/patches/patch-vendor_github_com_moby_buildkit_cmd_buildkitd_config_gcpolicy_unix_go
deleted file mode 100644
index fb57f54ecbb..00000000000
--- sysutils/docker-buildx/patches/patch-vendor_github_com_moby_buildkit_cmd_buildkitd_config_gcpolicy_unix_go
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: vendor/github.com/moby/buildkit/cmd/buildkitd/config/gcpolicy_unix.go
---- vendor/github.com/moby/buildkit/cmd/buildkitd/config/gcpolicy_unix.go.orig
-+++ vendor/github.com/moby/buildkit/cmd/buildkitd/config/gcpolicy_unix.go
-@@ -23,7 +23,7 @@ func (d DiskSpace) AsBytes(root string) int64 {
- 	if err := syscall.Statfs(root, &st); err != nil {
- 		return defaultCap
- 	}
--	diskSize := int64(st.Bsize) * int64(st.Blocks)
-+	diskSize := int64(st.F_bsize) * int64(st.F_blocks)
- 	avail := diskSize * d.Percentage / 100
- 	return (avail/(1<<30) + 1) * 1e9 // round up
- }
diff --git sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_diskwriter_go sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_diskwriter_go
index 8ee8cf660ad..215c660a58c 100644
--- sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_diskwriter_go
+++ sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_diskwriter_go
@@ -1,7 +1,7 @@
 Index: vendor/github.com/tonistiigi/fsutil/diskwriter.go
 --- vendor/github.com/tonistiigi/fsutil/diskwriter.go.orig
 +++ vendor/github.com/tonistiigi/fsutil/diskwriter.go
-@@ -121,7 +121,7 @@ func (dw *DiskWriter) HandleChange(kind ChangeKind, p 
+@@ -123,7 +123,7 @@ func (dw *DiskWriter) HandleChange(kind ChangeKind, p 
  
  	stat, ok := fi.Sys().(*types.Stat)
  	if !ok {
diff --git sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_hardlinks_go sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_hardlinks_go
index 75a98417263..6653ec01bd6 100644
--- sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_hardlinks_go
+++ sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_hardlinks_go
@@ -1,7 +1,7 @@
 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
+@@ -32,7 +32,7 @@ func (v *Hardlinks) HandleChange(kind ChangeKind, p st
  
  	stat, ok := fi.Sys().(*types.Stat)
  	if !ok {
@@ -10,3 +10,12 @@ Index: vendor/github.com/tonistiigi/fsutil/hardlinks.go
  	}
  
  	if fi.IsDir() || fi.Mode()&os.ModeSymlink != 0 {
+@@ -80,7 +80,7 @@ func (r *hardlinkFilter) Walk(ctx context.Context, tar
+ 
+ 		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"})
+ 		}
+ 
+ 		if stat.Linkname != "" {
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 f9950f1f938..3050cac538d 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
@@ -9,4 +9,4 @@ Index: vendor/github.com/tonistiigi/fsutil/send.go
 +			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{
+ 		stat.Linkname = filepath.ToSlash(stat.Linkname)


-- 
wbr, Kirill