[curl/f20] patch 0105 is now merged upstream

[Kamil Dudka]

commit 2efb566c50e2d633347327f82cd7ff65730cfcb6
Author: Kamil Dudka <kdudka at redhat.com>
Date:   Tue Feb 25 13:00:03 2014 +0100

    patch 0105 is now merged upstream

 ...upload.patch => 0005-curl-7.32.0-d015f4cc.patch |    2 +-
 curl.spec                                          |   10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/0105-curl-7.32.0-scp-upload.patch b/0005-curl-7.32.0-d015f4cc.patch
similarity index 95%
rename from 0105-curl-7.32.0-scp-upload.patch
rename to 0005-curl-7.32.0-d015f4cc.patch
index 73c8aee..c0fb0bf 100644
--- a/0105-curl-7.32.0-scp-upload.patch
+++ b/0005-curl-7.32.0-d015f4cc.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] ssh: improve the logic for detecting blocking direction
 This fixes a regression introduced by commit 0feeab78 limiting the speed
 of SCP upload to 16384 B/s on a fast connection (such as localhost).
 
-http://thread.gmane.org/gmane.comp.web.curl.library/40551/focus=40561
+[upstream commit d015f4ccac627852869cb45e31ccdc9fbd97dc47]
 ---
  lib/ssh.c |    8 +++++---
  1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/curl.spec b/curl.spec
index 0c5a779..825daee 100644
--- a/curl.spec
+++ b/curl.spec
@@ -19,6 +19,9 @@ Patch3: 0003-curl-7.32.0-8ae35102.patch
 # refresh expired cookie in test172 from upstream test-suite (#1068967)
 Patch4: 0004-curl-7.32.0-ffb8a21d.patch
 
+# ssh: improve the logic for detecting blocking direction
+Patch5: 0005-curl-7.32.0-d015f4cc.patch
+
 # patch making libcurl multilib ready
 Patch101: 0101-curl-7.32.0-multilib.patch
 
@@ -34,9 +37,6 @@ Patch104: 0104-curl-7.19.7-localhost6.patch
 # disable valgrind for certain test-cases (libssh2 problem)
 Patch106: 0106-curl-7.21.0-libssh2-valgrind.patch
 
-# http://thread.gmane.org/gmane.comp.web.curl.library/40551/focus=40561
-Patch105: 0105-curl-7.32.0-scp-upload.patch
-
 # work around valgrind bug (#678518)
 Patch107: 0107-curl-7.21.4-libidn-valgrind.patch
 
@@ -123,9 +123,7 @@ documentation of the library, too.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-
-# patches not yet upstream
-%patch105 -p1
+%patch5 -p1
 
 # Fedora patches
 %patch101 -p1