diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-03-30 06:45:06 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-03-30 06:45:06 +0000 |
| commit | 05f1e6cb26860fab986910e372df549ef4c51e49 (patch) | |
| tree | 8551dffb3b43485589ab6574046889c10569af21 | |
| parent | d5a2d4b0847392305e7de2bca65d30987bd0ca7e (diff) | |
| download | packages-05f1e6cb26860fab986910e372df549ef4c51e49.tar.gz packages-05f1e6cb26860fab986910e372df549ef4c51e49.tar.bz2 packages-05f1e6cb26860fab986910e372df549ef4c51e49.tar.xz packages-05f1e6cb26860fab986910e372df549ef4c51e49.zip | |
system/openssl: Bump to 1.1.1e, fix auxv on PowerPC platforms
| -rw-r--r-- | system/openssl/APKBUILD | 10 | ||||
| -rw-r--r-- | system/openssl/ppc-auxv.patch | 17 | ||||
| -rw-r--r-- | system/openssl/ppc64.patch | 2 |
3 files changed, 23 insertions, 6 deletions
diff --git a/system/openssl/APKBUILD b/system/openssl/APKBUILD index 070d3d0e2..812836bc9 100644 --- a/system/openssl/APKBUILD +++ b/system/openssl/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openssl -pkgver=1.1.1d +pkgver=1.1.1e pkgrel=0 pkgdesc="Toolkit for SSL and TLS" url="https://www.openssl.org/" @@ -12,7 +12,7 @@ makedepends_build="perl" subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc libcrypto1.1:libcrypto libssl1.1:libssl" source="https://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz - CVE-2019-1551.patch + ppc-auxv.patch ppc64.patch " @@ -127,6 +127,6 @@ libssl() { done } -sha512sums="2bc9f528c27fe644308eb7603c992bac8740e9f0c3601a130af30c9ffebbf7e0f5c28b76a00bbb478bad40fbe89b4223a58d604001e1713da71ff4b7fe6a08a7 openssl-1.1.1d.tar.gz -11ca61515a89766241fe0fae27f3b39767128915f288ea88840bf93e8b50ac416024cb2153efcdf2658d3e82a8e4250a0c069333dbd7347475f9dafcc45370b5 CVE-2019-1551.patch -66bbb0ae769643c8a0b1501d9c8466f08f0d8b3b2bc4fcc2c0c054ab1971ced85c07aa0e4b8168a4394d0ae407dfbd26066a7a068602ce5b58e459b12ce6d36a ppc64.patch" +sha512sums="dbc2124f6ce9f1927e2f5e03101ed565d4e52ef09d620200f5cd9372c88c65dd7d74b24b31a8bf404713a5adfab80e0c3b25bf538c52702c4c3af1d80aef16c2 openssl-1.1.1e.tar.gz +c164dd528d7408b8b2a52a0b181f2066ff00feb635df863bdeb4ce879db9ecdf7dd9033bb14b63ee5239aa814d5d777a86bb99cc37ecedae2d77a6bd86144b88 ppc-auxv.patch +e040f23770d52b988578f7ff84d77563340f37c026db7643db8e4ef18e795e27d10cb42cb8656da4d9c57a28283a2828729d70f940edc950c3422a54fea55509 ppc64.patch" diff --git a/system/openssl/ppc-auxv.patch b/system/openssl/ppc-auxv.patch new file mode 100644 index 000000000..e19d8df1f --- /dev/null +++ b/system/openssl/ppc-auxv.patch @@ -0,0 +1,17 @@ +--- openssl-1.1.1e/crypto/ppccap.c.old 2020-03-17 14:31:17.000000000 +0000 ++++ openssl-1.1.1e/crypto/ppccap.c 2020-03-30 06:32:25.943988524 +0000 +@@ -207,11 +207,9 @@ + return 0; + } + +-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) +-# if __GLIBC_PREREQ(2, 16) +-# include <sys/auxv.h> +-# define OSSL_IMPLEMENT_GETAUXVAL +-# endif ++#if defined(__linux__) ++# include <sys/auxv.h> ++# define OSSL_IMPLEMENT_GETAUXVAL + #endif + + /* I wish <sys/auxv.h> was universally available */ diff --git a/system/openssl/ppc64.patch b/system/openssl/ppc64.patch index 5f79c4ddc..c75ceedba 100644 --- a/system/openssl/ppc64.patch +++ b/system/openssl/ppc64.patch @@ -78,7 +78,7 @@ diff --git a/Configure b/Configure index 22082deb4c7..e303d98deb3 100755 --- a/Configure +++ b/Configure -@@ -1411,8 +1410,15 @@ +@@ -1402,8 +1402,15 @@ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC}); my %predefined_CXX = $config{CXX} ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX}) |