From nobody Sun Jul 17 19:30:16 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 4LmFYN4zfVz4X5lx; Sun, 17 Jul 2022 19:30:16 +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 4LmFYN2y0Lz3CfW; Sun, 17 Jul 2022 19:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658086216; 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=aLKTdK/5kIUEgaP0qJreTtrXx8g7snZETIkPM4jFZBI=; b=jtIleiFdfmLQvuLOWeDhHcGEiMRXf7QntT1JLQ8MQRCi8ny+VhmHMhTLZGOTsHXElq27Ym Lx1WrPHtXvXDfY93dy+P8351+VV5DeS3PI9UqAYzNRavjGrSXb90SuOH0Ri8q7NiqgdXn6 bYYh/O2rZ2Z2y6kGKTEa9BLhL8bPbN+ks4yIEe4ERz/i6NiqEZKYMchMwc8BOdm/FC3LiX mKeQK5yxSWk8TnbD1NzolEILKjJh8b33hVV61omxnHjhtPNP0RoKopcRzMr7py45ZeLzVU kOm3Ikzfe88Xmt0SXg2Sqjcc3Rp4xJ5f8YwlWXYEQzL6IZpO0HZIXK/2RhLYng== 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 4LmFYN1t4Kz1BM8; Sun, 17 Jul 2022 19:30:16 +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 26HJUG2o071647; Sun, 17 Jul 2022 19:30:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26HJUGxO071641; Sun, 17 Jul 2022 19:30:16 GMT (envelope-from git) Date: Sun, 17 Jul 2022 19:30:16 GMT Message-Id: <202207171930.26HJUGxO071641@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: c06459e62cbe - 2022Q3 - security/honeytrap: 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: c06459e62cbe27aef655e0ee49a11b4579d9042d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658086216; 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=aLKTdK/5kIUEgaP0qJreTtrXx8g7snZETIkPM4jFZBI=; b=OX6Kxc0kift/4ccZlyDncl2HWxv64SkBOHPl3kjFniZKpjqncSOnsetcjke6hF9xieyK/C JUY4BXZqOkH6f8TQDHPTMaO3PObWSD8Z01qm6ETtjf5JsWJwPjfji8jhOacNkZxch3nkq4 lsq/l0jlj1qjY6ZPVOmXkWueubzOBFToYbt7G+rZzN4g4aZxuCusBZrZBq+qBODSMlTdeN ngd+J320B8yatOUHhL1MZ1EOZ3V0KgpwIlPlbVXqekpKBt2vJdUyjWd2ZfL1lMk9pH516j dnZrJnRpC3AH6rUZAd8tYMCtwBObOsoqmC0b+kxLdwuXNOzFzPh/yZX4DDFH9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658086216; a=rsa-sha256; cv=none; b=ezQufXRAJD+/Y3ekMn+waS1PFdKIH6qN1iH4Qud89eASC/vmNTfr1OxXaz9pBzT6M7So+n CNqI+JurEqzgdJWvkVz1tNHAZkpJXklQGLc6SO8KLyiOsTsO9nJCjJa+1HJzAj8RHzPo3G r4BMo7EZxxj/tVHCaS83k3gqDESaa3Q3xBCiZjJBFgZ/cfmD1FXXqpQacZZAb69GgIvAPd 4grhEGYCsMFUQIM7cLeYPa3b9hQ3WK3tL/TXmjRHzTAjShjMJYUTN0VmnF630Tq25XSDmQ Qf88YdW+C/nBPsVS1cpLIrpO7FKSzbkXC4PvtMp29HdTTa+UyBCAMQv0OYA1qg== 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=c06459e62cbe27aef655e0ee49a11b4579d9042d commit c06459e62cbe27aef655e0ee49a11b4579d9042d Author: Dmitri Goutnik AuthorDate: 2022-07-17 19:13:56 +0000 Commit: Dmitri Goutnik CommitDate: 2022-07-17 19:20:31 +0000 security/honeytrap: Unbreak on i386 services/docker/docker.go:405:23: cannot use 16348065792 (untyped int constant) as int value in map literal (overflows) Make constant literal int64 on all archs. Reported by: fallout Approved by: portmgr (blanket, build fix) (cherry picked from commit d8128d02c2d62bd28f81020a0747ef03df9168b1) --- security/honeytrap/files/patch-services_docker_docker.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/security/honeytrap/files/patch-services_docker_docker.go b/security/honeytrap/files/patch-services_docker_docker.go new file mode 100644 index 000000000000..aff51f963edd --- /dev/null +++ b/security/honeytrap/files/patch-services_docker_docker.go @@ -0,0 +1,11 @@ +--- services/docker/docker.go.orig 2022-07-17 19:10:19 UTC ++++ services/docker/docker.go +@@ -402,7 +402,7 @@ var infoResp = map[string]interface{}{ + "Mirrors": []interface{}{}, + }, + "NCPU": 8, +- "MemTotal": 16348065792, ++ "MemTotal": int64(16348065792), + "GenericResources": nil, + "DockerRootDir": "/var/lib/docker", + "HttpProxy": "",