From nobody Tue Dec 14 19:26:45 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 135DA18E6B3C; Tue, 14 Dec 2021 19:26:46 +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 4JD7fY5b2Xz4sYn; Tue, 14 Dec 2021 19:26:45 +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 9F932606F; Tue, 14 Dec 2021 19:26:45 +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 1BEJQjre009510; Tue, 14 Dec 2021 19:26:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BEJQjwv009509; Tue, 14 Dec 2021 19:26:45 GMT (envelope-from git) Date: Tue, 14 Dec 2021 19:26:45 GMT Message-Id: <202112141926.1BEJQjwv009509@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: 2b095f9a257a - main - security/openssl-devel: Security update to 3.0.1 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: 2b095f9a257a5916bf2e55094ad43e4e8f632c80 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639510005; 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=ULpnbumvkmCDoyhsPd5pf14goF9l0my/9Vi6kQP0wTE=; b=mxcNVWivekscBZVRXt5eK8PPxYJS6BjMoPbx6tliDL8J87RSH8j6OqVveJbc5Xhgi9gPEz 2ivw0oQ41iK9GIC9UqeNF3/dPSpOs5L0Vhpr7XcbOG5En5CpLPXTCqGXp03IE0HKP907S9 VJYwLv2cwrkGyuHuTKHtCiXvRP8I5DJPVt8ccs3YmZ/2jI8E6LChq4Hdu5LXmh2sOIpPUy k4zpFWCyaBdVwxD7EafoBulp8lbFzotMXEZJQ3HlII13e5XfiUoBCG1i5pm0IZ9ayVSQp/ 2Bz23wNCTA4NAfdleYBL1Epg/VClLJOIEVdT8whz7DkU9l7ku7wMQPUJLAO6zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639510005; a=rsa-sha256; cv=none; b=KPAcrXty3LIS1judKn9hXdpVTrBlWb/DR8YGZ0aDH/yjoN+rCfbW2yEwm5lJKtSpDL4YiN 0dlv6e/jeNF81ivdsUsq/aHVLIZvDYLtJw951wazf7xsAYTQM6dWe9LYwJTvWo8GNKe5IG hvCYcrpXMdQ6qLsjknb1oC6KDBXzhJHIQJ8WebsUztQvIfNY0VWi7bSB+1bEvBGES33UDY v5vgGuG4AhanC2jxwRMbG1yFY+HylHbj8xLbKKkAEI3GGaVRflFIi87eRnGQe4OSpK6q51 y662Y1LC5oOGkxknKMqqLVNT23GCkhUBoryH1m8HqdD3YPrwYDx4xgiCGBbujA== 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=2b095f9a257a5916bf2e55094ad43e4e8f632c80 commit 2b095f9a257a5916bf2e55094ad43e4e8f632c80 Author: Bernard Spil AuthorDate: 2021-12-14 19:26:14 +0000 Commit: Bernard Spil CommitDate: 2021-12-14 19:26:14 +0000 security/openssl-devel: Security update to 3.0.1 Security: 0132ca5b-5d11-11ec-8be6-d4c9ef517024 MFH: 2021Q4 --- security/openssl-devel/Makefile | 3 +- security/openssl-devel/distinfo | 6 +-- security/openssl-devel/files/patch-D33062 | 65 ------------------------------- 3 files changed, 4 insertions(+), 70 deletions(-) diff --git a/security/openssl-devel/Makefile b/security/openssl-devel/Makefile index 5e01045f9d53..63d6cc97ccdf 100644 --- a/security/openssl-devel/Makefile +++ b/security/openssl-devel/Makefile @@ -1,8 +1,7 @@ # Created by: Dirk Froemberg PORTNAME= openssl -DISTVERSION= 3.0.0 -PORTREVISION= 3 +DISTVERSION= 3.0.1 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/ diff --git a/security/openssl-devel/distinfo b/security/openssl-devel/distinfo index aab30a994f2e..3ef9840c5e92 100644 --- a/security/openssl-devel/distinfo +++ b/security/openssl-devel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1639193665 -SHA256 (openssl-3.0.0.tar.gz) = 59eedfcb46c25214c9bd37ed6078297b4df01d012267fe9e9eee31f61bc70536 -SIZE (openssl-3.0.0.tar.gz) = 14978663 +TIMESTAMP = 1639508597 +SHA256 (openssl-3.0.1.tar.gz) = c311ad853353bce796edad01a862c50a8a587f62e7e2100ef465ab53ec9b06d1 +SIZE (openssl-3.0.1.tar.gz) = 15011207 SHA256 (f5485b97b6c9977c0d39c7669b9f97a879312447.patch) = 6d5b13e052924664dbdcafa71e5c2d46510813846339df4646a9291441d69ca3 SIZE (f5485b97b6c9977c0d39c7669b9f97a879312447.patch) = 4521 diff --git a/security/openssl-devel/files/patch-D33062 b/security/openssl-devel/files/patch-D33062 deleted file mode 100644 index 58dab2b86fef..000000000000 --- a/security/openssl-devel/files/patch-D33062 +++ /dev/null @@ -1,65 +0,0 @@ -Fix detection of ARM CPU features - -See also: - * https://github.com/openssl/openssl/pull/17082 - * https://github.com/openssl/openssl/pull/17084 - ---- Configurations/10-main.conf.orig 2021-11-19 18:20:18 UTC -+++ Configurations/10-main.conf -@@ -1061,6 +1061,14 @@ my %targets = ( - perlasm_scheme => "elf", - }, - -+ "BSD-aarch64" => { -+ inherit_from => [ "BSD-generic64" ], -+ lib_cppflags => add("-DL_ENDIAN"), -+ bn_ops => "SIXTY_FOUR_BIT_LONG", -+ asm_arch => 'aarch64', -+ perlasm_scheme => "linux64", -+ }, -+ - "bsdi-elf-gcc" => { - inherit_from => [ "BASE_unix" ], - CC => "gcc", ---- util/perl/OpenSSL/config.pm.orig 2021-11-19 18:21:33 UTC -+++ util/perl/OpenSSL/config.pm -@@ -745,6 +745,7 @@ EOF - [ 'ia64-.*-.*bsd.*', { target => "BSD-ia64" } ], - [ 'x86_64-.*-dragonfly.*', { target => "BSD-x86_64" } ], - [ 'amd64-.*-.*bsd.*', { target => "BSD-x86_64" } ], -+ [ 'arm64-.*-.*bsd.*', { target => "BSD-aarch64" } ], - [ '.*86.*-.*-.*bsd.*', - sub { - # mimic ld behaviour when it's looking for libc... ---- crypto/armcap.c.orig 2021-09-07 11:46:32 UTC -+++ crypto/armcap.c -@@ -112,20 +112,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