From nobody Tue May 17 14:46:40 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 4CC721AE6202; Tue, 17 May 2022 14:46:41 +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 4L2f8J4bKbz4kVh; Tue, 17 May 2022 14:46:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652798800; 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=v36l8hOcfCymcNTT5k4LnQzgsb13lAUdvDTQLNZZSIM=; b=LIwJ0kWuGczVrefIpfcf6jJNm3j5KqBnzF53twxMonubc5cvC3LanUKe0vPFPGWV+tcg2H JqzT7KdwKp2/5BlyRPa++Q3do4RmTB67ycmmiSSnVi4u59GVzcB6HfiBCurYrL3HoO1w3q RLYjrSJC4MYnaq8ypoSh+eUtQlqbLMwJsQGwFw02+XFv0lkYZs9mkMHqlo6SW7NrpQJLM+ FF/wySNr2SYe25NRofMIAsXombDnKKERaYNUoRKjy08wD6mhWcVFXWwVWI2YJOGKNbXvz5 41bh58N6mFCpjZK+x4wXPUTvqftkY4E3jNZ75GFdDs31YRD9173Ks45j2kS0fw== 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 5670516A99; Tue, 17 May 2022 14:46:40 +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 24HEke0U096090; Tue, 17 May 2022 14:46:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24HEkems096088; Tue, 17 May 2022 14:46:40 GMT (envelope-from git) Date: Tue, 17 May 2022 14:46:40 GMT Message-Id: <202205171446.24HEkems096088@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: aed152b18cd5 - main - games/teeworlds: fix build, add extra WWW 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aed152b18cd581684d43008d1894941732d294a7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652798800; 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=v36l8hOcfCymcNTT5k4LnQzgsb13lAUdvDTQLNZZSIM=; b=Em3nZB1/04KSJxFd/dhzrDD6/P1trZuIt+54w3kXUHQfJ0kEJPRpcwa+QC8rFrhSKSPWWr iw2pNUKN2HM15Nu9QM4E478VP6gn0J8I/Vk2x0/Ypo6Ph3KFY4fbPDpDCSam3xUL6Ikf7w CbfLE8u2l8a+YIHKH5H/8WBPwkhG0CqOyzSHwR6b1AYF+PlsUrKB4eYUx4NiRNzVIkocHz oHrPLhHU1CcdDwewMCsnQrd5vDzRKQJovbFNmSoX+guGkK/Q4dZzg3Ho1PLLj3FdftLtJ5 isBhdJLkHezyFaKT/IR0f41t+HIVL/ezCt2U5iGeW4Zm4aU75wFTq8mA9KjuIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652798800; a=rsa-sha256; cv=none; b=Lkifzr0hzzVmr+Uv4fbJI6vcNhRkhJG7mDfIcN5OKz3NsPGnkzSP851QsrVVbPk1rmVcrZ xKVomXr66AeAWGZukyWBo+Cs8nw3ZjIEjWByq+KHN8SGp3zNAytZb7PDzfDK9oRwlZV8ry x4MX0x8YPIdIOpF8V3oeROBJNes2zJ8S0JfmKxhuAPYatcz2V/Kkm3IuYfmcxRAubp1Sc8 mysHT2iYy0cWWFpbJJuMAvjIaF4R/4GvRZAfot4lF33DwTj++ae9zceTTEXw6yzg12weP1 5LXBMczZrNMMJ0FgAiTf2vNGv3JYWNonqbb2q+xZg8AEhsMfGzLKSS+YNHDi8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=aed152b18cd581684d43008d1894941732d294a7 commit aed152b18cd581684d43008d1894941732d294a7 Author: Dmitry Marakasov AuthorDate: 2022-05-17 11:44:57 +0000 Commit: Dmitry Marakasov CommitDate: 2022-05-17 14:41:55 +0000 games/teeworlds: fix build, add extra WWW --- games/teeworlds/files/patch-CVE-2021-43518 | 4 ++-- games/teeworlds/pkg-descr | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/games/teeworlds/files/patch-CVE-2021-43518 b/games/teeworlds/files/patch-CVE-2021-43518 index b7cd56cd9e69..8dba0a4dc00b 100644 --- a/games/teeworlds/files/patch-CVE-2021-43518 +++ b/games/teeworlds/files/patch-CVE-2021-43518 @@ -13,7 +13,7 @@ index 24d09509..bbaaa821 100644 p.m_Curvetype = pEnvPoint_v1->m_Curvetype; - for(int c = 0; c < pItem->m_Channels; c++) -+ for(int c = 0; c < minimum(pItem->m_Channels, 4); c++) ++ for(int c = 0; c < std::min(pItem->m_Channels, 4); c++) { p.m_aValues[c] = pEnvPoint_v1->m_aValues[c]; p.m_aInTangentdx[c] = 0; @@ -26,7 +26,7 @@ index 160bb1c6..2bedb06e 100644 { CMapItemEnvelope *pItem = (CMapItemEnvelope *)DataFile.GetItem(Start+e, 0, 0); - CEnvelope *pEnv = new CEnvelope(pItem->m_Channels); -+ const int Channels = minimum(pItem->m_Channels, 4); ++ const int Channels = std::min(pItem->m_Channels, 4); + CEnvelope *pEnv = new CEnvelope(Channels); pEnv->m_lPoints.set_size(pItem->m_NumPoints); for(int n = 0; n < pItem->m_NumPoints; n++) diff --git a/games/teeworlds/pkg-descr b/games/teeworlds/pkg-descr index 3423a51c18eb..57213ef5d950 100644 --- a/games/teeworlds/pkg-descr +++ b/games/teeworlds/pkg-descr @@ -14,3 +14,4 @@ that happens is fast-paced and happens in real-time. It supports CTF mode. WWW: https://www.teeworlds.com/ +WWW: https://github.com/teeworlds/teeworlds/