Date: Wed, 13 Mar 2019 14:21:26 +0000 (UTC) From: =?UTF-8?Q?Jean-S=c3=a9bastien_P=c3=a9dron?= <dumbbell@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495576 - head/net/concourse-fly/files Message-ID: <201903131421.x2DELQt1037002@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dumbbell Date: Wed Mar 13 14:21:26 2019 New Revision: 495576 URL: https://svnweb.freebsd.org/changeset/ports/495576 Log: net/concourse-fly: Fix build with Go 1.12 The patch comes from upstream. Obtained from: https://github.com/concourse/go-archive/pull/3 Sponsored by: Pivotal Software, Inc. Added: head/net/concourse-fly/files/ head/net/concourse-fly/files/patch-src_github.com_concourse_go-archive_tarfs_mknod.go (contents, props changed) head/net/concourse-fly/files/patch-src_github.com_concourse_go-archive_tarfs_mknod__freebsd.go (contents, props changed) Added: head/net/concourse-fly/files/patch-src_github.com_concourse_go-archive_tarfs_mknod.go ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/concourse-fly/files/patch-src_github.com_concourse_go-archive_tarfs_mknod.go Wed Mar 13 14:21:26 2019 (r495576) @@ -0,0 +1,8 @@ +--- src/github.com/concourse/go-archive/tarfs/mknod.go.orig 2019-03-04 10:29:20 UTC ++++ src/github.com/concourse/go-archive/tarfs/mknod.go +@@ -1,4 +1,4 @@ +-// +build !windows ++// +build !windows,!freebsd + + package tarfs + Added: head/net/concourse-fly/files/patch-src_github.com_concourse_go-archive_tarfs_mknod__freebsd.go ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/concourse-fly/files/patch-src_github.com_concourse_go-archive_tarfs_mknod__freebsd.go Wed Mar 13 14:21:26 2019 (r495576) @@ -0,0 +1,31 @@ +--- src/github.com/concourse/go-archive/tarfs/mknod_freebsd.go.orig 2019-03-13 13:08:01 UTC ++++ src/github.com/concourse/go-archive/tarfs/mknod_freebsd.go +@@ -0,0 +1,28 @@ ++// +build freebsd ++ ++package tarfs ++ ++import ( ++ "archive/tar" ++ "syscall" ++ ++ "golang.org/x/sys/unix" ++) ++ ++func mknodEntry(hdr *tar.Header, path string) error { ++ mode := uint32(hdr.Mode & 07777) ++ switch hdr.Typeflag { ++ case tar.TypeBlock: ++ mode |= unix.S_IFBLK ++ case tar.TypeChar: ++ mode |= unix.S_IFCHR ++ case tar.TypeFifo: ++ mode |= unix.S_IFIFO ++ } ++ ++ return syscall.Mknod(path, mode, uint64(mkdev(hdr.Devmajor, hdr.Devminor))) ++} ++ ++func mkdev(major, minor int64) uint32 { ++ return uint32(((minor & 0xfff00) << 12) | ((major & 0xfff) << 8) | (minor & 0xff)) ++}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903131421.x2DELQt1037002>