pkgsrc-WIP-changes archive

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

docker-cli: Update to 20.10.1



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Mon Dec 28 12:28:12 2020 +0100
Changeset:	39f009a594ff5ad2c32ed2d51d2dbdd0e48c975d

Modified Files:
	docker-cli/Makefile
	docker-cli/distinfo
Added Files:
	docker-cli/patches/patch-vendor_github.com_moby_sys_mount_flags__bsd.go

Log Message:
docker-cli: Update to 20.10.1

pkgsrc changes:
 - Simplify handling of GITHUB_*/DISTNAME/PKGNAME/GO_DIST_BASE to make it easier
   to follow

Changes:
20.10.1
=======
Builder
-------
 - buildkit: updated to v0.8.1 with various bugfixes moby/moby#41793

Packaging
---------
 - Revert a change in the systemd unit that could prevent docker from
   starting due to a startup order conflict docker/docker-ce-packaging#514
 - buildx updated to v0.5.0 docker/docker-ce-packaging#515

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

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

diffstat:
 docker-cli/Makefile                                  | 20 +++++++++-----------
 docker-cli/distinfo                                  |  9 +++++----
 ...ch-vendor_github.com_moby_sys_mount_flags__bsd.go | 12 ++++++++++++
 3 files changed, 26 insertions(+), 15 deletions(-)

diffs:
diff --git a/docker-cli/Makefile b/docker-cli/Makefile
index f49278a507..c3a10d5954 100644
--- a/docker-cli/Makefile
+++ b/docker-cli/Makefile
@@ -1,28 +1,26 @@
 # $NetBSD$
 
-GITHUB_PROJECT=	cli
-GITHUB_TAG=	v20.10.0-rc1
-DISTNAME=	v20.10.0-rc1
-PKGNAME=	docker-cli-${DISTNAME:S,^v,,}
+DISTNAME=	docker-cli-20.10.1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=docker/}
-DIST_SUBDIR=	${GITHUB_PROJECT}
+GITHUB_PROJECT=	cli
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	dan%alt.md@localhost
 HOMEPAGE=	https://github.com/docker/cli/
 COMMENT=	Command-line tool for controlling Docker
 LICENSE=	apache-2.0
 
-pre-extract:
-	mkdir -p ${WRKDIR}/src/github.com/docker/cli
+GO_DIST_BASE=	cli-${PKGVERSION_NOREV}
+GO_SRCPATH=	github.com/docker/cli
+
+INSTALLATION_DIRS+=	bin
 
-GO_DIST_BASE=	${GITHUB_PROJECT}-${DISTNAME:S,^v,,}
-GO_SRCPATH=	github.com/docker/cli/
+#pre-extract:
+#	${MKDIR} ${WRKDIR}/src/github.com/docker/cli
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/docker ${DESTDIR}${PREFIX}/bin
 
-INSTALLATION_DIRS+=	bin
-
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/docker-cli/distinfo b/docker-cli/distinfo
index 8f9cde0424..2cbcf914ef 100644
--- a/docker-cli/distinfo
+++ b/docker-cli/distinfo
@@ -1,6 +1,7 @@
 $NetBSD$
 
-SHA1 (cli/v20.10.0-rc1.tar.gz) = a9de25d78db0a874aae7e554f087c47207f5130e
-RMD160 (cli/v20.10.0-rc1.tar.gz) = 9cb15d5e8102162bfd1d56c1b346e9f72b0c3048
-SHA512 (cli/v20.10.0-rc1.tar.gz) = a0602ec6780925df0aefedf1b7f0bb33b0ab97dae5c8d0689ec689c1008b32a200cf9bac216be4c619269cb0d8ad6550d1825a39c8347445d6e2972e72ab7ff7
-Size (cli/v20.10.0-rc1.tar.gz) = 7663899 bytes
+SHA1 (docker-cli-20.10.1.tar.gz) = 475dfcec26cb528894c91c43fba95ec4eb4b3bb6
+RMD160 (docker-cli-20.10.1.tar.gz) = b58ff4ca635356dbc0cd58b25e9fd673e0c06d04
+SHA512 (docker-cli-20.10.1.tar.gz) = 47d15647db2a4ca6de29ba1d67aa198b9baa4af9ccf08e92e2a7222f28391567f8a2f6beeb4d8d80fa16a05ce8902de16b8951da2a34cbed9e27c72e0443c3e8
+Size (docker-cli-20.10.1.tar.gz) = 7705467 bytes
+SHA1 (patch-vendor_github.com_moby_sys_mount_flags__bsd.go) = a3811ff2895193e536951a0d36e1eeff9271fdee
diff --git a/docker-cli/patches/patch-vendor_github.com_moby_sys_mount_flags__bsd.go b/docker-cli/patches/patch-vendor_github.com_moby_sys_mount_flags__bsd.go
new file mode 100644
index 0000000000..04a5260b3d
--- /dev/null
+++ b/docker-cli/patches/patch-vendor_github.com_moby_sys_mount_flags__bsd.go
@@ -0,0 +1,12 @@
+$NetBSD$
+
+Add support for NetBSD.
+
+--- vendor/github.com/moby/sys/mount/flags_bsd.go.orig	2020-12-15 02:27:14.000000000 +0000
++++ vendor/github.com/moby/sys/mount/flags_bsd.go
+@@ -1,4 +1,4 @@
+-// +build freebsd openbsd
++// +build freebsd netbsd openbsd
+ 
+ package mount
+ 


Home | Main Index | Thread Index | Old Index