From nobody Mon Dec 20 18:05:57 2021 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 C577C1901A07; Mon, 20 Dec 2021 18:05:57 +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 4JHnZY3nKQz4ZJF; Mon, 20 Dec 2021 18:05:57 +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 627071ACA3; Mon, 20 Dec 2021 18:05:57 +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 1BKI5vL5065752; Mon, 20 Dec 2021 18:05:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BKI5vNo065751; Mon, 20 Dec 2021 18:05:57 GMT (envelope-from git) Date: Mon, 20 Dec 2021 18:05:57 GMT Message-Id: <202112201805.1BKI5vNo065751@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: f64391dd0140 - main - security/openssl: Fix build on aarch64 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: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f64391dd014047d542cd394dda3dc00c1d061801 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640023557; 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=JkuuA5eDAuLyTOa3VSmUumufiVeATiO32DiJHuWn9H4=; b=mv4+qMsgkAz2bGQzoeUE438s38MsKsUh/xXvKf2WpzEy51b8Cp083fW283cYd7N5QR+Lhm nh+KuvOGxKE8HDjwM+1yaxIqIKHJPIs9dfZxKD6nAk9/GRrwtbS9ip0jF7AXmvKg4argy/ Gd6Bke0c/wNonb/lBm0bP3TBBSGinFQCXtg41/RMWImHWRlijszgjoET1XUtQAedXNGH+b Rb0hr/gD5TcpjvVeCFJKN9P5YSxuQ/7iKoXI+7ccSJC8UhbPXRUB6CefTy7A+FBrcGEbhg sVNbOa4pZcJYB8/mwy1QG/W0NDC/4d19e4IguxapzuLFH2rO12gpBQY64XSToA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640023557; a=rsa-sha256; cv=none; b=Kt2ZflqXGDSohow5+ApWCnKwv1KsXq9QatFrlzS/wzhIloeaMM6QCSpl4qN6xUF0aOffxT HPWtx6LkzC4Y531OiwJJFsBNFtI5moTonENT4EnVhwfA2qBA2ENBTRPjQGgz+zVC3/vAIP hDAanvlLlg9wZaPjEzTKCGfnAgCsyWOEip+W3QbsNTv0kwO/dQyalLvBOkaxWIhJPwhi8d CDX05uFiR0G6VozjNSlSMztJ/XnwykwQ1fR+dQivGWeGKxpaXOytLKCPVxCRtma7xyMLx9 2GsRtnafd7/CS3UK0/4srnz5v/qt9XbyHu2PBKlsuDuY3zCOXmWwFAPyEgejTw== 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=f64391dd014047d542cd394dda3dc00c1d061801 commit f64391dd014047d542cd394dda3dc00c1d061801 Author: Bernard Spil AuthorDate: 2021-12-20 18:03:30 +0000 Commit: Bernard Spil CommitDate: 2021-12-20 18:03:30 +0000 security/openssl: Fix build on aarch64 * Upstream only partly merged changes PR: 259937, 260572 Reported by: allanjude, "Naram Qashat" --- security/openssl/Makefile | 1 + security/openssl/files/patch-Configurations_10-main.conf | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/security/openssl/Makefile b/security/openssl/Makefile index d0b156e605ea..dcac89a98972 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -2,6 +2,7 @@ PORTNAME= openssl PORTVERSION= 1.1.1m +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ diff --git a/security/openssl/files/patch-Configurations_10-main.conf b/security/openssl/files/patch-Configurations_10-main.conf new file mode 100644 index 000000000000..03be5801b885 --- /dev/null +++ b/security/openssl/files/patch-Configurations_10-main.conf @@ -0,0 +1,16 @@ +--- Configurations/10-main.conf.orig 2021-12-14 15:45:01 UTC ++++ Configurations/10-main.conf +@@ -988,6 +988,13 @@ my %targets = ( + 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",