diff --git a/sysutils/nomad/Makefile b/sysutils/nomad/Makefile index 91517c79fe50..40f1df40e7a1 100644 --- a/sysutils/nomad/Makefile +++ b/sysutils/nomad/Makefile @@ -1,47 +1,42 @@ PORTNAME= nomad DISTVERSIONPREFIX= v -DISTVERSION= 1.8.1 -PORTREVISION= 4 +DISTVERSION= 1.9.3 CATEGORIES= sysutils MASTER_SITES= https://raw.githubusercontent.com/hashicorp/nomad/${DISTVERSIONFULL}/ DISTFILES= go.mod \ api/go.mod -PATCH_SITES= https://github.com/hashicorp/nomad/commit/ -PATCHFILES= 2c86fe02834dc17a518d6e485aed66e971f7ed68.patch:-p1 \ - ed748105c9284e7c1d0feec20bb450d1d3c7007d.patch:-p1 - MAINTAINER= jhixson@FreeBSD.org COMMENT= Cluster manager and scheduler WWW= https://www.nomadproject.io/ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cpe go:1.22,modules +USES= cpe go:1.23,modules CPE_VENDOR= hashicorp USE_GITHUB= yes GH_ACCOUNT= hashicorp USE_RC_SUBR= nomad GO_MODULE= github.com/hashicorp/nomad GO_BUILDFLAGS= -tags ui \ -ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" USERS= nomad GROUPS= nomad post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/nomad ${INSTALL_DATA} ${WRKSRC}/demo/vagrant/client1.hcl ${STAGEDIR}${PREFIX}/etc/nomad/client1.hcl.sample ${INSTALL_DATA} ${WRKSRC}/demo/vagrant/client2.hcl ${STAGEDIR}${PREFIX}/etc/nomad/client2.hcl.sample ${INSTALL_DATA} ${WRKSRC}/demo/vagrant/server.hcl ${STAGEDIR}${PREFIX}/etc/nomad/server.hcl.sample # Bring DISTINFO_FILE into scope so we can get the timestamp. .include SOURCE_DATE_EPOCH_CMD= date -ur \ $$(${GREP} -m1 TIMESTAMP ${DISTINFO_FILE} | ${SED} -e 's/[^0-9]//g') \ '+%Y-%m-%dT%H:%M:%SZ' .include diff --git a/sysutils/nomad/distinfo b/sysutils/nomad/distinfo index aeeb2fe7b624..0f16c721d0b2 100644 --- a/sysutils/nomad/distinfo +++ b/sysutils/nomad/distinfo @@ -1,11 +1,7 @@ -TIMESTAMP = 1720895514 -SHA256 (go/sysutils_nomad/hashicorp-nomad-v1.8.1_GH0/go.mod) = 337e0baea6cdf6d1048dad7dd0b001d234bb5bfd6892252c15a2050bf953269e -SIZE (go/sysutils_nomad/hashicorp-nomad-v1.8.1_GH0/go.mod) = 14729 -SHA256 (go/sysutils_nomad/hashicorp-nomad-v1.8.1_GH0/api/go.mod) = fbcc54abdb959be14d0e44d080a001ae030b97170f79ba4bd3bd78d277f053bf -SIZE (go/sysutils_nomad/hashicorp-nomad-v1.8.1_GH0/api/go.mod) = 666 -SHA256 (go/sysutils_nomad/hashicorp-nomad-v1.8.1_GH0/hashicorp-nomad-v1.8.1_GH0.tar.gz) = 4e6c3b97030c0d836180fa636d7c401adac43c0ac0322fd18e4033c679b9b4bb -SIZE (go/sysutils_nomad/hashicorp-nomad-v1.8.1_GH0/hashicorp-nomad-v1.8.1_GH0.tar.gz) = 26295940 -SHA256 (go/sysutils_nomad/hashicorp-nomad-v1.8.1_GH0/2c86fe02834dc17a518d6e485aed66e971f7ed68.patch) = bafd4b3789d1e750203762b6f71beddcf8cbd78a52ce42de403c6473fced7559 -SIZE (go/sysutils_nomad/hashicorp-nomad-v1.8.1_GH0/2c86fe02834dc17a518d6e485aed66e971f7ed68.patch) = 1101 -SHA256 (go/sysutils_nomad/hashicorp-nomad-v1.8.1_GH0/ed748105c9284e7c1d0feec20bb450d1d3c7007d.patch) = d438ef866eeeea66f36c44f0ea3999374b500a5f69ceef4e8c6559db2127a877 -SIZE (go/sysutils_nomad/hashicorp-nomad-v1.8.1_GH0/ed748105c9284e7c1d0feec20bb450d1d3c7007d.patch) = 809 +TIMESTAMP = 1733521209 +SHA256 (go/sysutils_nomad/hashicorp-nomad-v1.9.3_GH0/go.mod) = 9c01e4fed0d76f5fd11802fa72c6634922a34aaee78e20b91b458c065d0f1657 +SIZE (go/sysutils_nomad/hashicorp-nomad-v1.9.3_GH0/go.mod) = 15711 +SHA256 (go/sysutils_nomad/hashicorp-nomad-v1.9.3_GH0/api/go.mod) = fbcc54abdb959be14d0e44d080a001ae030b97170f79ba4bd3bd78d277f053bf +SIZE (go/sysutils_nomad/hashicorp-nomad-v1.9.3_GH0/api/go.mod) = 666 +SHA256 (go/sysutils_nomad/hashicorp-nomad-v1.9.3_GH0/hashicorp-nomad-v1.9.3_GH0.tar.gz) = 7152af6ba624a40c0df5a9425fd47150a00e8cec79dc8716e5b10f31fdd5a9e7 +SIZE (go/sysutils_nomad/hashicorp-nomad-v1.9.3_GH0/hashicorp-nomad-v1.9.3_GH0.tar.gz) = 26414683 diff --git a/sysutils/nomad/files/patch-command_agent_host_unix.go b/sysutils/nomad/files/patch-command_agent_host_unix.go index d4778817b30b..a5cb345a3aff 100644 --- a/sysutils/nomad/files/patch-command_agent_host_unix.go +++ b/sysutils/nomad/files/patch-command_agent_host_unix.go @@ -1,34 +1,34 @@ ---- command/agent/host/unix.go.orig 2024-01-15 16:55:40 UTC +--- command/agent/host/unix.go.orig 2024-11-11 16:35:41 UTC +++ command/agent/host/unix.go @@ -69,31 +69,3 @@ func (d *df) available() uint64 { func (d *df) available() uint64 { return d.usage.Free } - -// mountedPaths produces a list of mounts -func mountedPaths() []string { - partitions, err := disk.Partitions(false) - if err != nil { - return []string{err.Error()} - } - - var paths []string - for _, partition := range partitions { - fsType := partition.Fstype - - switch fsType { - case "autofs", "binfmt_misc", "cgroup", "debugfs", - "devpts", "devtmpfs", - "fusectl", "fuse.lxcfs", - "hugetlbfs", "mqueue", - "procfs", "pstore", "rpc_pipefs", "securityfs", - "sysfs", "tmpfs", "vboxsf", "ptyfs": - continue - default: - } - - paths = append(paths, partition.Mountpoint) - } - - return paths -} diff --git a/sysutils/nomad/files/patch-command_agent_log__file__bsd.go b/sysutils/nomad/files/patch-command_agent_log__file__bsd.go index fd9993c28eed..b3bbbe8963bc 100644 --- a/sysutils/nomad/files/patch-command_agent_log__file__bsd.go +++ b/sysutils/nomad/files/patch-command_agent_log__file__bsd.go @@ -1,12 +1,12 @@ ---- command/agent/log_file_bsd.go.orig 2024-01-15 16:55:40 UTC +--- command/agent/log_file_bsd.go.orig 2024-11-11 16:35:41 UTC +++ command/agent/log_file_bsd.go @@ -1,7 +1,8 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: BUSL-1.1 -//go:build darwin || freebsd || netbsd || openbsd +//go:build !386 && (darwin || freebsd || netbsd || openbsd) +// +build !386 // +build darwin freebsd netbsd openbsd package agent diff --git a/sysutils/nomad/files/patch-vendor_github.com_docker_docker_pkg_system_mknod.go b/sysutils/nomad/files/patch-vendor_github.com_docker_docker_pkg_system_mknod.go deleted file mode 100644 index 9a60ca379564..000000000000 --- a/sysutils/nomad/files/patch-vendor_github.com_docker_docker_pkg_system_mknod.go +++ /dev/null @@ -1,9 +0,0 @@ ---- vendor/github.com/docker/docker/pkg/system/mknod.go 2023-02-03 20:50:38.642086000 -0800 -+++ vendor/github.com/docker/docker/pkg/system/mknod.go.orig 2023-02-03 20:50:27.280880000 -0800 -@@ -13,5 +13,5 @@ - // They are, from low to high: the lower 8 bits of the minor, then 12 bits of the major, - // then the top 12 bits of the minor. - func Mkdev(major int64, minor int64) uint32 { -- return uint32(unix.Mkdev(uint32(major), uint32(minor))) -+ return uint32(unix.Mkdev(uint32(major), uint32(minor))) - }