openssl: update to 1.1.1l.

This commit is contained in:
Érico Nogueira 2021-08-24 12:09:47 -03:00 committed by Érico Nogueira Rolim
parent 50fea77170
commit 2f698d94af
2 changed files with 14 additions and 6 deletions

View file

@ -1,6 +1,8 @@
--- a/crypto/ppccap.c.old 2020-03-17 14:31:17.000000000 +0000 diff --git a/crypto/ppccap.c b/crypto/ppccap.c
+++ b/crypto/ppccap.c 2020-03-30 06:32:25.943988524 +0000 index eeaa47c..e6eeb14 100644
@@ -207,11 +207,9 @@ --- 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; return 0;
} }
@ -8,10 +10,16 @@
-# if __GLIBC_PREREQ(2, 16) -# if __GLIBC_PREREQ(2, 16)
-# include <sys/auxv.h> -# include <sys/auxv.h>
-# define OSSL_IMPLEMENT_GETAUXVAL -# define OSSL_IMPLEMENT_GETAUXVAL
-# elif defined(__ANDROID_API__)
-/* see https://developer.android.google.cn/ndk/guides/cpu-features */
-# if __ANDROID_API__ >= 18
-# include <sys/auxv.h>
-# define OSSL_IMPLEMENT_GETAUXVAL
-# endif
-# endif -# endif
+#if defined(__linux__) +#if defined(__linux__)
+# include <sys/auxv.h> +# include <sys/auxv.h>
+# define OSSL_IMPLEMENT_GETAUXVAL +# define OSSL_IMPLEMENT_GETAUXVAL
#endif #endif
/* I wish <sys/auxv.h> was universally available */ #if defined(__FreeBSD__)

View file

@ -1,6 +1,6 @@
# Template file for 'openssl' # Template file for 'openssl'
pkgname=openssl pkgname=openssl
version=1.1.1k version=1.1.1l
revision=1 revision=1
bootstrap=yes bootstrap=yes
build_style=configure build_style=configure
@ -17,7 +17,7 @@ maintainer="John <johnz@posteo.net>"
license="OpenSSL" license="OpenSSL"
homepage="https://www.openssl.org" homepage="https://www.openssl.org"
distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz" distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
checksum=892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5 checksum=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1
conf_files="/etc/ssl/openssl.cnf" conf_files="/etc/ssl/openssl.cnf"
replaces="libressl>=0" replaces="libressl>=0"