From nobody Tue Feb 08 21:24:39 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 10A5D19A7B6E; Tue, 8 Feb 2022 21:24:40 +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 4Jtbcl6vkWz4THH; Tue, 8 Feb 2022 21:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644355480; 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=iWqrhFGZRXm86Qqoc9GDFxC/60DMnmnox8f9ay0FQNc=; b=YE8A05sW6w2XLIzIiiWilTL6eVA01zwX3DC7ZeBJdu/pHfPk9dUDT1QHLiH6U/+k9Hnk6Z Vx3bQ1+t/P9tlfKK6GJaVnNIi+kt7HO5xZqX0dgfQyBRPKc40qTixTtyfeVV2GwCpeXYyt ADwil+eM94KQy1cxk5GvEipnvHc6B7bWdEl3WB3mksFd6UWbNHlyJBKUFsLNFLa7Ni7bRB uIO3W4VNXNGs4nvylE6hWWlcZOxqkZ/M3RAIZtshOoIbgylzyR9PCOC2GAABUEW995Hu3K Myu/T6bmE6xMri6qjs70u+wosftAi1yijLKhpp19Za8TRrwdDm7KFmw1W55HYg== 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 CE9002097F; Tue, 8 Feb 2022 21:24:39 +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 218LOdY7016729; Tue, 8 Feb 2022 21:24:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 218LOdBM016728; Tue, 8 Feb 2022 21:24:39 GMT (envelope-from git) Date: Tue, 8 Feb 2022 21:24:39 GMT Message-Id: <202202082124.218LOdBM016728@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Serhii (Sergey) Kozlov Subject: git: 63b098abd07a - main - ftp/sftpgo: Fix build 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: skozlov X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63b098abd07ab92f277946807794e9edb5284699 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644355480; 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=iWqrhFGZRXm86Qqoc9GDFxC/60DMnmnox8f9ay0FQNc=; b=iAX8AQa9qwMRBYQNHjx2J21YBbCDqfCloUkbJlvDm9X3ftze+m8wp3t5qzsFs1KkCTCQiE 2R6PKmGl22mbt+z/cbp4hEeC5oVOVxP2uezZd83VvOpC5emPYOu66Xjy1ghwOGScrSxygR X/+zCC+PHKQORX0EtmAfEBx8nBGHj3dCywwjGKBaYpPAy0xkp55kpL19BOrqJZgCZEaeYc KSWdsT3r3GcWKTEyELjgqwLUO8vJSGsj2bKQC1ZV6RGJfMwt81vWbexDJfxJQlpC9nbUpN DpiwZB3awzgWcE5Q2UaxIIT+I98wcyzI6Q7xOtA+4h4Iuj0+4XHh3MAFncq0zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644355480; a=rsa-sha256; cv=none; b=xP8cHwHlFV6csvF9l3PxJ5Ila09zSMrrGWAFEPT42AO4NtOM6XXVl4AkFAlq9swGO0b8tm FonP2zuiv8ghqSE70dAZgp+VQRlH4/+AeQEL2Jtms4IQxvinFRk4mK9pL6fJvschVV2ce8 L3WCzc++BISSBjBQd6H3im9+WdfJ5nM8TmKqGNz0WxwZSyhcc0JkVMkVzrZG2wj2Y00BqT taCzyFGA6xF1nTgidNuaz6K+YFkK92WWMMosG90JMVcRTC7ZkWHedQKy30eQTX0VT90HCF dJndUml8YoVqcgdNX7m2DPKrXmKJLGY4AgiMSi4ufkWzXdj19UFZ6itn4ZgcyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by skozlov: URL: https://cgit.FreeBSD.org/ports/commit/?id=63b098abd07ab92f277946807794e9edb5284699 commit 63b098abd07ab92f277946807794e9edb5284699 Author: Serhii (Sergey) Kozlov AuthorDate: 2022-02-08 21:23:28 +0000 Commit: Serhii (Sergey) Kozlov CommitDate: 2022-02-08 21:24:20 +0000 ftp/sftpgo: Fix build on i386 --- ...github.com_shirou_gopsutil_v3_process_process__freebsd.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ftp/sftpgo/files/patch-vendor_github.com_shirou_gopsutil_v3_process_process__freebsd.go b/ftp/sftpgo/files/patch-vendor_github.com_shirou_gopsutil_v3_process_process__freebsd.go new file mode 100644 index 000000000000..6011ca54e942 --- /dev/null +++ b/ftp/sftpgo/files/patch-vendor_github.com_shirou_gopsutil_v3_process_process__freebsd.go @@ -0,0 +1,12 @@ +--- vendor/github.com/shirou/gopsutil/v3/process/process_freebsd.go.orig 2022-02-06 14:12:45 UTC ++++ vendor/github.com/shirou/gopsutil/v3/process/process_freebsd.go +@@ -115,7 +115,8 @@ func (p *Process) createTimeWithContext(ctx context.Co + if err != nil { + return 0, err + } +- return k.Start.Sec*1000 + k.Start.Usec/1000, nil ++ // Pull request: https://github.com/shirou/gopsutil/pull/1246 ++ return int64(k.Start.Sec)*1000 + int64(k.Start.Usec)/1000, nil + } + + func (p *Process) StatusWithContext(ctx context.Context) ([]string, error) {