From nobody Wed Dec 15 04:03:09 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 40B2118DC54C; Wed, 15 Dec 2021 04:03:10 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JDM6P6d0Kz3BmW; Wed, 15 Dec 2021 04:03:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C36BD15886; Wed, 15 Dec 2021 04:03:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BF439FT007466; Wed, 15 Dec 2021 04:03:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BF4392W007465; Wed, 15 Dec 2021 04:03:09 GMT (envelope-from git) Date: Wed, 15 Dec 2021 04:03:09 GMT Message-Id: <202112150403.1BF4392W007465@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: John Hixson Subject: git: 1978b2196c70 - main - sysutils/nomad: fixes for i386 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhixson X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1978b2196c704d785382c8c6cd7f5f22b3db028b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639540989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=StwGC9Naas+/GdKBP4ueqNweyrE6wVn88NXz9VDDegs=; b=EBJmXkc+8OBJgDtB2jIUCxtviXdE3B7St13mJO+GneTiG+4kBkWvwcy4UMYTG88vhMRkxe sLeM30XPa2CRaCeSu02qH8v0fI6BpfS1VFKGUAEaAQBgcqVXnxT6a4GbRlkWVwHkbGJs3p TlPgpbMi65YsYvTI4wlufrjzhdlQ0H+QkdpOfoFgpJidFb9hwn0u/7it8SpUGdu33UYPBD XqAr5EJ/NLLLQi9mkr0Rz6HQA4JJrbYuujR38XS7Z49aa3ovbBHI1+ygF7McaTYZY4fcLV lx7027BlR6HzmClR4sZgQvn+PFVZuF3pI1a8p4v7H1Hcr0bFNTFiTTU47EZUrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639540989; a=rsa-sha256; cv=none; b=xY19VSqxtOvboIZJSIAf4Gjk8CSvqQ3dTR7CRj9BZ+YIyt3IxkYfrVMzg+vZKREVVBwg3A +trE0T3ry5L6xnwPjBTUgarre2+ln/PQs6xzBqv8gkA6tSBT2b5tJRkQo3P/glbeoxkn+j ZkcN7AKfrk/vqaV7jp6QtKwK8Tca7l8+vCg248CdfnqoZMAKV7sYlS9c2+1pznxC107mTH g0RGbOO/dBIEgBmE0MXGfqPNm0vxODy3mSYjZJQT3Twkm86zxUiBlnnMX/XheV41FQ5x5/ B2pQtnpY++PnJbCCO5lL3OpIX8MvuJ7MD86egiay1a2gro223vTcRtQpTmSESg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhixson: URL: https://cgit.FreeBSD.org/ports/commit/?id=1978b2196c704d785382c8c6cd7f5f22b3db028b commit 1978b2196c704d785382c8c6cd7f5f22b3db028b Author: John Hixson AuthorDate: 2021-12-15 04:02:00 +0000 Commit: John Hixson 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)) ++}