From c293c563b773bd11953f2933088293ba799897cd Mon Sep 17 00:00:00 2001 From: Butta Date: Mon, 17 Aug 2020 12:23:56 +0530 Subject: [PATCH] mbedtls: update from 2.22.0 to 2.23.0 and add fix for ARMmbed/mbedtls#2977 --- packages/mbedtls/build.sh | 2 +- packages/mbedtls/library-net_sockets.c.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 packages/mbedtls/library-net_sockets.c.patch diff --git a/packages/mbedtls/build.sh b/packages/mbedtls/build.sh index fa9743354..b5be0ca42 100644 --- a/packages/mbedtls/build.sh +++ b/packages/mbedtls/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://tls.mbed.org/ TERMUX_PKG_DESCRIPTION="Light-weight cryptographic and SSL/TLS library" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_SRCURL=https://github.com/ARMmbed/mbedtls.git -TERMUX_PKG_VERSION=2.22.0 +TERMUX_PKG_VERSION=2.23.0 TERMUX_PKG_GIT_BRANCH=mbedtls-$TERMUX_PKG_VERSION TERMUX_PKG_BREAKS="mbedtls-dev" TERMUX_PKG_REPLACES="mbedtls-dev" diff --git a/packages/mbedtls/library-net_sockets.c.patch b/packages/mbedtls/library-net_sockets.c.patch new file mode 100644 index 000000000..9eac67cd3 --- /dev/null +++ b/packages/mbedtls/library-net_sockets.c.patch @@ -0,0 +1,13 @@ +diff --git a/library/net_sockets.c b/library/net_sockets.c +index b26e858..8160d9e 100644 +--- a/library/net_sockets.c ++++ b/library/net_sockets.c +@@ -324,7 +324,7 @@ int mbedtls_net_accept( mbedtls_net_context *bind_ctx, + + #if defined(__socklen_t_defined) || defined(_SOCKLEN_T) || \ + defined(_SOCKLEN_T_DECLARED) || defined(__DEFINED_socklen_t) || \ +- defined(socklen_t) ++ defined(socklen_t) || defined(__BIONIC__) + socklen_t n = (socklen_t) sizeof( client_addr ); + socklen_t type_len = (socklen_t) sizeof( type ); + #else