diff --git a/0022-curl-7.29.0-f63603de.patch b/0022-curl-7.29.0-f63603de.patch new file mode 100644 index 0000000..f4951e6 --- /dev/null +++ b/0022-curl-7.29.0-f63603de.patch @@ -0,0 +1,32 @@ +From a4036c433874a60af0e2953583ced6909f4b5d2f Mon Sep 17 00:00:00 2001 +From: Paul Donohue +Date: Tue, 15 Oct 2013 21:36:32 +0200 +Subject: [PATCH] NSS: acknowledge the + --no-sessionid/CURLOPT_SSL_SESSIONID_CACHE option + +[upstream commit f63603dec4519857498602f7a00acc0ffed29753] + +Signed-off-by: Kamil Dudka +--- + lib/nss.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/lib/nss.c b/lib/nss.c +index 424c0b2..70e67c6 100644 +--- a/lib/nss.c ++++ b/lib/nss.c +@@ -1369,8 +1369,9 @@ static CURLcode nss_setup_connect(struct connectdata *conn, int sockindex) + if(SSL_OptionSet(model, SSL_HANDSHAKE_AS_CLIENT, PR_TRUE) != SECSuccess) + goto error; + +- /* do not use SSL cache if we are not going to verify peer */ +- ssl_no_cache = (data->set.ssl.verifypeer) ? PR_FALSE : PR_TRUE; ++ /* do not use SSL cache if disabled or we are not going to verify peer */ ++ ssl_no_cache = (conn->ssl_config.sessionid && data->set.ssl.verifypeer) ? ++ PR_FALSE : PR_TRUE; + if(SSL_OptionSet(model, SSL_NO_CACHE, ssl_no_cache) != SECSuccess) + goto error; + +-- +1.9.3 + diff --git a/curl.spec b/curl.spec index 07baf99..9be1629 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: 19%{?dist} +Release: 20%{?dist} License: MIT Group: Applications/Internet Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma @@ -67,6 +67,9 @@ Patch20: 0020-curl-7.29.0-9317eced.patch # auth failure on duplicated 'WWW-Authenticate: Negotiate' header (#1093348) Patch21: 0021-curl-7.29.0-ec5fde24.patch +# acknowledge the --no-sessionid/CURLOPT_SSL_SESSIONID_CACHE option (#1098711) +Patch22: 0022-curl-7.29.0-f63603de.patch + # patch making libcurl multilib ready Patch101: 0101-curl-7.29.0-multilib.patch @@ -195,6 +198,7 @@ documentation of the library, too. %patch19 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p1 # Fedora patches %patch101 -p1 @@ -315,6 +319,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/libcurl.m4 %changelog +* Mon Jun 02 2014 Kamil Dudka 7.29.0-20 +- acknowledge the --no-sessionid/CURLOPT_SSL_SESSIONID_CACHE option (#1098711) + * Sat May 10 2014 Kamil Dudka 7.29.0-19 - extend URL parser to support IPv6 zone identifiers (#680996) - auth failure on duplicated 'WWW-Authenticate: Negotiate' header (#1093348)