From nobody Sun Jul 17 19:30:15 2022 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 4LmFYM33xCz4X5p3; Sun, 17 Jul 2022 19:30:15 +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 4LmFYM2XpXz3CL5; Sun, 17 Jul 2022 19:30:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658086215; 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=456bwF2nz27GkTgWzWdZ2/xvfRkb9irr6pE9m2wVZls=; b=wTgz+kKY7/+spZUaLyrOdrGfCrVxXE2q5zBkF/+iaBgpwz8ROlDUfILxE/XwPp97Ihn71l dhYHaXxcguxvpSe+in/c5Sqgxv2s7a+pX5lIkC/CIR3GqbVLQnDs1X1NyqGyeEepJsnmlg NiBhQv4qcFcgcCfrTQ2mnq9xj2qh5Po3XkUgvTZzbWxFXIEjj8KLKBlYvPWN/KItbq9gQH 7GXnKMxJCQwv1LDByg9ZJXLTPx/lyTZ2eVR2go/MRYG5LCJpL4q3JYh0B85xFswduQozAl AMcDVXlnPfI3q7OJ8NNghWj373HCiVvLbi7dAPrlmlka6FCLYGxVnVhn+RQEJQ== 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 4LmFYM1V52z1BJh; Sun, 17 Jul 2022 19:30:15 +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 26HJUFg9071137; Sun, 17 Jul 2022 19:30:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26HJUFht071131; Sun, 17 Jul 2022 19:30:15 GMT (envelope-from git) Date: Sun, 17 Jul 2022 19:30:15 GMT Message-Id: <202207171930.26HJUFht071131@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dmitri Goutnik Subject: git: d1cdd844abcc - 2022Q3 - sysutils/minikube: Unbreak on 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: dmgk X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: d1cdd844abccad63c0ce8414bafe478e55eeb4e9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658086215; 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=456bwF2nz27GkTgWzWdZ2/xvfRkb9irr6pE9m2wVZls=; b=qJC6pm3hEdEG/1Imug7tCnRkcUjCQnAdewsLPu7v6vPms+3ZX9UVWaVe+uIEEmhpHwos5C 6XTBxedOIphR1PpB9In3Y7imrEDzFdmHF1Vejfa9X9YECVgq7VJBMdlHPdAo7jq263lIiX VgSYJNPWrhGc0DtfGmCUetHyCSB4oLv4J/5qYCB3CMo1a6DJv73+YrlISNlIuK2pdZoD8L JQN4H5vMttbNtFqI877bC42OxkxK1b6dAcIrGQ58u0msRfoLxnp1UI8M0G1LDJSnRoVrPs erOvpgISiwdA2gg6SPcIiNTi4/cKYLsFLEvfWE3n0BuvszXLnp1TKLeldMI6Vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658086215; a=rsa-sha256; cv=none; b=DbDSGDz0UnnFqmoVZ5tcUb2Nt5cAyJZHEUvf7Mf9Ha4YPObeyWwwmt4iXO5Tdx0t5yYeD8 8biApMUPSEiOs1GzQ5ttbV++ynRXyQctV0RFT4woL26RyYcvfWFzkrApaf6yfSsctc4brq rbAz5ssdXVXWYoOyBO0f8XdVr73CkJj/whaj/SzC6s0CJ+EvDJJudGgKWUdKJnfdbvziHi FnyjLnypCmdAhFIS6EdPkwhhib3jXAj4TrF6pPr2eMcENNd9eFfer7u4kKIvY9jcXY/oiQ x1eeIOoWQZ7T8Z6expnr6HiOKwH4uUF4BTdQsJuo7zAn8hAFB5ADJokfDkxi1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by dmgk: URL: https://cgit.FreeBSD.org/ports/commit/?id=d1cdd844abccad63c0ce8414bafe478e55eeb4e9 commit d1cdd844abccad63c0ce8414bafe478e55eeb4e9 Author: Dmitri Goutnik AuthorDate: 2022-07-17 17:07:30 +0000 Commit: Dmitri Goutnik CommitDate: 2022-07-17 19:20:23 +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) (cherry picked from commit f71ecd52765b4237472af8a3bcbef791013f3d72) --- ..._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) {