Date: Tue, 14 Dec 2021 19:13:34 GMT From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 00935ff28f32 - main - security/openssl: Update to 1.1.1m Message-ID: <202112141913.1BEJDYCx095991@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=00935ff28f32fc509d93045002cebfa4baf81d87 commit 00935ff28f32fc509d93045002cebfa4baf81d87 Author: Bernard Spil <brnrd@FreeBSD.org> AuthorDate: 2021-12-14 19:13:32 +0000 Commit: Bernard Spil <brnrd@FreeBSD.org> CommitDate: 2021-12-14 19:13:32 +0000 security/openssl: Update to 1.1.1m --- security/openssl/Makefile | 3 +-- security/openssl/distinfo | 6 ++--- security/openssl/files/patch-D33061 | 53 ------------------------------------- 3 files changed, 4 insertions(+), 58 deletions(-) diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 93fb54f8b5bc..d0b156e605ea 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,8 +1,7 @@ # Created by: Dirk Froemberg <dirk@FreeBSD.org> PORTNAME= openssl -PORTVERSION= 1.1.1l -PORTREVISION= 1 +PORTVERSION= 1.1.1m PORTEPOCH= 1 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ diff --git a/security/openssl/distinfo b/security/openssl/distinfo index ea60c25fc735..5c822ac8126a 100644 --- a/security/openssl/distinfo +++ b/security/openssl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629816807 -SHA256 (openssl-1.1.1l.tar.gz) = 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 -SIZE (openssl-1.1.1l.tar.gz) = 9834044 +TIMESTAMP = 1639508375 +SHA256 (openssl-1.1.1m.tar.gz) = f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 +SIZE (openssl-1.1.1m.tar.gz) = 9847315 diff --git a/security/openssl/files/patch-D33061 b/security/openssl/files/patch-D33061 deleted file mode 100644 index 2a917ab079c9..000000000000 --- a/security/openssl/files/patch-D33061 +++ /dev/null @@ -1,53 +0,0 @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112141913.1BEJDYCx095991>