Index | Thread | Search

From:
Kirill A. Korinsky <kirill@korins.ky>
Subject:
[maintainer update] sysutils/docker-buildx: update to
To:
OpenBSD ports <ports@openbsd.org>
Date:
Thu, 15 Aug 2024 19:49:00 +0200

Download raw body.

Thread
ports@,

Here an update for sysutils/docker-buildx.

Changelog for missed releases available on github:
 - https://github.com/docker/buildx/releases/tag/v0.16.0
 - https://github.com/docker/buildx/releases/tag/v0.16.1
 - https://github.com/docker/buildx/releases/tag/v0.16.2

Thus, go-1.23 allows to nuke all patches. Now this port is qutie trivial.

Tested on -current/amd64.

The diff:

diff --git sysutils/docker-buildx/Makefile sysutils/docker-buildx/Makefile
index 2c0cc0be51f..c3fc0eb3273 100644
--- sysutils/docker-buildx/Makefile
+++ sysutils/docker-buildx/Makefile
@@ -1,13 +1,11 @@
 COMMENT =		Docker CLI plugin for extended build capabilities
 
-V =			0.15.1
+V =			0.16.2
 GH_ACCOUNT =		docker
 GH_PROJECT =		buildx
 GH_TAGNAME =		v${V}
 PKGNAME =		docker-${DISTNAME}
 
-REVISION =		0
-
 CATEGORIES =		sysutils
 
 HOMEPAGE =		https://github.com/docker/buildx
diff --git sysutils/docker-buildx/distinfo sysutils/docker-buildx/distinfo
index bf2f5cbd08e..db4a94e0c45 100644
--- sysutils/docker-buildx/distinfo
+++ sysutils/docker-buildx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (buildx-0.15.1.tar.gz) = r4pnM7Fmx7dnY0jnVTsauqnmK0FoJ/G+eQqP5+whyKk=
-SIZE (buildx-0.15.1.tar.gz) = 11353370
+SHA256 (buildx-0.16.2.tar.gz) = 8xRjV2Xz3F7+CJJEKAzSSld+g9M5/sGXD+0Wl3vyg4I=
+SIZE (buildx-0.16.2.tar.gz) = 11489714
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
deleted file mode 100644
index 215c660a58c..00000000000
--- sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_diskwriter_go
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: vendor/github.com/tonistiigi/fsutil/diskwriter.go
---- vendor/github.com/tonistiigi/fsutil/diskwriter.go.orig
-+++ vendor/github.com/tonistiigi/fsutil/diskwriter.go
-@@ -123,7 +123,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 sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_filter_go sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_filter_go
deleted file mode 100644
index 03b8cdf9446..00000000000
--- sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_filter_go
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index e85c7f5e8eb..00000000000
--- sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_followlinks_go
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index d3b230d1e7b..00000000000
--- sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_fs_go
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: vendor/github.com/tonistiigi/fsutil/fs.go
---- vendor/github.com/tonistiigi/fsutil/fs.go.orig
-+++ vendor/github.com/tonistiigi/fsutil/fs.go
-@@ -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"})
-+				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 sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_hardlinks_go sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_hardlinks_go
deleted file mode 100644
index 6653ec01bd6..00000000000
--- sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_hardlinks_go
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: vendor/github.com/tonistiigi/fsutil/hardlinks.go
---- vendor/github.com/tonistiigi/fsutil/hardlinks.go.orig
-+++ vendor/github.com/tonistiigi/fsutil/hardlinks.go
-@@ -32,7 +32,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 {
-@@ -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
deleted file mode 100644
index 3050cac538d..00000000000
--- sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_send_go
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: vendor/github.com/tonistiigi/fsutil/send.go
---- vendor/github.com/tonistiigi/fsutil/send.go.orig
-+++ vendor/github.com/tonistiigi/fsutil/send.go
-@@ -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)
- 		stat.Linkname = filepath.ToSlash(stat.Linkname)
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
deleted file mode 100644
index 233d5667289..00000000000
--- sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_tarwriter_go
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: vendor/github.com/tonistiigi/fsutil/tarwriter.go
---- vendor/github.com/tonistiigi/fsutil/tarwriter.go.orig
-+++ vendor/github.com/tonistiigi/fsutil/tarwriter.go
-@@ -26,7 +26,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 {


-- 
wbr, Kirill