From b1ea39b83cbc8e4ce9f97500f2c46da4f7f3bf69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Tue, 24 Aug 2021 12:09:47 -0300 Subject: [PATCH] openssl: update to 1.1.1l. --- srcpkgs/openssl/patches/ppc-auxv.patch | 16 ++++++++++++---- srcpkgs/openssl/template | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch index 308cb2218bc9..274ac2d55998 100644 --- a/srcpkgs/openssl/patches/ppc-auxv.patch +++ b/srcpkgs/openssl/patches/ppc-auxv.patch @@ -1,6 +1,8 @@ ---- a/crypto/ppccap.c.old 2020-03-17 14:31:17.000000000 +0000 -+++ b/crypto/ppccap.c 2020-03-30 06:32:25.943988524 +0000 -@@ -207,11 +207,9 @@ +diff --git a/crypto/ppccap.c b/crypto/ppccap.c +index eeaa47c..e6eeb14 100644 +--- a/crypto/ppccap.c ++++ b/crypto/ppccap.c +@@ -207,17 +207,9 @@ size_t OPENSSL_instrument_bus2(unsigned int *out, size_t cnt, size_t max) return 0; } @@ -8,10 +10,16 @@ -# if __GLIBC_PREREQ(2, 16) -# include -# define OSSL_IMPLEMENT_GETAUXVAL +-# elif defined(__ANDROID_API__) +-/* see https://developer.android.google.cn/ndk/guides/cpu-features */ +-# if __ANDROID_API__ >= 18 +-# include +-# define OSSL_IMPLEMENT_GETAUXVAL +-# endif -# endif +#if defined(__linux__) +# include +# define OSSL_IMPLEMENT_GETAUXVAL #endif - /* I wish was universally available */ + #if defined(__FreeBSD__) diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template index 01dfd74de14d..06d83aa0d81d 100644 --- a/srcpkgs/openssl/template +++ b/srcpkgs/openssl/template @@ -1,6 +1,6 @@ # Template file for 'openssl' pkgname=openssl -version=1.1.1k +version=1.1.1l revision=1 bootstrap=yes build_style=configure @@ -17,7 +17,7 @@ maintainer="John " license="OpenSSL" homepage="https://www.openssl.org" distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz" -checksum=892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5 +checksum=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 conf_files="/etc/ssl/openssl.cnf" replaces="libressl>=0"