From nobody Tue Oct 11 22:18:12 2022 X-Original-To: dev-commits-ports-branches@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 4Mn9CS6zBwz4fXrh; Tue, 11 Oct 2022 22:18:12 +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 4Mn9CS6TjBz3XjW; Tue, 11 Oct 2022 22:18:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665526692; 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=BDG7WTZuUi1TMwep7O/f+qT60TFgSCRT9cqRnJsGE9A=; b=VmnRAKZzdN/NQ48gvqfWwrmkpZgx7AVUD7TqweD5LR0K9POJdydTMjzXh5bZ7aUZwU9fUy SYObQdXnzkRxrXMKJPsgiFqzszvUNHwNpOqGFvODmyB/rxiZd9Gz1xMxaqaAx/o6jhQp+K ticPiF7b+LbRSy/kiIv/VcJChRg4VeHzvbyXDAELImmqvFYd08NDLPJImAvFx3L8ylzx1t 9wTNblyaFnDBj/m2+yEGmk+pPJqkohdtn/D3DA/mKW5h/4GReivWpCa8WZkSGNUKOZwA7a VPkYG7seLrs/Q8RD+6FBBS8SYbq9rb43T7ewvf4IrU88b72xpRo/wYAbwIyVuw== 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 4Mn9CS5XJlz15rw; Tue, 11 Oct 2022 22:18:12 +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 29BMICQm024197; Tue, 11 Oct 2022 22:18:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29BMICZW024196; Tue, 11 Oct 2022 22:18:12 GMT (envelope-from git) Date: Tue, 11 Oct 2022 22:18:12 GMT Message-Id: <202210112218.29BMICZW024196@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Andree Subject: git: 81992ff145b1 - 2022Q4 - security/putty: fix aarch64 build on clang 10. List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: 81992ff145b1750ccea3c3bcaf0f5923662a7c72 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665526692; 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=BDG7WTZuUi1TMwep7O/f+qT60TFgSCRT9cqRnJsGE9A=; b=sya/vdZSGLApqoOpy0247BC+As6BGMyz4zjgrdCu40pD9wR/NSGcgtm99BPKYs/m4ZyEZ1 SRHitKYC1J5TLOC9i2J5I6U1rlZ+TL7hlXK5I+mJe8cWjdeiRnXqq687BMBM8MjX9b6UG1 5fCTkBjZB10grfumMJt6WIj3PNhmlhCjknqYiDCzseREFro0A80AzfsltBawdEghx8hhoK VEEJlAK48tQuYzzTG1SGM/zmGiXS5z681OTWprzsFKKzGSoUsZoJWuZN6Jk4IV3NJLx23V vXuFMdoRIKrWDiAlx2qV3ptKIbk82YzoJEqUziw8F+2Jw+xkjhEYjTsxkcrOug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665526692; a=rsa-sha256; cv=none; b=daAj6l/XXzOy3cPFBQ86enhvdTiuS2X79oISihlNCoQ38I0nUOUUuvkxHoixFphj8T+jau 4d9XXNWT0ncIRe8C19Rl9NpJ3g23P/Bf3ayoHkw6Ionm8U/1z83pO804tHrcX0WJHZhOWj tD2evfeyG96qEWk5l9YDT225hDB3Krd5yCblimAedF/fr8ZLMjK20JbyUGQgFy8sLMLrzn G/uK+Gsc1JFKwaThiuC0moQzwo2cJEHjzx7CpQhf0nP3h5qOrvcwYJGGCb7uEc3E9pGNP1 7zagrpZJ4PkZ7Iv6x30/asaMxO67+kc0Wh0j+MR49RImshhhXysg3PqeEqKR3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=81992ff145b1750ccea3c3bcaf0f5923662a7c72 commit 81992ff145b1750ccea3c3bcaf0f5923662a7c72 Author: Matthias Andree AuthorDate: 2022-10-11 22:12:57 +0000 Commit: Matthias Andree CommitDate: 2022-10-11 22:18:09 +0000 security/putty: fix aarch64 build on clang 10. clang 10 (FreeBSD 12.3) does not support vaddq_p128 and similar ARM NEON intrinsics, but clang 13 (FreeBSD 13.1) does. Abuse the HAVE_NEON_PMULL cmake test to disable aesgcm-neon.c unless vaddq_p128() is available. http://ampere1.nyi.freebsd.org/data/123arm64-quarterly/31229ca1324c/logs/putty-nogtk-0.78~pre20220922.log: /wrkdirs/usr/ports/security/putty-nogtk/work/putty-0.78~pre20220922.9fcfd67/crypto/aesgcm-neon.c:125:16: warning: implicit declaration of function 'vaddq_p128' is invalid in C99 [-Wimplicit-function-declaration] ctx->acc = vaddq_p128(ctx->acc, load_p128_be(coeff)); (cherry picked from commit 8fc6b69f47e7ee7da005f8b59fc10522d287740b) --- security/putty/Makefile | 1 - security/putty/files/patch-crypto_CMakeLists.txt | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/security/putty/Makefile b/security/putty/Makefile index 6f030da7f8d7..fe19c50a6f96 100644 --- a/security/putty/Makefile +++ b/security/putty/Makefile @@ -7,7 +7,6 @@ CATEGORIES= security # ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/ MASTER_SITES= https://tartarus.org/~simon/putty-prerel-snapshots/ \ LOCAL/mandree/ -PATCH_STRIP= -p1 MAINTAINER= mandree@FreeBSD.org COMMENT= Secure shell and telnet client including xterm emulator diff --git a/security/putty/files/patch-crypto_CMakeLists.txt b/security/putty/files/patch-crypto_CMakeLists.txt new file mode 100644 index 000000000000..82639b778fd0 --- /dev/null +++ b/security/putty/files/patch-crypto_CMakeLists.txt @@ -0,0 +1,15 @@ +This is a crude hack to avoid aesgcm-neon.c on FreeBSD 12.3, +which does - by way of clang 10.0.1 - not offer vaddq_p128() +through arm-neon.h. clang 13 as of FreeBSD 13.1 does. + +--- crypto/CMakeLists.txt.orig 2022-09-21 23:42:30 UTC ++++ crypto/CMakeLists.txt +@@ -192,7 +192,7 @@ if(neon) + volatile poly128_t r; + volatile poly64_t a, b; + volatile poly64x2_t u, v; +- int main(void) { r = vmull_p64(a, b); r = vmull_high_p64(u, v); }" ++ int main(void) { r = vmull_p64(a, b); r = vmull_high_p64(u, v); r = vaddq_p128(r, r); }" + ADD_SOURCES_IF_SUCCESSFUL aesgcm-neon.c) + + # The 'sha3' architecture extension, despite the name, includes