git: 1978b2196c70 - main - sysutils/nomad: fixes for i386
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 15 Dec 2021 04:03:09 UTC
The branch main has been updated by jhixson:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1978b2196c704d785382c8c6cd7f5f22b3db028b
commit 1978b2196c704d785382c8c6cd7f5f22b3db028b
Author: John Hixson <jhixson@FreeBSD.org>
AuthorDate: 2021-12-15 04:02:00 +0000
Commit: John Hixson <jhixson@FreeBSD.org>
CommitDate: 2021-12-15 04:03:01 +0000
sysutils/nomad: fixes for i386
---
sysutils/nomad/Makefile | 1 +
.../nomad/files/patch-command_agent_host_unix.go | 4 ++--
.../files/patch-command_agent_log__file__bsd.go | 9 +++++++++
.../files/patch-command_agent_log__file__bsd__386.go | 20 ++++++++++++++++++++
4 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/sysutils/nomad/Makefile b/sysutils/nomad/Makefile
index 75a99b00e53e..aaf0295b0aec 100644
--- a/sysutils/nomad/Makefile
+++ b/sysutils/nomad/Makefile
@@ -1,6 +1,7 @@
PORTNAME= nomad
DISTVERSIONPREFIX= v
DISTVERSION= 1.2.2
+PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= jhixson@FreeBSD.org
diff --git a/sysutils/nomad/files/patch-command_agent_host_unix.go b/sysutils/nomad/files/patch-command_agent_host_unix.go
index d03910dbb50b..8cbb37d4ad19 100644
--- a/sysutils/nomad/files/patch-command_agent_host_unix.go
+++ b/sysutils/nomad/files/patch-command_agent_host_unix.go
@@ -1,6 +1,6 @@
---- command/agent/host/unix.go.orig 2020-07-08 22:29:33 UTC
+--- command/agent/host/unix.go.orig 2021-11-24 18:54:06 UTC
+++ command/agent/host/unix.go
-@@ -64,5 +64,5 @@ func (d *df) total() uint64 {
+@@ -65,5 +65,5 @@ func (d *df) total() uint64 {
}
func (d *df) available() uint64 {
diff --git a/sysutils/nomad/files/patch-command_agent_log__file__bsd.go b/sysutils/nomad/files/patch-command_agent_log__file__bsd.go
new file mode 100644
index 000000000000..b7e16aa4cf12
--- /dev/null
+++ b/sysutils/nomad/files/patch-command_agent_log__file__bsd.go
@@ -0,0 +1,9 @@
+--- command/agent/log_file_bsd.go.orig 2021-11-24 18:54:06 UTC
++++ command/agent/log_file_bsd.go
+@@ -1,4 +1,5 @@
+-//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-command_agent_log__file__bsd__386.go b/sysutils/nomad/files/patch-command_agent_log__file__bsd__386.go
new file mode 100644
index 000000000000..eb7de009e9d7
--- /dev/null
+++ b/sysutils/nomad/files/patch-command_agent_log__file__bsd__386.go
@@ -0,0 +1,20 @@
+--- command/agent/log_file_bsd_386.go.orig 2021-12-15 03:59:45 UTC
++++ command/agent/log_file_bsd_386.go
+@@ -0,0 +1,17 @@
++//go:build 386 && (darwin || freebsd || netbsd || openbsd)
++// +build 386
++// +build darwin freebsd netbsd openbsd
++
++package agent
++
++import (
++ "os"
++ "syscall"
++ "time"
++)
++
++func (l *logFile) createTime(stat os.FileInfo) time.Time {
++ stat_t := stat.Sys().(*syscall.Stat_t)
++ createTime := stat_t.Ctimespec
++ return time.Unix(int64(createTime.Sec), int64(createTime.Nsec))
++}