[curl/f19] Resolves: #1068967 - refresh expired cookie in test172 from upstream test-suite

[Kamil Dudka]

commit 02acb5f91290ba554c7044857e6f0b3916523bdd
Author: Kamil Dudka <kdudka at redhat.com>
Date:   Tue Feb 25 12:50:11 2014 +0100

    Resolves: #1068967 - refresh expired cookie in test172 from upstream test-suite

 0017-curl-7.29.0-ffb8a21d.patch |   36 ++++++++++++++++++++++++++++++++++++
 curl.spec                       |    9 ++++++++-
 2 files changed, 44 insertions(+), 1 deletions(-)
---
diff --git a/0017-curl-7.29.0-ffb8a21d.patch b/0017-curl-7.29.0-ffb8a21d.patch
new file mode 100644
index 0000000..a7a5f7e
--- /dev/null
+++ b/0017-curl-7.29.0-ffb8a21d.patch
@@ -0,0 +1,36 @@
+From 1742db74f6527846581da8b846f9c9666eac4fd6 Mon Sep 17 00:00:00 2001
+From: Steve Holme <steve_holme at hotmail.com>
+Date: Sun, 2 Feb 2014 11:01:10 +0000
+Subject: [PATCH] tests: Fixed test172 cookie expiry
+
+The test contains a cookie jar file where one of the cookies has an
+expiry date of 1391252187 -- Sat, 1 Feb 2014 10:56:27 GMT which has
+now expired. Updated to Wed, 14 Oct 2037 16:36:33 GMT as per test
+179.
+
+Reported-by: Adam Sampson
+Bug: http://curl.haxx.se/bug/view.cgi?id=1330
+
+[upstream commit ffb8a21d85bde8b626e5dc52ce25f0447ee49f89]
+
+Signed-off-by: Kamil Dudka <kdudka at redhat.com>
+---
+ tests/data/test172 |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/tests/data/test172 b/tests/data/test172
+index b3efae9..3d53418 100644
+--- a/tests/data/test172
++++ b/tests/data/test172
+@@ -36,7 +36,7 @@ http://%HOSTIP:%HTTPPORT/we/want/172 -b log/jar172.txt -b "tool=curl; name=fool"
+ 
+ .%HOSTIP	TRUE	/silly/	FALSE	0	ismatch	this
+ .%HOSTIP	TRUE	/	FALSE	0	partmatch	present
+-%HOSTIP	FALSE	/we/want/	FALSE	1391252187	nodomain	value
++%HOSTIP	FALSE	/we/want/	FALSE	2139150993	nodomain	value
+ </file>
+ </client>
+ 
+-- 
+1.7.1
+
diff --git a/curl.spec b/curl.spec
index 0ab8256..f19528e 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.29.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -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
 
+# refresh expired cookie in test172 from upstream test-suite (#1068967)
+Patch17: 0017-curl-7.29.0-ffb8a21d.patch
+
 # patch making libcurl multilib ready
 Patch101: 0101-curl-7.29.0-multilib.patch
 
@@ -155,6 +158,7 @@ documentation of the library, too.
 %patch11 -p1
 %patch12 -p1
 %patch14 -p1
+%patch17 -p1
 
 # patches not yet upstream
 %patch105 -p1
@@ -275,6 +279,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Tue Feb 25 2014 Kamil Dudka <kdudka at redhat.com> 7.29.0-14
+- refresh expired cookie in test172 from upstream test-suite (#1068967)
+
 * Fri Jan 31 2014 Kamil Dudka <kdudka at redhat.com> 7.29.0-13
 - re-use of wrong HTTP NTLM connection in libcurl (CVE-2014-0015)