mbedtls: Update patches. Add links to PRs.

6 files changed, 47 insertions, 15 deletions

diff --git a/security/mbedtls/Makefile b/security/mbedtls/Makefile
index 8eec6272971..2b467458be2 100644
--- a/security/mbedtls/Makefile
+++ b/security/mbedtls/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2020/04/18 14:21:56 nia Exp $
+# $NetBSD: Makefile,v 1.15 2020/06/11 11:43:50 nia Exp $
 
 DISTNAME=	mbedtls-2.16.6-apache
 PKGNAME=	${DISTNAME:-apache=}
+PKGREVISION=	1
 CATEGORIES=	security devel
 MASTER_SITES=	https://tls.mbed.org/download/
 EXTRACT_SUFX=	.tgz
diff --git a/security/mbedtls/distinfo b/security/mbedtls/distinfo
index ada4b07d3ac..5fddc4de54e 100644
--- a/security/mbedtls/distinfo
+++ b/security/mbedtls/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.10 2020/06/02 15:07:59 nia Exp $
+$NetBSD: distinfo,v 1.11 2020/06/11 11:43:50 nia Exp $
 
 SHA1 (mbedtls-2.16.6-apache.tgz) = 3cb5b681597a5bd798d31038c129c0dc911d8a2c
 RMD160 (mbedtls-2.16.6-apache.tgz) = da5ede944292874afdb24a8fe21c643b34255206
 SHA512 (mbedtls-2.16.6-apache.tgz) = a0c48b694d7bc70256d26c44bfb2ac802428560b02e50fe2e47762bc595e2c7b8fac934badb3452acb01d8a54386eafae0ff2894320d24ab7554f1c8e6cb4bcf
 Size (mbedtls-2.16.6-apache.tgz) = 2699220 bytes
-SHA1 (patch-library_net__sockets.c) = cd8f9cf84947800eb73d004847789626511ceb35
-SHA1 (patch-programs_aes_aescrypt2.c) = 216cc7cb0b5530897ea5ca194128b8928def5f16
-SHA1 (patch-programs_aes_crypt__and__hash.c) = 3c2d72abf89d5e29d434abb6d745c0d086496556
+SHA1 (patch-library_net__sockets.c) = dc1b304432a2837f72035245a3bc8f1cfcaacbd9
+SHA1 (patch-programs_aes_aescrypt2.c) = ffce071071ba00c37441973e2305d93a2374c748
+SHA1 (patch-programs_aes_crypt__and__hash.c) = 29bd90a0cb2cb4d970c57e57aad6318949479137
+SHA1 (patch-programs_ssl_ssl__mail__client.c) = 739bae07a927977fc701e2decaefaa464c38d2bb
diff --git a/security/mbedtls/patches/patch-library_net__sockets.c b/security/mbedtls/patches/patch-library_net__sockets.c
index d3d7020dfea..c2f794d42dc 100644
--- a/security/mbedtls/patches/patch-library_net__sockets.c
+++ b/security/mbedtls/patches/patch-library_net__sockets.c
@@ -1,16 +1,26 @@
-$NetBSD: patch-library_net__sockets.c,v 1.2 2018/12/21 09:43:00 wiz Exp $
+$NetBSD: patch-library_net__sockets.c,v 1.3 2020/06/11 11:43:50 nia Exp $
 
-Comment out _POSIX_C_SOURCE, this makes sockaddr_storage unavailable on NetBSD.
-https://github.com/ARMmbed/mbedtls/issues/2310
+Make sure sockaddr_storage and socklen_t are available on NetBSD.
 
---- library/net_sockets.c.orig	2018-12-02 13:20:52.000000000 +0000
+https://github.com/ARMmbed/mbedtls/pull/3422
+
+--- library/net_sockets.c.orig	2020-04-09 13:12:23.000000000 +0000
 +++ library/net_sockets.c
-@@ -22,7 +22,7 @@
- /* Enable definition of getaddrinfo() even when compiling with -std=c99. Must
+@@ -23,6 +23,7 @@
   * be set before config.h, which pulls in glibc's features.h indirectly.
   * Harmless on other platforms. */
--#define _POSIX_C_SOURCE 200112L
-+//#define _POSIX_C_SOURCE 200112L
+ #define _POSIX_C_SOURCE 200112L
++#define _XOPEN_SOURCE 600 /* sockaddr_storage */
  
  #if !defined(MBEDTLS_CONFIG_FILE)
  #include "mbedtls/config.h"
+@@ -319,7 +320,8 @@ int mbedtls_net_accept( mbedtls_net_cont
+     struct sockaddr_storage client_addr;
+ 
+ #if defined(__socklen_t_defined) || defined(_SOCKLEN_T) ||  \
+-    defined(_SOCKLEN_T_DECLARED) || defined(__DEFINED_socklen_t)
++    defined(_SOCKLEN_T_DECLARED) || defined(__DEFINED_socklen_t) || \
++    defined(socklen_t)
+     socklen_t n = (socklen_t) sizeof( client_addr );
+     socklen_t type_len = (socklen_t) sizeof( type );
+ #else
diff --git a/security/mbedtls/patches/patch-programs_aes_aescrypt2.c b/security/mbedtls/patches/patch-programs_aes_aescrypt2.c
index be6ca7d754d..1303df0e62e 100644
--- a/security/mbedtls/patches/patch-programs_aes_aescrypt2.c
+++ b/security/mbedtls/patches/patch-programs_aes_aescrypt2.c
@@ -1,8 +1,10 @@
-$NetBSD: patch-programs_aes_aescrypt2.c,v 1.1 2020/06/02 15:07:59 nia Exp $
+$NetBSD: patch-programs_aes_aescrypt2.c,v 1.2 2020/06/11 11:43:50 nia Exp $
 
 Not actually so harmless on SunOS, which requires at least 200112L
 when compiling c99.
 
+https://github.com/ARMmbed/mbedtls/pull/3421
+
 --- programs/aes/aescrypt2.c.orig	2020-04-09 13:12:23.000000000 +0000
 +++ programs/aes/aescrypt2.c
 @@ -22,7 +22,7 @@
diff --git a/security/mbedtls/patches/patch-programs_aes_crypt__and__hash.c b/security/mbedtls/patches/patch-programs_aes_crypt__and__hash.c
index e8d5441b25a..0488915b746 100644
--- a/security/mbedtls/patches/patch-programs_aes_crypt__and__hash.c
+++ b/security/mbedtls/patches/patch-programs_aes_crypt__and__hash.c
@@ -1,8 +1,10 @@
-$NetBSD: patch-programs_aes_crypt__and__hash.c,v 1.1 2020/06/02 15:07:59 nia Exp $
+$NetBSD: patch-programs_aes_crypt__and__hash.c,v 1.2 2020/06/11 11:43:50 nia Exp $
 
 Not actually so harmless on SunOS, which requires at least 200112L
 when compiling c99.
 
+https://github.com/ARMmbed/mbedtls/pull/3421
+
 --- programs/aes/crypt_and_hash.c.orig	2020-04-09 13:12:23.000000000 +0000
 +++ programs/aes/crypt_and_hash.c
 @@ -23,7 +23,7 @@
diff --git a/security/mbedtls/patches/patch-programs_ssl_ssl__mail__client.c b/security/mbedtls/patches/patch-programs_ssl_ssl__mail__client.c
new file mode 100644
index 00000000000..ce2fc524d79
--- /dev/null
+++ b/security/mbedtls/patches/patch-programs_ssl_ssl__mail__client.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-programs_ssl_ssl__mail__client.c,v 1.1 2020/06/11 11:43:50 nia Exp $
+
+Make sure gethostname is available on NetBSD.
+
+https://github.com/ARMmbed/mbedtls/pull/3422
+
+--- programs/ssl/ssl_mail_client.c.orig	2020-04-09 13:12:23.000000000 +0000
++++ programs/ssl/ssl_mail_client.c
+@@ -23,6 +23,7 @@
+  * be set before config.h, which pulls in glibc's features.h indirectly.
+  * Harmless on other platforms. */
+ #define _POSIX_C_SOURCE 200112L
++#define _XOPEN_SOURCE 600
+ 
+ #if !defined(MBEDTLS_CONFIG_FILE)
+ #include "mbedtls/config.h"