From 094e8186a466a34c0215f08dcf424ddf2a7383fc Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Wed, 25 Feb 2015 14:00:41 +0100 Subject: [PATCH] drop 0106-curl-7.36.0-libssh2-valgrind.patch ... which is already included upstream since curl-7_35_0-269-g02bba0c --- 0106-curl-7.36.0-libssh2-valgrind.patch | 40 ------------------------- curl.spec | 4 --- 2 files changed, 44 deletions(-) delete mode 100644 0106-curl-7.36.0-libssh2-valgrind.patch diff --git a/0106-curl-7.36.0-libssh2-valgrind.patch b/0106-curl-7.36.0-libssh2-valgrind.patch deleted file mode 100644 index e33fe50..0000000 --- a/0106-curl-7.36.0-libssh2-valgrind.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a4c56b928518439399e051406145d7d5b150a3be Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Wed, 26 Mar 2014 08:51:53 +0100 -Subject: [PATCH] disable valgrind for certain test-cases (libssh2 problem) - ---- - tests/data/test604 | 3 +++ - tests/data/test623 | 4 +++- - 2 files changed, 6 insertions(+), 1 deletions(-) - -diff --git a/tests/data/test604 b/tests/data/test604 -index af0259f..2bcf7d1 100644 ---- a/tests/data/test604 -+++ b/tests/data/test604 -@@ -29,5 +29,8 @@ disable - - 78 - -+ -+disable -+ - - -diff --git a/tests/data/test623 b/tests/data/test623 -index 19e505b..38a41d2 100644 ---- a/tests/data/test623 -+++ b/tests/data/test623 -@@ -39,6 +39,8 @@ disable - - 79 - -- -+ -+disable -+ - - --- -1.7.1 - diff --git a/curl.spec b/curl.spec index 221e624..23a3eb6 100644 --- a/curl.spec +++ b/curl.spec @@ -20,9 +20,6 @@ Patch102: 0102-curl-7.36.0-debug.patch # use localhost6 instead of ip6-localhost in the curl test-suite Patch104: 0104-curl-7.19.7-localhost6.patch -# disable valgrind for certain test-cases (libssh2 problem) -Patch106: 0106-curl-7.36.0-libssh2-valgrind.patch - # work around valgrind bug (#678518) Patch107: 0107-curl-7.21.4-libidn-valgrind.patch @@ -129,7 +126,6 @@ install -m0755 %{SOURCE3} tests/ %patch101 -p1 %patch102 -p1 %patch104 -p1 -%patch106 -p1 %patch107 -p1 %patch108 -p1