1 |
commit: 5b410baabbda721370fef400b1d9a298760c7d04 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 11 11:18:21 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 11 11:19:34 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b410baa |
7 |
|
8 |
net-libs/mbedtls: Fixed compilation with USE="zlib" |
9 |
|
10 |
Closes: https://bugs.gentoo.org/706112 |
11 |
Package-Manager: Portage-2.3.88, Repoman-2.3.20 |
12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
13 |
|
14 |
net-libs/mbedtls/files/mbedtls-2.19.1-zlib.patch | 29 ++++++++++++++++++++++++ |
15 |
net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild | 1 + |
16 |
2 files changed, 30 insertions(+) |
17 |
|
18 |
diff --git a/net-libs/mbedtls/files/mbedtls-2.19.1-zlib.patch b/net-libs/mbedtls/files/mbedtls-2.19.1-zlib.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..ba4559cfc9b |
21 |
--- /dev/null |
22 |
+++ b/net-libs/mbedtls/files/mbedtls-2.19.1-zlib.patch |
23 |
@@ -0,0 +1,29 @@ |
24 |
+From 9f25b8deff8e5b8fad8493db421b4639f14d2e5d Mon Sep 17 00:00:00 2001 |
25 |
+From: jiblime <47689567+jiblime@××××××××××××××××××××.com> |
26 |
+Date: Wed, 18 Dec 2019 21:40:01 -0800 |
27 |
+Subject: [PATCH] Fixes definition error when the deprecated |
28 |
+ MBEDTLS_ZLIB_SUPPORT and ENABLE_ZLIB_SUPPORT macro are defined/enabled for |
29 |
+ zlib support in mbedtls |
30 |
+ |
31 |
+100% tests passed, 0 tests failed out of 85 |
32 |
+ |
33 |
+https://github.com/ARMmbed/mbedtls/blob/mbedtls-2.19.1/library/ssl_tls.c#L1842 |
34 |
+ |
35 |
+https://github.com/ARMmbed/mbedtls/blob/mbedtls-2.19.1/library/ssl_tls.c#L1862 |
36 |
+--- |
37 |
+ library/ssl_tls.c | 2 +- |
38 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
39 |
+ |
40 |
+diff --git a/library/ssl_tls.c b/library/ssl_tls.c |
41 |
+index 6cf7781f2a..51ae9da3c6 100644 |
42 |
+--- a/library/ssl_tls.c |
43 |
++++ b/library/ssl_tls.c |
44 |
+@@ -1880,7 +1880,7 @@ int mbedtls_ssl_derive_keys( mbedtls_ssl_context *ssl ) |
45 |
+ |
46 |
+ /* Allocate compression buffer */ |
47 |
+ #if defined(MBEDTLS_ZLIB_SUPPORT) |
48 |
+- if( session->compression == MBEDTLS_SSL_COMPRESS_DEFLATE && |
49 |
++ if( ssl->session_negotiate->compression == MBEDTLS_SSL_COMPRESS_DEFLATE && |
50 |
+ ssl->compress_buf == NULL ) |
51 |
+ { |
52 |
+ MBEDTLS_SSL_DEBUG_MSG( 3, ( "Allocating compression buffer" ) ); |
53 |
|
54 |
diff --git a/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild b/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild |
55 |
index a18fc891988..55ffc2164a7 100644 |
56 |
--- a/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild |
57 |
+++ b/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild |
58 |
@@ -39,6 +39,7 @@ enable_mbedtls_option() { |
59 |
PATCHES=( |
60 |
"${FILESDIR}"/${PN}-dont-overwrite-headers.patch |
61 |
"${FILESDIR}"/${PN}-un-pebcak-705038-wrong-file.patch |
62 |
+ "${FILESDIR}"/${PN}-2.19.1-zlib.patch #706112 |
63 |
) |
64 |
|
65 |
src_prepare() { |