rpms
/
curl
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- suppress failure of test513 on s390

This commit is contained in:
Kamil Dudka 2009-12-04 23:58:40 +00:00
parent b5c29dd110
commit f4ccd71fec
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
curl-7.19.7-nss-warning.patch
View File

@ -1,8 +1,8 @@
diff --git a/lib/nss.c b/lib/nss.c
index d1a9d1a..637663e 100644
index 26d751a..51e62ee 100644
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -990,7 +990,9 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
@@ -992,7 +992,9 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
{
PRInt32 err;
PRFileDesc *model = NULL;
@ -13,7 +13,7 @@ index d1a9d1a..637663e 100644
struct SessionHandle *data = conn->data;
curl_socket_t sockfd = conn->sock[sockindex];
struct ssl_connect_data *connssl = &conn->ssl[sockindex];
@@ -1106,8 +1108,6 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
@@ -1100,8 +1102,6 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
if(SSL_OptionSet(model, SSL_HANDSHAKE_AS_CLIENT, PR_TRUE) != SECSuccess)
goto error;

20
curl-7.19.7-s390-sleep.patch Normal file
View File

@ -0,0 +1,20 @@
diff --git a/tests/libtest/lib513.c b/tests/libtest/lib513.c
index b06a3c6..bf14650 100644
--- a/tests/libtest/lib513.c
+++ b/tests/libtest/lib513.c
@@ -12,12 +12,15 @@
#include "memdebug.h"
+#include <unistd.h>
+
static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp)
{
(void)ptr;
(void)size;
(void)nmemb;
(void)userp;
+ sleep(2);
return CURL_READFUNC_ABORT;
}

8
curl.spec
View File

@ -12,6 +12,7 @@ Patch3: curl-7.19.7-nss-warning.patch
Patch101: curl-7.15.3-multilib.patch
Patch102: curl-7.16.0-privlibs.patch
Patch103: curl-7.19.4-debug.patch
Patch104: curl-7.19.7-s390-sleep.patch
Provides: webclient
URL: http://curl.haxx.se/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -88,6 +89,10 @@ use cURL's capabilities internally.
%patch101 -p1
%patch102 -p1
%patch103 -p1
# http://curl.haxx.se/mail/lib-2009-12/0031.html
%patch104 -p1
autoconf
# Convert docs to UTF-8
@ -172,8 +177,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/libcurl.m4
%changelog
* Wed Dec 02 2009 Kamil Dudka <kdudka@redhat.com> 7.19.7-4
* Sat Dec 05 2009 Kamil Dudka <kdudka@redhat.com> 7.19.7-4
- avoid use of uninitialized value in lib/nss.c
- suppress failure of test513 on s390
* Tue Dec 01 2009 Kamil Dudka <kdudka@redhat.com> 7.19.7-3
- do not require valgrind on s390 and s390x