pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

docker-cli: Update to 20.10.21



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sat Nov 19 21:04:43 2022 +0100
Changeset:	5ce674fabfb638e0e596325ae69bc63caddbceb5

Modified Files:
	docker-cli/Makefile
	docker-cli/distinfo
	docker-cli/patches/patch-vendor_github.com_docker_docker_pkg_system_rm.go
Added Files:
	docker-cli/patches/patch-vendor_github.com_moby_sys_mount_flags__unix.go
	docker-cli/patches/patch-vendor_github.com_moby_sys_mount_mount__unix.go

Log Message:
docker-cli: Update to 20.10.21

pkgsrc changes:
 - Populate version

Changes:
No changelog available.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5ce674fabfb638e0e596325ae69bc63caddbceb5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 docker-cli/Makefile                                        |  9 ++++++++-
 docker-cli/distinfo                                        | 10 ++++++----
 .../patch-vendor_github.com_docker_docker_pkg_system_rm.go |  6 ++++--
 .../patch-vendor_github.com_moby_sys_mount_flags__unix.go  | 14 ++++++++++++++
 .../patch-vendor_github.com_moby_sys_mount_mount__unix.go  | 14 ++++++++++++++
 5 files changed, 46 insertions(+), 7 deletions(-)

diffs:
diff --git a/docker-cli/Makefile b/docker-cli/Makefile
index e12b206857..e652e3fb6d 100644
--- a/docker-cli/Makefile
+++ b/docker-cli/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	docker-cli-20.10.17
+DISTNAME=	docker-cli-20.10.21
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=docker/}
 GITHUB_PROJECT=	cli
@@ -14,6 +14,13 @@ LICENSE=	apache-2.0
 GO_DIST_BASE=	cli-${PKGVERSION_NOREV}
 GO_SRCPATH=	github.com/docker/cli
 
+GO_BUILD_PATTERN+=	-ldflags ' \
+			-X github.com/docker/cli/cli/version.Version=${PKGVERSION_NOREV} \
+			-X github.com/docker/cli/cli/version.GitCommit= \
+			-X github.com/docker/cli/cli/version.BuildTime= \
+			-X github.com/docker/cli/cli/version.PlatformName='
+GO_BUILD_PATTERN+=	${GO_SRCPATH}/...
+
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
 SUBST_MESSAGE.paths=	Honor plugins under PREFIX
diff --git a/docker-cli/distinfo b/docker-cli/distinfo
index 55a1d21ac1..56fbd05f12 100644
--- a/docker-cli/distinfo
+++ b/docker-cli/distinfo
@@ -1,7 +1,9 @@
 $NetBSD$
 
-BLAKE2s (docker-cli-20.10.17.tar.gz) = 400a98a6bcfa0671be9d0bf22b0658fde30b048ffffbd61ecd7736bf357ec034
-SHA512 (docker-cli-20.10.17.tar.gz) = 9c2cff7e248272e234eac9febdfd7c5c844fc65ee4b08fd4ce0f526e4fed33f2d12682d0991ef28b42977b9de2c84d7ef9c6ddd6f31c4e8c34a3985c1cea3316
-Size (docker-cli-20.10.17.tar.gz) = 7636087 bytes
+BLAKE2s (docker-cli-20.10.21.tar.gz) = fa7a3d96c553dc6ed6aa93c695ee679988a89a8fe5204b04ff956c79bdfeb41a
+SHA512 (docker-cli-20.10.21.tar.gz) = 951100d75c833e1c844203fe86d73d25c3164eba4fce87cc05a0ac3691851fc5341c3b32ce3814dd61bd3700d8e8e1d045a7a5651c6dc5ddc0a39c58db9bd7b3
+Size (docker-cli-20.10.21.tar.gz) = 7633967 bytes
 SHA1 (patch-cli-plugins_manager_manager__unix.go) = 2d17cd8c7dc958e14d23cef6e619c4d798cad5a7
-SHA1 (patch-vendor_github.com_docker_docker_pkg_system_rm.go) = b9b220f90afdead624184b4121e25b80d27c4420
+SHA1 (patch-vendor_github.com_docker_docker_pkg_system_rm.go) = 1454da2929e6d3f652d13c22b8749e8228860e3b
+SHA1 (patch-vendor_github.com_moby_sys_mount_flags__unix.go) = 6ccfaaf4d229737cb8548108fb8d21e23007bcea
+SHA1 (patch-vendor_github.com_moby_sys_mount_mount__unix.go) = cd46a687646f65b57b9eb88eca497718e00a6dcf
diff --git a/docker-cli/patches/patch-vendor_github.com_docker_docker_pkg_system_rm.go b/docker-cli/patches/patch-vendor_github.com_docker_docker_pkg_system_rm.go
index be453f6e1c..75a19a9379 100644
--- a/docker-cli/patches/patch-vendor_github.com_docker_docker_pkg_system_rm.go
+++ b/docker-cli/patches/patch-vendor_github.com_docker_docker_pkg_system_rm.go
@@ -4,10 +4,12 @@ Fix build for NetBSD.
 
 github.com/moby/sys/mount needs to be ported on NetBSD.
 
---- vendor/github.com/docker/docker/pkg/system/rm.go.orig	2020-12-15 02:27:14.000000000 +0000
+--- vendor/github.com/docker/docker/pkg/system/rm.go.orig	2022-10-25 17:53:02.000000000 +0000
 +++ vendor/github.com/docker/docker/pkg/system/rm.go
-@@ -1,4 +1,4 @@
+@@ -1,5 +1,5 @@
+-//go:build !darwin && !windows
 -// +build !darwin,!windows
++//go:build !darwin && !netbsd && !windows
 +// +build !darwin,!netbsd,!windows
  
  package system // import "github.com/docker/docker/pkg/system"
diff --git a/docker-cli/patches/patch-vendor_github.com_moby_sys_mount_flags__unix.go b/docker-cli/patches/patch-vendor_github.com_moby_sys_mount_flags__unix.go
new file mode 100644
index 0000000000..8ebd99bc00
--- /dev/null
+++ b/docker-cli/patches/patch-vendor_github.com_moby_sys_mount_flags__unix.go
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Fix build for NetBSD.
+
+github.com/moby/sys/mount needs to be ported on NetBSD.
+
+--- vendor/github.com/moby/sys/mount/flags_unix.go.orig	2022-10-25 17:53:02.000000000 +0000
++++ vendor/github.com/moby/sys/mount/flags_unix.go
+@@ -1,4 +1,4 @@
+-// +build !darwin,!windows
++// +build !darwin,!netbsd,!windows
+ 
+ package mount
+ 
diff --git a/docker-cli/patches/patch-vendor_github.com_moby_sys_mount_mount__unix.go b/docker-cli/patches/patch-vendor_github.com_moby_sys_mount_mount__unix.go
new file mode 100644
index 0000000000..d76e06d50e
--- /dev/null
+++ b/docker-cli/patches/patch-vendor_github.com_moby_sys_mount_mount__unix.go
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Fix build for NetBSD.
+
+github.com/moby/sys/mount needs to be ported on NetBSD.
+
+--- vendor/github.com/moby/sys/mount/mount_unix.go.orig	2022-10-25 17:53:02.000000000 +0000
++++ vendor/github.com/moby/sys/mount/mount_unix.go
+@@ -1,4 +1,4 @@
+-// +build !darwin,!windows
++// +build !darwin,!netbsd,!windows
+ 
+ package mount
+ 


Home | Main Index | Thread Index | Old Index