5 files changed, 36 insertions, 5 deletions
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 79243f75b523..2d5fdef8cd40 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,3 +1,4 @@
+AUX mbedtls-2.19.1-zlib.patch 1163 BLAKE2B a5b44c2af4d9e7dd37a004063b69ae9878bf240abcd75376c14e73b01a99586e06da1ece285cbbb06905dfbeff28c173bb9d170a9a22ad1045fa20b225185df0 SHA512 cc8128b55383caddc9a3d51a22222b5da51b41bdaa0b44ad4d9a447b85b9ac96eb7aa7c9e88823e62ec51ee5567531138741f03603c563cfe99172226e61ed73
 AUX mbedtls-dont-overwrite-headers.patch 2183 BLAKE2B 1353eb9c929e4d79bc1f4eecd671c9b6602917198724b42e1b43153a4751cd5a36737fd706f97e933beb857a246dc16574f4d989cc674661dd774f7df9d1c3a3 SHA512 19dec50ce70821b0c94e7bd9c50c1f8ebd7d7abc087cb91a637e5349ac938b4b07236f7fc4580e4a348ecb9de68d4b0b45cdced6e5103ce94178be710b2563a3
 AUX mbedtls-un-pebcak-705038-wrong-file.patch 2766 BLAKE2B df7ef73f53f4a2b69cc8b435d21decffb580d28e75b9ec52620c305dfc395cc088cf7e4bbcaad381a3c9f8587b1678700d8df1cd65ceeef8079e4ed250ec9ec7 SHA512 376a5c7009122b60345b9edc3ce8a2f765d1c7ef11f6a398a9b9fe1c6e4a9d36d62483f036a6c77e21fc86f2900d9d3a7c477582463a80121097a56cb08a0515
 DIST mbedcrypto-1.1.0d0.tar.gz 2907562 BLAKE2B 645b8eac1c55e6217d7b309e1b9ddf856f6d565f928e04211bb5714189024bff8f445a8e6c709d6b2e700d9390521cc31d194f4a98f7f211af3ca9b7109d7549 SHA512 923f8b18eaabae56015607442e996d77ddfd68443e3d33176ba9fe1c5a53fe611af584b5d8dc2111fbda41e5396921d6be9a3a3837cd4d85671237e0932f5cc2
@@ -9,11 +10,11 @@ DIST mbedtls-2.16.4.tar.gz 2597922 BLAKE2B 787837903e1d9a5951e3b379b17e82bb68575
 DIST mbedtls-2.17.0.tar.gz 2738368 BLAKE2B efcf2a6c84a85afdca0205bd9e8bcf039074c5e6f40e0814f835cf26c2d13dce87bd140aa0b803eea6a683e31b79680a3ea8ba72417e7ec26f206e0b027b014a SHA512 6ab52d116cb9f755871f2fd196ec1b352dbbe59f2ecedeb5551237e4e672da77205ef0c2f80ec746ba1fd94cab1995ab1729c8adb0f29d10f3c74a67f5327493
 DIST mbedtls-2.18.1.tar.gz 2810688 BLAKE2B 25e8cfdb16e18049e4c89e271babe5b711634099ef89c54169e606da7aabedde1ac862ecd34dbe05e8052ea0183a7aa3b575d431305af4f8ecdd22da0f79f103 SHA512 39d1844806a0312ad97236d247e624fca15f10d7aff2336e764f214594a505f5109d6407fe6d399171086376124bc74da0c0f0b7aa9db85fa41f70143f04b95b
 DIST mbedtls-2.19.1.tar.gz 1165843 BLAKE2B c8e6764b493a6ca011e74d7b297d5ae5140d7bdf17c1cfd5b9d37913d615ad3c5a6dbf71d44cbf14c938646e51bbf04cd63cc1657eb3775addb2dee3ee94c587 SHA512 07ec1cdf98e51ed35bb2940e485d7d8422e9fd440d2077d5cd4c80781d73848228386fe9064773ef8bb1a02c1bc060185b9c8310349d695926bd2c9b7cf6582b
-EBUILD mbedtls-2.10.0.ebuild 2416 BLAKE2B 626b1145edf90a7e1954d5a8cc8e35c01f5b809800d38eaad76f73d39f1256a64cd14db746d297618cc2d3a117ca0076aea5aef8de35c9fb53fe19ee15b31066 SHA512 5faa1d14668f99cd197e5b4f0b60f3402030a4946162fdfd252248dd7293dc5b64e23414eb0e27bc48f8afa7d60d5cb92407c1b5e37142b8285978f800c5dd94
-EBUILD mbedtls-2.12.0.ebuild 2444 BLAKE2B 0740c892c457e183584389396a44c6c027c10257e702acaab9c4f673b8a0d38ae90b4369e13b313c7629e44e801aef196df85aa56c452ebcc42efdb20cf912d9 SHA512 0d076a66dca5edc256b1361d76190779c61c3328aec0bf749b76cd3120d3021181849354329e353bc58f8790841a1a9a6f7e204ab22f913f5923b98f5473a2b4
+EBUILD mbedtls-2.10.0.ebuild 2416 BLAKE2B 534b176815921b6702ba50c8432320a56563ebcb07cbf1a129841d115f83b71c98e0c942e57e9c84a53410823728cd7c3fe10d090e17d21260918cb297c58f2c SHA512 3950efb017bb0423b3860888fb028db24bc1422b78b8c16b9c2bc5c3af3fb1a66c75c43c902578f779838893baf79cab513e9cd4de7d885e31a3a2abf06665e3
+EBUILD mbedtls-2.12.0.ebuild 2444 BLAKE2B 9de15ee64d5b6eb1b115c0a401a5141361a5f6c7f4375d40901a7a6358bed7776b8605e5bc9585d5cf4957f4e140a7b2c99f1f2fecf6c68a1a1a4125a2c2ad86 SHA512 05d35d1bbc857d0928a03b6083d68e1d798f5bcd317ed5ed1ac76547b0d09716accbd192288fd480de4fbab49c0a715fb8eff7e320ca910f641b043e673e2416
 EBUILD mbedtls-2.16.3.ebuild 2453 BLAKE2B ec479c9bfd5f505af48b1e4721e8750ff27a2c2688553ee95bfbde387db9e8fe88444ac7a4ac7a4a0c94f655d733889d19aa2d7542615399f87f8fbcd1c4d8ac SHA512 fa0832b7ff8501f8dd9e012d717d8de23a3921d8dc7834884fce5d3b2c8d68b7f144a3c89031fdc6edabeda6b21068803f4b07f8727e09ca5636c21538c3108f
 EBUILD mbedtls-2.16.4.ebuild 2453 BLAKE2B 15cf4dc369f789a3cb945b194c448e5ae85a9b529f38d7453f8b4d117c6a92ca1af7c04740b28c7f291885943250f527720447a439fcdb06b0eff2f763383e3b SHA512 ff4b622b5b2d071ac3f67a44565a6255e4c4d85a254f19e2ec5f2333063f187372b04440af9924fa3e66e55df7540eaf6990c22237932a1f600177faf49de14f
 EBUILD mbedtls-2.17.0.ebuild 2453 BLAKE2B ec479c9bfd5f505af48b1e4721e8750ff27a2c2688553ee95bfbde387db9e8fe88444ac7a4ac7a4a0c94f655d733889d19aa2d7542615399f87f8fbcd1c4d8ac SHA512 fa0832b7ff8501f8dd9e012d717d8de23a3921d8dc7834884fce5d3b2c8d68b7f144a3c89031fdc6edabeda6b21068803f4b07f8727e09ca5636c21538c3108f
 EBUILD mbedtls-2.18.1-r2.ebuild 2800 BLAKE2B 8db411d90f17c45c25724daf1632c849f759b4aa7dffb5527eaa9d39f22a7d477a6a263bec9e18082d7df80f100864596015f4f8b34a59983be913cf12797d9f SHA512 fb6e726875ac330dc6fb54d587c39c43ca5da6bbe7e07dcab549b8cf1cfac83068f2acdc9cc1837180226842f27a69e5c1fb7880c355b7e9577fcddd42bb80d8
-EBUILD mbedtls-2.19.1-r2.ebuild 2798 BLAKE2B 970970a590d22c6df97b716c1820cd32b1e07e81d45832125a6c811d8075f51912ffdbc36ed8a49ce0ee415da4d675377629fcbdc7d699e53597b58b4c11162c SHA512 66674721588a0fd3dea4b1c689398a9018ff5ebb30adc0025b51fc72ab7c734edd9aeacf5a8401bc49bbdd0a09f892c2c1e0f7a4505596ce60ae56bf850b984a
+EBUILD mbedtls-2.19.1-r2.ebuild 2845 BLAKE2B 9efc07936fbf097d8b1424b0f40be2f335ab367a83940a5d29e0b84ead90ead7acc2bfd4b82415a1c6bc74ac69d5172e86ada9cca312b956b306ab136f3e9654 SHA512 14529f237086d9e3a837beb2287fa13213fbf67db3b641de2f1e483361ce482dd3f31ba9ba2502b40308f4562ec079e2987b21a3b512cd856a0cfe362dd13dd0
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/files/mbedtls-2.19.1-zlib.patch b/net-libs/mbedtls/files/mbedtls-2.19.1-zlib.patch
new file mode 100644
index 000000000000..ba4559cfc9be
--- /dev/null
+++ b/net-libs/mbedtls/files/mbedtls-2.19.1-zlib.patch
@@ -0,0 +1,29 @@
+From 9f25b8deff8e5b8fad8493db421b4639f14d2e5d Mon Sep 17 00:00:00 2001
+From: jiblime <47689567+jiblime@users.noreply.github.com>
+Date: Wed, 18 Dec 2019 21:40:01 -0800
+Subject: [PATCH] Fixes definition error when the deprecated
+ MBEDTLS_ZLIB_SUPPORT and ENABLE_ZLIB_SUPPORT macro are defined/enabled for
+ zlib support in mbedtls
+
+100% tests passed, 0 tests failed out of 85
+
+https://github.com/ARMmbed/mbedtls/blob/mbedtls-2.19.1/library/ssl_tls.c#L1842
+
+https://github.com/ARMmbed/mbedtls/blob/mbedtls-2.19.1/library/ssl_tls.c#L1862
+---
+ library/ssl_tls.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/library/ssl_tls.c b/library/ssl_tls.c
+index 6cf7781f2a..51ae9da3c6 100644
+--- a/library/ssl_tls.c
++++ b/library/ssl_tls.c
+@@ -1880,7 +1880,7 @@ int mbedtls_ssl_derive_keys( mbedtls_ssl_context *ssl )
+ 
+     /* Allocate compression buffer */
+ #if defined(MBEDTLS_ZLIB_SUPPORT)
+-    if( session->compression == MBEDTLS_SSL_COMPRESS_DEFLATE &&
++    if( ssl->session_negotiate->compression == MBEDTLS_SSL_COMPRESS_DEFLATE &&
+         ssl->compress_buf == NULL )
+     {
+         MBEDTLS_SSL_DEBUG_MSG( 3, ( "Allocating compression buffer" ) );
diff --git a/net-libs/mbedtls/mbedtls-2.10.0.ebuild b/net-libs/mbedtls/mbedtls-2.10.0.ebuild
index 2b2e0e4dae47..1269fff75f46 100644
--- a/net-libs/mbedtls/mbedtls-2.10.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-libs/mbedtls/mbedtls-2.12.0.ebuild b/net-libs/mbedtls/mbedtls-2.12.0.ebuild
index f13ebc89e9a4..aa88a987df3b 100644
--- a/net-libs/mbedtls/mbedtls-2.12.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild b/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild
index a18fc8919884..55ffc2164a72 100644
--- a/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild
@@ -39,6 +39,7 @@ enable_mbedtls_option() {
 PATCHES=(
 	"${FILESDIR}"/${PN}-dont-overwrite-headers.patch
 	"${FILESDIR}"/${PN}-un-pebcak-705038-wrong-file.patch
+	"${FILESDIR}"/${PN}-2.19.1-zlib.patch #706112
 )
 
 src_prepare() {