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, 09 Aug 2017 12:19:00
Message-Id: 1502281110.32f0c98e76c16c47c282ea1d05307da7a4d7fd4c.blueness@gentoo
1 commit: 32f0c98e76c16c47c282ea1d05307da7a4d7fd4c
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Aug 9 09:12:45 2017 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 9 12:18:30 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32f0c98e
7
8 net-misc/curl: remove unused patch
9
10 net-misc/curl/files/curl-7.52.1-fix-openssl.patch | 36 -----------------------
11 1 file changed, 36 deletions(-)
12
13 diff --git a/net-misc/curl/files/curl-7.52.1-fix-openssl.patch b/net-misc/curl/files/curl-7.52.1-fix-openssl.patch
14 deleted file mode 100644
15 index 259f618d46e..00000000000
16 --- a/net-misc/curl/files/curl-7.52.1-fix-openssl.patch
17 +++ /dev/null
18 @@ -1,36 +0,0 @@
19 -From a7b38c9dc98481e4a5fc37e51a8690337c674dfb Mon Sep 17 00:00:00 2001
20 -From: Daniel Stenberg <daniel@××××.se>
21 -Date: Mon, 26 Dec 2016 00:06:33 +0100
22 -Subject: [PATCH] vtls: s/SSLEAY/OPENSSL
23 -
24 -Fixed an old leftover use of the USE_SSLEAY define which would make a
25 -socket get removed from the applications sockets to monitor when the
26 -multi_socket API was used, leading to timeouts.
27 -
28 -Bug: #1174
29 ----
30 - lib/vtls/vtls.c | 4 ++--
31 - 1 file changed, 2 insertions(+), 2 deletions(-)
32 -
33 -diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
34 -index b808e1c..707f24b 100644
35 ---- a/lib/vtls/vtls.c
36 -+++ b/lib/vtls/vtls.c
37 -@@ -484,7 +484,7 @@ void Curl_ssl_close_all(struct Curl_easy *data)
38 - curlssl_close_all(data);
39 - }
40 -
41 --#if defined(USE_SSLEAY) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
42 -+#if defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
43 - defined(USE_DARWINSSL) || defined(USE_NSS)
44 - /* This function is for OpenSSL, GnuTLS, darwinssl, and schannel only. */
45 - int Curl_ssl_getsock(struct connectdata *conn, curl_socket_t *socks,
46 -@@ -518,7 +518,7 @@ int Curl_ssl_getsock(struct connectdata *conn,
47 - (void)numsocks;
48 - return GETSOCK_BLANK;
49 - }
50 --/* USE_SSLEAY || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
51 -+/* USE_OPENSSL || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
52 - #endif
53 -
54 - void Curl_ssl_close(struct connectdata *conn, int sockindex)