Index | Thread | Search

From:
Kirill A. Korinsky <kirill@korins.ky>
Subject:
sysutils/docker-buildx: update to 0.18.0
To:
OpenBSD ports <ports@openbsd.org>
Cc:
Klemens Nanni <kn@openbsd.org>
Date:
Fri, 01 Nov 2024 19:44:14 +0100

Download raw body.

Thread
ports@,

Here an update for sysutils/docker-buildx to 0.18.0

Tested on -current/amd64.

As usual it requires some polish which was backported to upstream.

ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/docker-buildx/Makefile,v
diff -u -p -r1.6 Makefile
--- Makefile	4 Oct 2024 11:27:55 -0000	1.6
+++ Makefile	1 Nov 2024 18:42:38 -0000
@@ -1,6 +1,6 @@
 COMMENT =		Docker CLI plugin for extended build capabilities
 
-V =			0.17.1
+V =			0.18.0
 GH_ACCOUNT =		docker
 GH_PROJECT =		buildx
 GH_TAGNAME =		v${V}
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/docker-buildx/distinfo,v
diff -u -p -r1.5 distinfo
--- distinfo	4 Oct 2024 11:27:55 -0000	1.5
+++ distinfo	1 Nov 2024 18:42:38 -0000
@@ -1,2 +1,2 @@
-SHA256 (buildx-0.17.1.tar.gz) = ocgfOGFCkI1JhINvrnW1qjfhkh5xhuyKVIxUvmL+zkM=
-SIZE (buildx-0.17.1.tar.gz) = 11515121
+SHA256 (buildx-0.18.0.tar.gz) = qTXLJxWlBU2RjUDvB83UpkZbIKdV1GYkhxirWf1BwzQ=
+SIZE (buildx-0.18.0.tar.gz) = 11466333
Index: patches/patch-vendor_github_com_tonistiigi_fsutil_copy_copy_openbsd_go
===================================================================
RCS file: patches/patch-vendor_github_com_tonistiigi_fsutil_copy_copy_openbsd_go
diff -N patches/patch-vendor_github_com_tonistiigi_fsutil_copy_copy_openbsd_go
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-vendor_github_com_tonistiigi_fsutil_copy_copy_openbsd_go	1 Nov 2024 18:42:38 -0000
@@ -0,0 +1,44 @@
+https://github.com/docker/buildx/issues/2772
+
+Index: vendor/github.com/tonistiigi/fsutil/copy/copy_openbsd.go
+--- vendor/github.com/tonistiigi/fsutil/copy/copy_openbsd.go.orig
++++ vendor/github.com/tonistiigi/fsutil/copy/copy_openbsd.go
+@@ -0,0 +1,38 @@
++//go:build openbsd
++// +build openbsd
++
++package fs
++
++import (
++	"io"
++	"os"
++
++	"github.com/pkg/errors"
++	"golang.org/x/sys/unix"
++)
++
++func copyFile(source, target string) error {
++	src, err := os.Open(source)
++	if err != nil {
++		return errors.Wrapf(err, "failed to open source %s", source)
++	}
++	defer src.Close()
++	tgt, err := os.Create(target)
++	if err != nil {
++		return errors.Wrapf(err, "failed to open target %s", target)
++	}
++	defer tgt.Close()
++
++	return copyFileContent(tgt, src)
++}
++
++func copyFileContent(dst, src *os.File) error {
++	buf := bufferPool.Get().(*[]byte)
++	_, err := io.CopyBuffer(dst, src, *buf)
++	bufferPool.Put(buf)
++	return err
++}
++
++func mknod(dst string, mode uint32, rDev int) error {
++	return unix.Mknod(dst, uint32(mode), rDev)
++}
Index: patches/patch-vendor_github_com_tonistiigi_fsutil_copy_copy_unix_go
===================================================================
RCS file: patches/patch-vendor_github_com_tonistiigi_fsutil_copy_copy_unix_go
diff -N patches/patch-vendor_github_com_tonistiigi_fsutil_copy_copy_unix_go
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-vendor_github_com_tonistiigi_fsutil_copy_copy_unix_go	1 Nov 2024 18:42:38 -0000
@@ -0,0 +1,13 @@
+https://github.com/docker/buildx/issues/2772
+
+Index: vendor/github.com/tonistiigi/fsutil/copy/copy_unix.go
+--- vendor/github.com/tonistiigi/fsutil/copy/copy_unix.go.orig
++++ vendor/github.com/tonistiigi/fsutil/copy/copy_unix.go
+@@ -1,5 +1,5 @@
+-//go:build solaris || darwin || freebsd
+-// +build solaris darwin freebsd
++//go:build solaris || darwin || freebsd || openbsd
++// +build solaris darwin freebsd openbsd
+ 
+ package fs
+ 
Index: patches/patch-vendor_github_com_tonistiigi_fsutil_copy_stat_bsd_go
===================================================================
RCS file: patches/patch-vendor_github_com_tonistiigi_fsutil_copy_stat_bsd_go
diff -N patches/patch-vendor_github_com_tonistiigi_fsutil_copy_stat_bsd_go
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-vendor_github_com_tonistiigi_fsutil_copy_stat_bsd_go	1 Nov 2024 18:42:38 -0000
@@ -0,0 +1,11 @@
+https://github.com/docker/buildx/issues/2772
+
+Index: vendor/github.com/tonistiigi/fsutil/copy/stat_bsd.go
+--- vendor/github.com/tonistiigi/fsutil/copy/stat_bsd.go.orig
++++ vendor/github.com/tonistiigi/fsutil/copy/stat_bsd.go
+@@ -1,4 +1,4 @@
+-// +build darwin freebsd netbsd openbsd
++// +build darwin freebsd netbsd
+ 
+ package fs
+ 
Index: patches/patch-vendor_github_com_tonistiigi_fsutil_copy_stat_openbsd_go
===================================================================
RCS file: patches/patch-vendor_github_com_tonistiigi_fsutil_copy_stat_openbsd_go
diff -N patches/patch-vendor_github_com_tonistiigi_fsutil_copy_stat_openbsd_go
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-vendor_github_com_tonistiigi_fsutil_copy_stat_openbsd_go	1 Nov 2024 18:42:38 -0000
@@ -0,0 +1,23 @@
+https://github.com/docker/buildx/issues/2772
+
+Index: vendor/github.com/tonistiigi/fsutil/copy/stat_openbsd.go
+--- vendor/github.com/tonistiigi/fsutil/copy/stat_openbsd.go.orig
++++ vendor/github.com/tonistiigi/fsutil/copy/stat_openbsd.go
+@@ -0,0 +1,17 @@
++// +build openbsd
++
++package fs
++
++import (
++	"syscall"
++)
++
++// Returns the last-accessed time
++func StatAtime(st *syscall.Stat_t) syscall.Timespec {
++	return st.Atim
++}
++
++// Returns the last-modified time
++func StatMtime(st *syscall.Stat_t) syscall.Timespec {
++	return st.Mtim
++}


-- 
wbr, Kirill