From owner-svn-ports-all@freebsd.org Fri Jul 24 18:51:15 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 922A236FD06; Fri, 24 Jul 2020 18:51:15 +0000 (UTC) (envelope-from jhixson@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BCyw33Phlz3ypD; Fri, 24 Jul 2020 18:51:15 +0000 (UTC) (envelope-from jhixson@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 58242ED4B; Fri, 24 Jul 2020 18:51:15 +0000 (UTC) (envelope-from jhixson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06OIpFaV026075; Fri, 24 Jul 2020 18:51:15 GMT (envelope-from jhixson@FreeBSD.org) Received: (from jhixson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06OIpEWK026071; Fri, 24 Jul 2020 18:51:14 GMT (envelope-from jhixson@FreeBSD.org) Message-Id: <202007241851.06OIpEWK026071@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhixson set sender to jhixson@FreeBSD.org using -f From: John Hixson Date: Fri, 24 Jul 2020 18:51:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r543277 - in head/sysutils/nomad: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jhixson X-SVN-Commit-Paths: in head/sysutils/nomad: . files X-SVN-Commit-Revision: 543277 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jul 2020 18:51:15 -0000 Author: jhixson Date: Fri Jul 24 18:51:14 2020 New Revision: 543277 URL: https://svnweb.freebsd.org/changeset/ports/543277 Log: sysutils/nomad: update to version 0.12.1 Added: head/sysutils/nomad/files/patch-command_agent_host_freebsd.go (contents, props changed) head/sysutils/nomad/files/patch-command_agent_host_unix.go (contents, props changed) Deleted: head/sysutils/nomad/files/patch-vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go Modified: head/sysutils/nomad/Makefile head/sysutils/nomad/distinfo Modified: head/sysutils/nomad/Makefile ============================================================================== --- head/sysutils/nomad/Makefile Fri Jul 24 18:13:30 2020 (r543276) +++ head/sysutils/nomad/Makefile Fri Jul 24 18:51:14 2020 (r543277) @@ -2,7 +2,7 @@ PORTNAME= nomad DISTVERSIONPREFIX= v -DISTVERSION= 0.11.3 +DISTVERSION= 0.12.1 CATEGORIES= sysutils MAINTAINER= jhixson@FreeBSD.org Modified: head/sysutils/nomad/distinfo ============================================================================== --- head/sysutils/nomad/distinfo Fri Jul 24 18:13:30 2020 (r543276) +++ head/sysutils/nomad/distinfo Fri Jul 24 18:51:14 2020 (r543277) @@ -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 Added: head/sysutils/nomad/files/patch-command_agent_host_freebsd.go ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/nomad/files/patch-command_agent_host_freebsd.go Fri Jul 24 18:51:14 2020 (r543277) @@ -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 ++} Added: head/sysutils/nomad/files/patch-command_agent_host_unix.go ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/nomad/files/patch-command_agent_host_unix.go Fri Jul 24 18:51:14 2020 (r543277) @@ -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) + }