Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/
Date: Wed, 01 Feb 2017 14:45:17
Message-Id: 1485960308.5e53b2d24b8e4abb071da123a81980093c76044c.blueness@gentoo
1 commit: 5e53b2d24b8e4abb071da123a81980093c76044c
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 1 14:44:10 2017 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 1 14:45:08 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e53b2d2
7
8 net-misc/curl: remove unused patch
9
10 Package-Manager: portage-2.3.3
11
12 net-misc/curl/files/curl-fix-mbedtls.patch | 37 ------------------------------
13 1 file changed, 37 deletions(-)
14
15 diff --git a/net-misc/curl/files/curl-fix-mbedtls.patch b/net-misc/curl/files/curl-fix-mbedtls.patch
16 deleted file mode 100644
17 index b82e4c6..00000000
18 --- a/net-misc/curl/files/curl-fix-mbedtls.patch
19 +++ /dev/null
20 @@ -1,37 +0,0 @@
21 -This addresses bug #599092
22 -
23 -https://bugs.gentoo.org/show_bug.cgi?id=599092
24 -
25 -commit 9ea3a6e150dfc822ba1565f649b634848597d2d9
26 -Author: Daniel Stenberg <daniel@××××.se>
27 -Date: Fri Nov 4 11:13:16 2016 +0100
28 -
29 - mbedtls: fix build with mbedtls versions < 2.4.0
30 -
31 - Regression added in 62a8095e714
32 -
33 - Reported-by: Tony Kelman
34 -
35 - Discussed in #1087
36 -
37 -diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c
38 -index 24249dd..9f29ff0 100644
39 ---- a/lib/vtls/mbedtls.c
40 -+++ b/lib/vtls/mbedtls.c
41 -@@ -31,11 +31,15 @@
42 -
43 - #ifdef USE_MBEDTLS
44 -
45 -+#include <mbedtls/version.h>
46 -+#if MBEDTLS_VERSION_NUMBER >= 0x02040000
47 - #include <mbedtls/net_sockets.h>
48 -+#else
49 -+#include <mbedtls/net.h>
50 -+#endif
51 - #include <mbedtls/ssl.h>
52 - #include <mbedtls/certs.h>
53 - #include <mbedtls/x509.h>
54 --#include <mbedtls/version.h>
55 -
56 - #include <mbedtls/error.h>
57 - #include <mbedtls/entropy.h>