Index: head/sysutils/nomad/Makefile =================================================================== --- head/sysutils/nomad/Makefile (revision 543276) +++ head/sysutils/nomad/Makefile (revision 543277) @@ -1,34 +1,34 @@ # $FreeBSD$ PORTNAME= nomad DISTVERSIONPREFIX= v -DISTVERSION= 0.11.3 +DISTVERSION= 0.12.1 CATEGORIES= sysutils MAINTAINER= jhixson@FreeBSD.org COMMENT= Cluster manager and scheduler LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= On i386: go compiler crashes: https://github.com/golang/go/issues/23763 USES= go USE_GITHUB= yes GH_ACCOUNT= hashicorp GH_SUBDIR= src/github.com/hashicorp/nomad USE_RC_SUBR= nomad GO_BUILDFLAGS= -tags ui \ -ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" USERS= nomad GROUPS= nomad post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/nomad ${INSTALL_DATA} ${WRKSRC}/dist/client.hcl ${STAGEDIR}${PREFIX}/etc/nomad/client.hcl.sample ${INSTALL_DATA} ${WRKSRC}/dist/server.hcl ${STAGEDIR}${PREFIX}/etc/nomad/server.hcl.sample .include Index: head/sysutils/nomad/distinfo =================================================================== --- head/sysutils/nomad/distinfo (revision 543276) +++ head/sysutils/nomad/distinfo (revision 543277) @@ -1,3 +1,3 @@ -TIMESTAMP = 1591646478 -SHA256 (hashicorp-nomad-v0.11.3_GH0.tar.gz) = 4ac797fd87a9e24a99e45a5dae91dd1064ab90a9da180ee2d0914a6ded4d3272 -SIZE (hashicorp-nomad-v0.11.3_GH0.tar.gz) = 53230128 +TIMESTAMP = 1595616407 +SHA256 (hashicorp-nomad-v0.12.1_GH0.tar.gz) = 02f7b2319d5ab7bab644f51de1c248e534498aefe50bf26291a888a99d993359 +SIZE (hashicorp-nomad-v0.12.1_GH0.tar.gz) = 51227967 Index: head/sysutils/nomad/files/patch-vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go =================================================================== --- head/sysutils/nomad/files/patch-vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go (revision 543276) +++ head/sysutils/nomad/files/patch-vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go (nonexistent) @@ -1,11 +0,0 @@ ---- vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go.orig 2019-04-09 15:51:37 UTC -+++ vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go -@@ -37,7 +37,7 @@ func parseMountTable(filter FilterFunc) ([]*Info, erro - - if filter != nil { - // filter out entries we're not interested in -- skip, stop = filter(p) -+ //skip, stop = filter(p) - if skip { - continue - } Property changes on: head/sysutils/nomad/files/patch-vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/nomad/files/patch-command_agent_host_freebsd.go =================================================================== --- head/sysutils/nomad/files/patch-command_agent_host_freebsd.go (nonexistent) +++ head/sysutils/nomad/files/patch-command_agent_host_freebsd.go (revision 543277) @@ -0,0 +1,53 @@ +--- command/agent/host/freebsd.go.orig 2020-07-24 18:38:57 UTC ++++ command/agent/host/freebsd.go +@@ -0,0 +1,50 @@ ++// +build freebsd ++ ++package host ++ ++import ( ++ "syscall" ++) ++ ++func IntToString(orig []int8) string { ++ ret := make([]byte, len(orig)) ++ size := -1 ++ for i, o := range orig { ++ if o == 0 { ++ size = i ++ break ++ } ++ ret[i] = byte(o) ++ } ++ if size == -1 { ++ size = len(orig) ++ } ++ ++ return string(ret[0:size]) ++} ++ ++// mountedPaths produces a list of mounts ++func mountedPaths() []string { ++ var paths []string ++ ++ n, err := syscall.Getfsstat(nil, 1) ++ if err != nil { ++ return []string{err.Error()} ++ } ++ ++ data := make([]syscall.Statfs_t, n) ++ _, err = syscall.Getfsstat(data, 1) ++ if err != nil { ++ return []string{err.Error()} ++ } ++ ++ empty := syscall.Statfs_t{} ++ for _, stat := range data { ++ if stat == empty { ++ return []string{"empy stat struct returned"} ++ } ++ paths = append(paths, IntToString(stat.Mntonname[:])) ++ } ++ ++ return paths ++} Property changes on: head/sysutils/nomad/files/patch-command_agent_host_freebsd.go ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/nomad/files/patch-command_agent_host_unix.go =================================================================== --- head/sysutils/nomad/files/patch-command_agent_host_unix.go (nonexistent) +++ head/sysutils/nomad/files/patch-command_agent_host_unix.go (revision 543277) @@ -0,0 +1,9 @@ +--- command/agent/host/unix.go.orig 2020-07-08 22:29:33 UTC ++++ command/agent/host/unix.go +@@ -64,5 +64,5 @@ func (d *df) total() uint64 { + } + + func (d *df) available() uint64 { +- return d.s.Bavail * uint64(d.s.Bsize) ++ return uint64(d.s.Bavail) * uint64(d.s.Bsize) + } Property changes on: head/sysutils/nomad/files/patch-command_agent_host_unix.go ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property