diff options
Diffstat (limited to 'security/openssl-devel')
| -rw-r--r-- | security/openssl-devel/Makefile | 3 | ||||
| -rw-r--r-- | security/openssl-devel/distinfo | 6 | ||||
| -rw-r--r-- | 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 <dirk@FreeBSD.org> 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 |