[curl] work around valgrind bug (#678518)

Kamil Dudka kdudka at fedoraproject.org
Fri Feb 18 16:57:12 UTC 2011


commit 65e324d67842cdf73348976ae3d08ddccb2a86a2
Author: Kamil Dudka <kdudka at redhat.com>
Date:   Fri Feb 18 17:53:47 2011 +0100

    work around valgrind bug (#678518)

 0107-curl-7.21.4-libidn-valgrind.patch |   26 ++++++++++++++++++++++++++
 curl.spec                              |    7 ++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/0107-curl-7.21.4-libidn-valgrind.patch b/0107-curl-7.21.4-libidn-valgrind.patch
new file mode 100644
index 0000000..719b3a6
--- /dev/null
+++ b/0107-curl-7.21.4-libidn-valgrind.patch
@@ -0,0 +1,26 @@
+From d6c42a5bf66d4d458b20836573d6989e53f7d423 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka at redhat.com>
+Date: Fri, 18 Feb 2011 17:49:59 +0100
+Subject: [PATCH] curl: work around valgrind bug (RHBZ#678518)
+
+https://bugs.kde.org/show_bug.cgi?id=264936
+---
+ tests/data/test165 |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/tests/data/test165 b/tests/data/test165
+index ddfe1e9..b2cbc4f 100644
+--- a/tests/data/test165
++++ b/tests/data/test165
+@@ -54,5 +54,8 @@ Accept: */*
+ Proxy-Connection: Keep-Alive
+ 
+ </protocol>
++<valgrind>
++disable
++</valgrind>
+ </verify>
+ </testcase>
+-- 
+1.7.4
+
diff --git a/curl.spec b/curl.spec
index c161319..9feb3c4 100644
--- a/curl.spec
+++ b/curl.spec
@@ -26,6 +26,9 @@ Patch105: 0105-curl-7.21.3-disable-test1112.patch
 # disable valgrind for certain test-cases (libssh2 problem)
 Patch106: 0106-curl-7.21.0-libssh2-valgrind.patch
 
+# work around valgrind bug (#678518)
+Patch107: 0107-curl-7.21.4-libidn-valgrind.patch
+
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -114,6 +117,7 @@ done
 %patch102 -p1
 %patch104 -p1
 %patch106 -p1
+%patch107 -p1
 
 # exclude test1112 from the test suite (#565305)
 %patch105 -p1
@@ -220,9 +224,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
-* Thu Feb 17 2011 Kamil Dudka <kdudka at redhat.com> 7.21.4-1
+* Fri Feb 18 2011 Kamil Dudka <kdudka at redhat.com> 7.21.4-1
 - new upstream release
 - avoid memory leak on SSL connection failure (upstream commit a40f58d)
+- work around valgrind bug (#678518)
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.21.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild


More information about the scm-commits mailing list