[packages/curl] - rel 2; drop gnutls patch as it was fixed differently in upstream
arekm
arekm at pld-linux.org
Fri Nov 23 21:49:49 CET 2012
commit 75b71e7d76932602e25161d5e179b747ff973d68
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri Nov 23 21:49:45 2012 +0100
- rel 2; drop gnutls patch as it was fixed differently in upstream
curl-gnutls.patch | 33 ---------------------------------
1 file changed, 33 deletions(-)
---
diff --git a/curl-gnutls.patch b/curl-gnutls.patch
deleted file mode 100644
index e023471..0000000
--- a/curl-gnutls.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1a02e84589efb3f8717d50bdc78d3f369b799198 Mon Sep 17 00:00:00 2001
-From: Alessandro Ghedini <al3xbio at gmail.com>
-Date: Mon, 15 Oct 2012 16:06:54 +0200
-Subject: [PATCH] gnutls: put reset code into else block
-
-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=690551
----
- lib/gtls.c | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/lib/gtls.c b/lib/gtls.c
-index 3b4dc40..f5f95ae 100644
---- a/lib/gtls.c
-+++ b/lib/gtls.c
-@@ -309,10 +309,11 @@ static CURLcode handshake(struct connectdata *conn,
- failf(data, "gnutls_handshake() failed: %s", gnutls_strerror(rc));
- return CURLE_SSL_CONNECT_ERROR;
- }
--
-- /* Reset our connect state machine */
-- connssl->connecting_state = ssl_connect_1;
-- return CURLE_OK;
-+ else {
-+ /* Reset our connect state machine */
-+ connssl->connecting_state = ssl_connect_1;
-+ return CURLE_OK;
-+ }
- }
- }
-
---
-1.7.10
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/curl.git/commitdiff/75b71e7d76932602e25161d5e179b747ff973d68
More information about the pld-cvs-commit
mailing list