From 38531bc015c3f93a3d7612801204e7e98371a29d Mon Sep 17 00:00:00 2001 From: Nikolai Lifanov Date: Mon, 11 Mar 2019 00:53:04 +0000 Subject: [PATCH] unbreak update sysutils/docker to 18.09.3 Changelog: https://github.com/docker/docker-ce/releases/tag/v18.09.3 PR: 236319 Submitted by: Dmitri Goutnik --- sysutils/docker/Makefile | 4 +--- sysutils/docker/distinfo | 6 +++--- ...r_github.com_tonistiigi_fsutil_diskwriter__unix.go | 11 +++++++++++ 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_diskwriter__unix.go diff --git a/sysutils/docker/Makefile b/sysutils/docker/Makefile index 0c095f37d13e..55a22fb52276 100644 --- a/sysutils/docker/Makefile +++ b/sysutils/docker/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= docker -PORTVERSION= 18.09.1 +PORTVERSION= 18.09.3 DISTVERSIONPREFIX= v CATEGORIES= sysutils @@ -11,8 +11,6 @@ COMMENT= Open-source application container engine LICENSE= APACHE20 -BROKEN= fails to build - PLIST_FILES= bin/docker USE_GITHUB= yes diff --git a/sysutils/docker/distinfo b/sysutils/docker/distinfo index afda369a0e4c..fe2a1aefd51b 100644 --- a/sysutils/docker/distinfo +++ b/sysutils/docker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549036632 -SHA256 (docker-docker-ce-v18.09.1_GH0.tar.gz) = 9eadb1eae1954b0322aadf6505f5397d1b1eccf6395ab511cadf8e6975cfc576 -SIZE (docker-docker-ce-v18.09.1_GH0.tar.gz) = 15247155 +TIMESTAMP = 1551876470 +SHA256 (docker-docker-ce-v18.09.3_GH0.tar.gz) = 28d01bbbba45b289027e963d0a5dc830a81b5dab9339a950a4c2505e1ee9a255 +SIZE (docker-docker-ce-v18.09.3_GH0.tar.gz) = 15249718 diff --git a/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_diskwriter__unix.go b/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_diskwriter__unix.go new file mode 100644 index 000000000000..648a6934a0b1 --- /dev/null +++ b/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_diskwriter__unix.go @@ -0,0 +1,11 @@ +--- components/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go.orig 2019-03-06 12:30:35 UTC ++++ components/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go +@@ -45,7 +45,7 @@ func handleTarTypeBlockCharFifo(path str + mode |= syscall.S_IFBLK + } + +- if err := syscall.Mknod(path, mode, int(mkdev(stat.Devmajor, stat.Devminor))); err != nil { ++ if err := syscall.Mknod(path, mode, uint64(mkdev(stat.Devmajor, stat.Devminor))); err != nil { + return err + } + return nil