From nobody Sun Jul 17 19:19:52 2022 X-Original-To: dev-commits-ports-main@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 4LmFKN3fbNz4X4n8; Sun, 17 Jul 2022 19:19:52 +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 4LmFKN33Kgz3C6N; Sun, 17 Jul 2022 19:19:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658085592; 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=45W3PzZ6YBlxnONa/F3LQcdRzyUs0v5yuKvnFdRkCB4=; b=IUBFEwfM/BMpRcqKrBNn4rqawI8KJ5pd00TGitzAuvc5d2/L5OAy8fvu2WhbiaEipA2axK z7PwT1OrOqKw2LJzBszwNttzMs+cF0AMYqENQz6+ygp/IEyQFCwFAB73YZl/P9nzRguVn6 hMmHEzXHyghJBaVPZjMV1IACzEVOw+XD+O3Dxl/+86NqzW8Pf+R5lbsFxmmM4KL7m0dywI AxWHfNu4uFoplzz/Q2Ku6QuuttMlT9WVUi4fcS98JMzJda0YYLt3texqR1TrMQrSdSEQn0 4npR3NI6AP+3Qm29Fk/Uo/zos1JMsEaCq02sJRUyLSI+X+SsRe6W1HMahs/X3g== 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 4LmFKN24hLz1B5V; Sun, 17 Jul 2022 19:19:52 +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 26HJJqTB052876; Sun, 17 Jul 2022 19:19:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26HJJqK2052875; Sun, 17 Jul 2022 19:19:52 GMT (envelope-from git) Date: Sun, 17 Jul 2022 19:19:52 GMT Message-Id: <202207171919.26HJJqK2052875@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitri Goutnik Subject: git: f71ecd52765b - main - sysutils/minikube: Unbreak on i386 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dmgk X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f71ecd52765b4237472af8a3bcbef791013f3d72 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658085592; 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=45W3PzZ6YBlxnONa/F3LQcdRzyUs0v5yuKvnFdRkCB4=; b=QXirLUq0gCM0gMGGTx6uVEwDfUzvQPGS6wZ/1xtuVVZzEUH3eyTwkPfwTU8Syzj18GrBqq aX0eUHNA8ltnSBIanu3+MmWLBIst+FmmiG/5dTaPHyqR8vpuN27OwP4nTLdoTKAIWHxYEU 6IGP3ULPB+lcaFqfJeYEbS17ygAuL3RJcr1eGqeMCuthoytypZ8870V8MQ9SPU6rmUBqkX 5yIPYOQeA4pVmojQti9JofgVeu9/FsAgonorZJ+pkd0axUzDbh/kiHQbc/0n+w6zAkPlRp 0EtdX4sAuTKWGjJvJhoaBIuWusMZPLADQTfP8D3JfyqYbDLrVYJchtxUXSuTXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658085592; a=rsa-sha256; cv=none; b=HhHgjs5ZxHxr4P+QDNSYhK99as0sX60/RC6b9Y/yRGPUVkZ8syz0X8a9E4tafRdJY9NJCL F7KYMCRJX0xgJ1VS1Ds/fXkXdEPodtF5tY+aqe19PPfgk9Lz/DJus7+twwuY6zrLBN6ku6 tTuig3Jcq8qeW+TqCtg/m+89ANVZOWvMR4kBUvMf2vBOE3ATOoTJja7s5IkUQWDRDUwfqe tK+/g5FJOMWwav1nvw3w8SWU/zLP2NkLLQ2MGVFUMpToBClPX3q1Fm94k9/2QdEcwfNa7j fti+pGuAGu8O2dVBJo8H7zvqQFCHTbZ7aa9bOVQdVye1plWjBP4sjS1YpFZsTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dmgk: URL: https://cgit.FreeBSD.org/ports/commit/?id=f71ecd52765b4237472af8a3bcbef791013f3d72 commit f71ecd52765b4237472af8a3bcbef791013f3d72 Author: Dmitri Goutnik AuthorDate: 2022-07-17 17:07:30 +0000 Commit: Dmitri Goutnik CommitDate: 2022-07-17 19:18:31 +0000 sysutils/minikube: Unbreak on i386 vendor/github.com/shirou/gopsutil/v3/process/process_freebsd.go:118:9: cannot use k.Start.Sec * 1000 + k.Start.Usec / 1000 (value of type int32) as type int64 in return statement Convert process.Timespec fields to int64 on all archs. Reported by: fallout Approved by: portmgr (blanket, build fix) --- ..._github.com_shirou_gopsutil_v3_process_process__freebsd.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sysutils/minikube/files/patch-vendor_github.com_shirou_gopsutil_v3_process_process__freebsd.go b/sysutils/minikube/files/patch-vendor_github.com_shirou_gopsutil_v3_process_process__freebsd.go new file mode 100644 index 000000000000..a2a4c3bc360e --- /dev/null +++ b/sysutils/minikube/files/patch-vendor_github.com_shirou_gopsutil_v3_process_process__freebsd.go @@ -0,0 +1,11 @@ +--- vendor/github.com/shirou/gopsutil/v3/process/process_freebsd.go.orig 2022-07-17 16:56:05 UTC ++++ vendor/github.com/shirou/gopsutil/v3/process/process_freebsd.go +@@ -115,7 +115,7 @@ func (p *Process) createTimeWithContext(ctx context.Co + if err != nil { + return 0, err + } +- return k.Start.Sec*1000 + k.Start.Usec/1000, nil ++ return int64(k.Start.Sec)*1000 + int64(k.Start.Usec)/1000, nil + } + + func (p *Process) StatusWithContext(ctx context.Context) ([]string, error) {