Index: head/sysutils/nomad/Makefile =================================================================== --- head/sysutils/nomad/Makefile (revision 544824) +++ head/sysutils/nomad/Makefile (revision 544825) @@ -1,34 +1,34 @@ # $FreeBSD$ PORTNAME= nomad DISTVERSIONPREFIX= v -DISTVERSION= 0.12.1 +DISTVERSION= 0.12.2 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 544824) +++ head/sysutils/nomad/distinfo (revision 544825) @@ -1,3 +1,3 @@ -TIMESTAMP = 1595616407 -SHA256 (hashicorp-nomad-v0.12.1_GH0.tar.gz) = 02f7b2319d5ab7bab644f51de1c248e534498aefe50bf26291a888a99d993359 -SIZE (hashicorp-nomad-v0.12.1_GH0.tar.gz) = 51227967 +TIMESTAMP = 1597337553 +SHA256 (hashicorp-nomad-v0.12.2_GH0.tar.gz) = 217cfa38c6894d84082b1fd059d577f4743a77e917f0a4cc61490f7b02ba2a40 +SIZE (hashicorp-nomad-v0.12.2_GH0.tar.gz) = 51424409 Index: head/sysutils/nomad/files/patch-helper_freeport_ephemeral__freebsd__test.go =================================================================== --- head/sysutils/nomad/files/patch-helper_freeport_ephemeral__freebsd__test.go (revision 544824) +++ head/sysutils/nomad/files/patch-helper_freeport_ephemeral__freebsd__test.go (nonexistent) @@ -1,21 +0,0 @@ ---- helper/freeport/ephemeral_freebsd_test.go.orig 2020-04-09 18:14:37 UTC -+++ helper/freeport/ephemeral_freebsd_test.go -@@ -0,0 +1,18 @@ -+//+build freebsd -+ -+package freeport -+ -+import ( -+ "testing" -+) -+ -+func TestGetEphemeralPortRange(t *testing.T) { -+ min, max, err := getEphemeralPortRange() -+ if err != nil { -+ t.Fatalf("err: %v", err) -+ } -+ if min <= 0 || max <= 0 || min > max { -+ t.Fatalf("unexpected values: min=%d, max=%d", min, max) -+ } -+ t.Logf("min=%d, max=%d", min, max) -+} Property changes on: head/sysutils/nomad/files/patch-helper_freeport_ephemeral__freebsd__test.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-helper_freeport_ephemeral__freebsd.go =================================================================== --- head/sysutils/nomad/files/patch-helper_freeport_ephemeral__freebsd.go (revision 544824) +++ head/sysutils/nomad/files/patch-helper_freeport_ephemeral__freebsd.go (nonexistent) @@ -1,49 +0,0 @@ ---- helper/freeport/ephemeral_freebsd.go.orig 2020-04-09 18:14:37 UTC -+++ helper/freeport/ephemeral_freebsd.go -@@ -0,0 +1,46 @@ -+//+build freebsd -+ -+package freeport -+ -+import ( -+ "fmt" -+ "os/exec" -+ "regexp" -+ "strconv" -+) -+ -+/* -+$ sysctl net.inet.ip.portrange.first net.inet.ip.portrange.last -+net.inet.ip.portrange.first: 49152 -+net.inet.ip.portrange.last: 65535 -+*/ -+ -+const ( -+ ephPortFirst = "net.inet.ip.portrange.first" -+ ephPortLast = "net.inet.ip.portrange.last" -+ command = "sysctl" -+) -+ -+var ephPortRe = regexp.MustCompile(`^\s*(\d+)\s+(\d+)\s*$`) -+ -+func getEphemeralPortRange() (int, int, error) { -+ cmd := exec.Command(command, "-n", ephPortFirst, ephPortLast) -+ out, err := cmd.Output() -+ if err != nil { -+ return 0, 0, err -+ } -+ -+ val := string(out) -+ -+ m := ephPortRe.FindStringSubmatch(val) -+ if m != nil { -+ min, err1 := strconv.Atoi(m[1]) -+ max, err2 := strconv.Atoi(m[2]) -+ -+ if err1 == nil && err2 == nil { -+ return min, max, nil -+ } -+ } -+ -+ return 0, 0, fmt.Errorf("unexpected sysctl value %q for keys %q %q", val, ephPortFirst, ephPortLast) -+} Property changes on: head/sysutils/nomad/files/patch-helper_freeport_ephemeral__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