From nobody Tue Nov 23 18:50:07 2021 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 1852618AED7B; Tue, 23 Nov 2021 18:50:08 +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 4HzCqz5CFVz3Jvs; Tue, 23 Nov 2021 18:50:07 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 8E72B1B9E1; Tue, 23 Nov 2021 18:50:07 +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 1ANIo7N4078348; Tue, 23 Nov 2021 18:50:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ANIo7iT078345; Tue, 23 Nov 2021 18:50:07 GMT (envelope-from git) Date: Tue, 23 Nov 2021 18:50:07 GMT Message-Id: <202111231850.1ANIo7iT078345@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: e2d67bee9eb0 - main - www/openssl: Fix detection of ARM CPU features 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: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2d67bee9eb05d8c48a054edd5b52938b1c1d576 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637693407; 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=myArdmNnfdA95567l8glBaIjl8gtshQirKZzr13FgSU=; b=CXQGQWNNT4rX/N7GbH65YSQZ6+lS3mZFq2PKjctN6HD2fRAWZjmhZnkaioCGhV0xSQQnWS Ks2nJekp5RMhdglAoYKCMLXI8ceJsBx0LP0+cZk89cY3So0xKU0KuvoaEB9DWVabHjyKEq fT1QSUHRrj0YNhquNNh9ZEi/xjuR0dcjQl0tUPbvk8vQadtXd9qmooj0RR0uC8SnIYlQdw P2MB4GtLCzGbVoLG6Jks/mmemoxxazuqLZjKnw0CbpBFGWyyr0maqWeh/4ssgrIE4aWbAl zsRA4n/ieC/bMoAQ62G+qcemNXgvmFMKnXwG36RTiIgeLSZQgDkeqB2z3iB3UA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637693407; a=rsa-sha256; cv=none; b=iPc1tb4w0B+70aLRKnXtxFtXzE7K62SMsZcFG6VQ1a9ZY3wsnjnHp+BgPVFrjgydO2NqbA Or7r/wiWzoLkGxmx+KqvyvnQbpZUOWY+bUFI+zgdqvP0iw2gUanZ4RQ0NuzA3epQv85LCK tarsYsgttUwu+/B+fm4AJwin4h8f++qQ7xg5HF/iRC+q1WYnhEGXC5FhffUaZs2BByCSra BiJknguRIPfsxqVL7XoUwXZWrIC3a6CceNtNahr1IwT/eYatNEc9OARNTI7acAvFopn3P2 ibtrM2W1uMi2eag51YT0lzWAnHEUmJKpaXURDJLgZS+dsHYdFT7BxKaJkKaxxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=e2d67bee9eb05d8c48a054edd5b52938b1c1d576 commit e2d67bee9eb05d8c48a054edd5b52938b1c1d576 Author: Bernard Spil AuthorDate: 2021-11-23 18:44:13 +0000 Commit: Bernard Spil CommitDate: 2021-11-23 18:44:13 +0000 www/openssl: Fix detection of ARM CPU features Upstream: * https://github.com/openssl/openssl/pull/17082 * https://github.com/openssl/openssl/pull/17085 PR: 259937 Submitted by: allanjude Differential Revision: https://reviews.freebsd.org/D33061 --- security/openssl/Makefile | 1 + security/openssl/files/patch-D33061 | 53 +++++++++++++++++++++++++++++++++++++ security/openssl/files/patch-config | 5 ++-- 3 files changed, 57 insertions(+), 2 deletions(-) diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 10a456a04cc9..630a02c963ef 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -2,6 +2,7 @@ PORTNAME= openssl PORTVERSION= 1.1.1l +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ diff --git a/security/openssl/files/patch-D33061 b/security/openssl/files/patch-D33061 new file mode 100644 index 000000000000..2a917ab079c9 --- /dev/null +++ b/security/openssl/files/patch-D33061 @@ -0,0 +1,53 @@ +Upstream: + * https://github.com/openssl/openssl/pull/17079 + * https://github.com/openssl/openssl/pull/17084 + + +--- Configurations/10-main.conf.orig 2021-08-24 13:38:47.000000000 +0000 ++++ Configurations/10-main.conf 2021-11-18 21:12:30.060493000 +0000 +@@ -988,6 +988,13 @@ + perlasm_scheme => "elf", + }, + ++ "BSD-aarch64" => { ++ inherit_from => [ "BSD-generic64", asm("aarch64_asm") ], ++ lib_cppflags => add("-DL_ENDIAN"), ++ bn_ops => "SIXTY_FOUR_BIT_LONG", ++ perlasm_scheme => "linux64", ++ }, ++ + "bsdi-elf-gcc" => { + inherit_from => [ "BASE_unix", asm("x86_elf_asm") ], + CC => "gcc", +--- crypto/armcap.c.orig 2021-08-24 13:38:47 UTC ++++ crypto/armcap.c +@@ -106,20 +106,23 @@ static unsigned long getauxval(unsigned long key) + * ARM puts the feature bits for Crypto Extensions in AT_HWCAP2, whereas + * AArch64 used AT_HWCAP. + */ ++# ifndef AT_HWCAP ++# define AT_HWCAP 16 ++# endif ++# ifndef AT_HWCAP2 ++# define AT_HWCAP2 26 ++# endif + # if defined(__arm__) || defined (__arm) +-# define HWCAP 16 +- /* AT_HWCAP */ ++# define HWCAP AT_HWCAP + # define HWCAP_NEON (1 << 12) + +-# define HWCAP_CE 26 +- /* AT_HWCAP2 */ ++# define HWCAP_CE AT_HWCAP2 + # define HWCAP_CE_AES (1 << 0) + # define HWCAP_CE_PMULL (1 << 1) + # define HWCAP_CE_SHA1 (1 << 2) + # define HWCAP_CE_SHA256 (1 << 3) + # elif defined(__aarch64__) +-# define HWCAP 16 +- /* AT_HWCAP */ ++# define HWCAP AT_HWCAP + # define HWCAP_NEON (1 << 1) + + # define HWCAP_CE HWCAP diff --git a/security/openssl/files/patch-config b/security/openssl/files/patch-config index 753e22c6d62d..d83edae81ff7 100644 --- a/security/openssl/files/patch-config +++ b/security/openssl/files/patch-config @@ -1,6 +1,6 @@ ---- config.orig 2018-01-13 13:57:15 UTC +--- config.orig 2021-08-24 13:38:47 UTC +++ config -@@ -694,14 +694,8 @@ case "$GUESSOS" in +@@ -708,14 +708,9 @@ case "$GUESSOS" in ia64-*-*bsd*) OUT="BSD-ia64" ;; x86_64-*-dragonfly*) OUT="BSD-x86_64" ;; amd64-*-*bsd*) OUT="BSD-x86_64" ;; @@ -12,6 +12,7 @@ - libc=`(ls /usr/lib/libc.so.* /lib/libc.so.* | tail -1) 2>/dev/null` - fi - case "`(file -L $libc) 2>/dev/null`" in ++ arm64-*-*bsd*) OUT="BSD-aarch64" ;; + *86*-*-*bsd*) + case "`(file -L /bin/sh) 2>/dev/null`" in *ELF*) OUT="BSD-x86-elf" ;;