Index | Thread | Search

From:
Kirill A. Korinsky <kirill@korins.ky>
Subject:
sysutils/docker-cli: udpate to 26.0.1
To:
OpenBSD ports <ports@openbsd.org>
Date:
Tue, 23 Apr 2024 22:34:37 +0200

Download raw body.

Thread
  • Kirill A. Korinsky:

    sysutils/docker-cli: udpate to 26.0.1

Greetings,

Here the second patch in series to update docker related ports.

An update of docker-cli which removes our patches because it was merged on
upstream.

Tested on amd64 -curent.

diff --git sysutils/docker-cli/Makefile sysutils/docker-cli/Makefile
index fd7fcfc9a43..950dfc66118 100644
--- sysutils/docker-cli/Makefile
+++ sysutils/docker-cli/Makefile
@@ -1,6 +1,6 @@
 COMMENT =		command-line tool for controlling Docker
 
-V =			25.0.3
+V =			26.0.1
 
 GH_ACCOUNT =		docker
 GH_PROJECT =		cli
diff --git sysutils/docker-cli/distinfo sysutils/docker-cli/distinfo
index c44c3145741..8ee5ae7c866 100644
--- sysutils/docker-cli/distinfo
+++ sysutils/docker-cli/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cli-25.0.3.tar.gz) = BK0M6pkqZdsgyxsNv20c4yxwXOh53lGyIJX+jSgDCBU=
-SIZE (cli-25.0.3.tar.gz) = 6864551
+SHA256 (cli-26.0.1.tar.gz) = bqGcoqbvjek+egtcyJx08UUmTOv33HFg0+12alHtXoE=
+SIZE (cli-26.0.1.tar.gz) = 6913706
diff --git sysutils/docker-cli/patches/patch-cli-plugins_socket_socket_nodarwin_go sysutils/docker-cli/patches/patch-cli-plugins_socket_socket_nodarwin_go
deleted file mode 100644
index 2adc78d2964..00000000000
--- sysutils/docker-cli/patches/patch-cli-plugins_socket_socket_nodarwin_go
+++ /dev/null
@@ -1,20 +0,0 @@
-Avoid keeping @docker_cli_[UUID] files
-https://github.com/docker/cli/pull/4862
-
-Index: cli-plugins/socket/socket_nodarwin.go
---- cli-plugins/socket/socket_nodarwin.go.orig
-+++ cli-plugins/socket/socket_nodarwin.go
-@@ -1,4 +1,4 @@
--//go:build !darwin
-+//go:build !darwin && !openbsd
- 
- package socket
- 
-@@ -15,5 +15,6 @@ func listen(socketname string) (*net.UnixListener, err
- 
- func onAccept(conn *net.UnixConn, listener *net.UnixListener) {
- 	// do nothing
--	// while on darwin we would unlink here; on non-darwin the socket is abstract and not present on the filesystem
-+	// while on darwin and OpenBSD we would unlink here;
-+	// on non-darwin the socket is abstract and not present on the filesystem
- }
diff --git sysutils/docker-cli/patches/patch-cli-plugins_socket_socket_openbsd_go sysutils/docker-cli/patches/patch-cli-plugins_socket_socket_openbsd_go
deleted file mode 100644
index c6229f2c218..00000000000
--- sysutils/docker-cli/patches/patch-cli-plugins_socket_socket_openbsd_go
+++ /dev/null
@@ -1,26 +0,0 @@
-Avoid keeping @docker_cli_[UUID] files
-https://github.com/docker/cli/pull/4862
-
-Index: cli-plugins/socket/socket_openbsd.go
---- cli-plugins/socket/socket_openbsd.go.orig
-+++ cli-plugins/socket/socket_openbsd.go
-@@ -0,0 +1,19 @@
-+package socket
-+
-+import (
-+	"net"
-+	"os"
-+	"path/filepath"
-+	"syscall"
-+)
-+
-+func listen(socketname string) (*net.UnixListener, error) {
-+	return net.ListenUnix("unix", &net.UnixAddr{
-+		Name: filepath.Join(os.TempDir(), socketname),
-+		Net:  "unix",
-+	})
-+}
-+
-+func onAccept(conn *net.UnixConn, listener *net.UnixListener) {
-+	syscall.Unlink(listener.Addr().String())
-+}

-- 
wbr, Kirill