[curl/f19] patch 0105 is now merged upstream
Kamil Dudka
kdudka at fedoraproject.org
Tue Feb 25 12:37:27 UTC 2014
commit 8c3277bbfd3da77c8277395b7524ac8549e8f973
Author: Kamil Dudka <kdudka at redhat.com>
Date: Tue Feb 25 13:00:03 2014 +0100
patch 0105 is now merged upstream
...upload.patch => 0015-curl-7.29.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/0015-curl-7.29.0-d015f4cc.patch
similarity index 95%
rename from 0105-curl-7.32.0-scp-upload.patch
rename to 0015-curl-7.29.0-d015f4cc.patch
index 73c8aee..c0fb0bf 100644
--- a/0105-curl-7.32.0-scp-upload.patch
+++ b/0015-curl-7.29.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 f19528e..1777d5d 100644
--- a/curl.spec
+++ b/curl.spec
@@ -46,6 +46,9 @@ Patch12: 0012-curl-7.29.0-c639d725.patch
# re-use of wrong HTTP NTLM connection in libcurl (CVE-2014-0015)
Patch14: 0014-curl-7.29.0-8ae35102.patch
+# ssh: improve the logic for detecting blocking direction
+Patch15: 0015-curl-7.29.0-d015f4cc.patch
+
# refresh expired cookie in test172 from upstream test-suite (#1068967)
Patch17: 0017-curl-7.29.0-ffb8a21d.patch
@@ -61,9 +64,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
@@ -158,11 +158,9 @@ documentation of the library, too.
%patch11 -p1
%patch12 -p1
%patch14 -p1
+%patch15 -p1
%patch17 -p1
-# patches not yet upstream
-%patch105 -p1
-
# Fedora patches
%patch101 -p1
%patch102 -p1
More information about the scm-commits
mailing list