From nobody Sun Jul 17 19:19:53 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 4LmFKP4KWdz4X4bl; Sun, 17 Jul 2022 19:19:53 +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 4LmFKP3k0Dz3Bx6; Sun, 17 Jul 2022 19:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658085593; 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=UbOB77nPprlOUQxe/2JCI+6AcZXCYxityuVP/xbJQ2E=; b=rbJDQD+ZUw5jhyC1IiDBpvzCTC0OsFARIdkKpLHPAc5giGBZDOYG+Us+DESnaOwIgGwKCq QnnLHAVNuiwluhTsbb3mgwopXTiPGeqcMPQSlvR8KWcLDPPaz3kCGX7LnPwhRpATXYgJp1 UBaXhS0zGfma/7F4XUvqdWjnABAcAXLwZ9Qf6EdzwpCMdHNYjb6OAYVWrrKVBb6j+kzcp/ qSZXXxFFcOeuVndB6KBLyKgzZNanEE+icbRCxNIkNKsPOKAH4PD/cm1di3TKmwKn2Fh9Lo uFajWC0W4xROFif6QZNiwR5sYaDTB3mrd7ZWuhD6MIIt5egsiNpK8wxv936ESw== 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 4LmFKP2qbVz1B5W; Sun, 17 Jul 2022 19:19:53 +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 26HJJr2u052900; Sun, 17 Jul 2022 19:19:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26HJJrV1052899; Sun, 17 Jul 2022 19:19:53 GMT (envelope-from git) Date: Sun, 17 Jul 2022 19:19:53 GMT Message-Id: <202207171919.26HJJrV1052899@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: d8128d02c2d6 - main - security/honeytrap: 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: d8128d02c2d62bd28f81020a0747ef03df9168b1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658085593; 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=UbOB77nPprlOUQxe/2JCI+6AcZXCYxityuVP/xbJQ2E=; b=pFvxN2CFIR90sDYZXwWSdTdXwaXMKaj3IYXjAMwIuI7wPFRY+WbevRbzLnYyNecyAUOA9B yP1CLk24STEnVFYsrq7CJxBDC5gz2ai1CKdZVeqnNNuVDSpoUyj5ZToGciKrxvznNcmwd7 JpsoqekpyW6A5588WTXvWsz/hZnhjAjeU2ocwlBhci55dSaR9zI04UjWXzdG1Zt4YXsdZi C5/s7IcD3Pwv9qlnTGzIafFXpE0uJ+01L9+9DKp92nFk4l7MvrGHAmHgjQx4zxq62oCQfE zvXlAwd9aJrl+YFWDVA3Qm+3J4N5zbr5iL9PAY3oM3rr3MurGJFJ+ihwme7few== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658085593; a=rsa-sha256; cv=none; b=H7o3WOMnGoAoNEdtiPMY8p3KU7n+STYqjm9ePVXeeXBCad+j60HSqtjOKxLQj8i2G+MpTw G/lV7o4xUc+Na5EWftEqrGO6r+ESg4j88zjEtLXPzll/B2uHa7HxgOVucAEiP3X8/xptTX tUJ76fzmpS4bJ3FWW6ezoEpGGln8QKEXuYsCL8fkKG9Kfjv/MLNm+9EApUhQE1hdPG6z0+ zR1uVKQ1JrDQSrktETNLLrv9MFLrK6T+WGJfxF3lLo9CvueFl8pvqaJXCP1lymn+p004r7 BmAfivqKNp4mhdIEXjG4ChWyCufR0Req6b8GpZR8LXsbRkEYU/5dHBBXrnciCQ== 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=d8128d02c2d62bd28f81020a0747ef03df9168b1 commit d8128d02c2d62bd28f81020a0747ef03df9168b1 Author: Dmitri Goutnik AuthorDate: 2022-07-17 19:13:56 +0000 Commit: Dmitri Goutnik CommitDate: 2022-07-17 19:18: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) --- 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": "",