Greetings,
Here the last patch in series to update docker related ports.
This patch for docker-compose requires near the same adjustemnt for patches,
I also open a feature request for upstream to avoid future making of archive
which contains missed vendor folder.
Tested on amd64 -current.
diff --git sysutils/docker-compose/Makefile sysutils/docker-compose/Makefile
index 5b270f342dc..dd94db08f3e 100644
--- sysutils/docker-compose/Makefile
+++ sysutils/docker-compose/Makefile
@@ -1,6 +1,6 @@
COMMENT = Define and run multi-container applications with Docker
-V = 2.24.5
+V = 2.26.1
GH_ACCOUNT = docker
GH_PROJECT = compose
GH_TAGNAME = v${V}
@@ -34,7 +34,9 @@ do-install:
${INSTALL_PROGRAM} ${MODGO_WORKSPACE}/bin/cmd \
${PREFIX}/libexec/docker/cli-plugins/docker-compose
-vendor: patch
+# Should be removed when upstream add vendors
+# See: https://github.com/docker/compose/issues/11760
+vendor: extract
cd ${WRKDIR}/compose-$V; \
go mod tidy; \
go mod vendor; \
diff --git sysutils/docker-compose/distinfo sysutils/docker-compose/distinfo
index bf08d4cfe3a..2af79e08cbe 100644
--- sysutils/docker-compose/distinfo
+++ sysutils/docker-compose/distinfo
@@ -1,4 +1,4 @@
-SHA256 (compose-2.24.5.tar.gz) = FgxXVljN1lg26jE4u2M391h332y62OLUv03c+FDO44I=
-SHA256 (docker-compose-vendor-2.24.5.tar.gz) =
nJHZBoh4ziYIHYpvUBAjCektpRGVZHogahnNIpYlVXo=
-SIZE (compose-2.24.5.tar.gz) = 344937
-SIZE (docker-compose-vendor-2.24.5.tar.gz) = 10428955
+SHA256 (compose-2.26.1.tar.gz) = CBrUAkH44UTK0IimXm/Q7FiOPTaTHluquz3FqwaM62A=
+SHA256 (docker-compose-vendor-2.26.1.tar.gz) =
PRbgo4mYSV8BVG9dyAMlZd1i4d0aEquednvzUJPPxBc=
+SIZE (compose-2.26.1.tar.gz) = 361194
+SIZE (docker-compose-vendor-2.26.1.tar.gz) = 11085547
diff --git
sysutils/docker-compose/patches/patch-vendor_github_com_tonistiigi_fsutil_filter_go
sysutils/docker-compose/patches/patch-vendor_github_com_tonistiigi_fsutil_filter_go
new file mode 100644
index 00000000000..03b8cdf9446
--- /dev/null
+++
sysutils/docker-compose/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-compose/patches/patch-vendor_github_com_tonistiigi_fsutil_followlinks_go
sysutils/docker-compose/patches/patch-vendor_github_com_tonistiigi_fsutil_followlinks_go
new file mode 100644
index 00000000000..e85c7f5e8eb
--- /dev/null
+++
sysutils/docker-compose/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-compose/patches/patch-vendor_github_com_tonistiigi_fsutil_fs_go
sysutils/docker-compose/patches/patch-vendor_github_com_tonistiigi_fsutil_fs_go
index 698ed4b63be..d3b230d1e7b 100644
---
sysutils/docker-compose/patches/patch-vendor_github_com_tonistiigi_fsutil_fs_go
+++
sysutils/docker-compose/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-compose/patches/patch-vendor_github_com_tonistiigi_fsutil_send_go
sysutils/docker-compose/patches/patch-vendor_github_com_tonistiigi_fsutil_send_go
index 38f6bad6800..f9950f1f938 100644
---
sysutils/docker-compose/patches/patch-vendor_github_com_tonistiigi_fsutil_send_go
+++
sysutils/docker-compose/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-compose/patches/patch-vendor_github_com_tonistiigi_fsutil_tarwriter_go
sysutils/docker-compose/patches/patch-vendor_github_com_tonistiigi_fsutil_tarwriter_go
index 795cbf6d790..233d5667289 100644
---
sysutils/docker-compose/patches/patch-vendor_github_com_tonistiigi_fsutil_tarwriter_go
+++
sysutils/docker-compose/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
