rpms/curl
6
0
Fork 1
Code Issues Pull Requests Releases Activity

adapt tests 815 and 816 such that they work with the fix for CVE-2014-0138

Browse Source
This commit is contained in:
Kamil Dudka 2014-03-26 23:43:07 +01:00
parent 4bddb2814c
commit e4d3e72cd6
2 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
0001-curl-7.36.0-f82e0edc.patch Normal file
View File

@ -0,0 +1,46 @@
From 29c2b12b636304c1e357f543be3d6da34e5d832d Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
Date: Wed, 26 Mar 2014 22:02:31 +0100
Subject: [PATCH] test815/816: Use authentication for both URLs
The improved connection reuse logic would otherwise create a new
connection for each one, which isn't supported by the test
server, nor expected by the test.
[upstream commit f82e0edc171b33528bc4f59036505d98ecf1d816]
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
---
tests/data/test815 | 2 +-
tests/data/test816 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/data/test815 b/tests/data/test815
index c006c6d..5c5ef79 100644
--- a/tests/data/test815
+++ b/tests/data/test815
@@ -26,7 +26,7 @@ imap
IMAP STORE - delete message (CUSTOMREQUEST)
</name>
<command>
-imap://%HOSTIP:%IMAPPORT/815 -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/815 -X CLOSE
+imap://%HOSTIP:%IMAPPORT/815 -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/815 -X CLOSE -u user:secret
</command>
</client>
diff --git a/tests/data/test816 b/tests/data/test816
index 386f877..b8b1a9d 100644
--- a/tests/data/test816
+++ b/tests/data/test816
@@ -29,7 +29,7 @@ imap
IMAP STORE - delete message with confirmation (CUSTOMREQUEST)
</name>
<command>
-imap://%HOSTIP:%IMAPPORT/816 -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/816 -X EXPUNGE
+imap://%HOSTIP:%IMAPPORT/816 -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/816 -X EXPUNGE -u user:secret
</command>
</client>
--
1.7.1

4
curl.spec
View File

@ -7,6 +7,9 @@ Group: Applications/Internet
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
Source2: curlbuild.h
# adapt tests 815 and 816 such that they work with the fix for CVE-2014-0138
Patch1: 0001-curl-7.36.0-f82e0edc.patch
# patch making libcurl multilib ready
Patch101: 0101-curl-7.32.0-multilib.patch
@ -119,6 +122,7 @@ documentation of the library, too.
%setup -q
# upstream patches
%patch1 -p1
# Fedora patches
%patch101 -p1