fix openssl patch, bump libcurl and ca-certificates

This commit is contained in:
Lucy Phipps 2021-04-13 18:29:16 +01:00
parent b140469277
commit 17c9b24197
No known key found for this signature in database
GPG Key ID: 8F688A3DB7869BFE
4 changed files with 7 additions and 7 deletions

View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Common CA certificates"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=20210413
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://curl.se/ca/cacert.pem
# If the checksum has changed, it may be time to update the package version:
TERMUX_PKG_SHA256=533610ad2b004c1622a40622f86ced5e89762e1c0e4b3ae08b31b240d863e91f

View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Easy-to-use client-side URL transfer library"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=7.76.0
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://curl.se/download/curl-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SHA256=e29bfe3633701590d75b0071bbb649ee5ca4ca73f00649268bd389639531c49a
TERMUX_PKG_DEPENDS="libnghttp2, libssh2, openssl (>= 1.1.1), zlib"

View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Library implementing the SSL and TLS protocols as well a
TERMUX_PKG_LICENSE="BSD"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.1.1k
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://www.openssl.org/source/openssl-${TERMUX_PKG_VERSION/\~/-}.tar.gz
TERMUX_PKG_SHA256=892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5
TERMUX_PKG_DEPENDS="ca-certificates, zlib"

View File

@ -1,7 +1,7 @@
diff -u -r ../openssl-1.1.1c/crypto/armcap.c ./crypto/armcap.c
--- ../openssl-1.1.1c/crypto/armcap.c 2019-05-28 13:12:21.000000000 +0000
+++ ./crypto/armcap.c 2019-06-23 19:53:23.465656000 +0000
@@ -63,12 +63,8 @@
@@ -65,12 +65,8 @@
void OPENSSL_cpuid_setup(void) __attribute__ ((constructor));
# endif
@ -11,6 +11,6 @@ diff -u -r ../openssl-1.1.1c/crypto/armcap.c ./crypto/armcap.c
# define OSSL_IMPLEMENT_GETAUXVAL
-# endif
-# endif
/*
* ARM puts the feature bits for Crypto Extensions in AT_HWCAP2, whereas
# if defined(__FreeBSD__)
# include <sys/param.h>
# if __FreeBSD_version >= 1200000