rpms/curl/F-12 curl-7.19.7-nss-warning.patch, NONE, 1.1 curl.spec, 1.124, 1.125

[Kamil Dudka]

Author: kdudka

Update of /cvs/extras/rpms/curl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8368

Modified Files:
	curl.spec 
Added Files:
	curl-7.19.7-nss-warning.patch 
Log Message:
- avoid use of uninitialized value in lib/nss.c

curl-7.19.7-nss-warning.patch:
 nss.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE curl-7.19.7-nss-warning.patch ---
diff --git a/lib/nss.c b/lib/nss.c
index d1a9d1a..637663e 100644
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -990,7 +990,9 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
 {
   PRInt32 err;
   PRFileDesc *model = NULL;
-  PRBool ssl2, ssl3, tlsv1;
+  PRBool ssl2 = PR_FALSE;
+  PRBool ssl3 = PR_FALSE;
+  PRBool tlsv1 = PR_FALSE;
   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)
   if(SSL_OptionSet(model, SSL_HANDSHAKE_AS_CLIENT, PR_TRUE) != SECSuccess)
     goto error;
 
-  ssl2 = ssl3 = tlsv1 = PR_FALSE;
-
   switch (data->set.ssl.version) {
   default:
   case CURL_SSLVERSION_DEFAULT:


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-12/curl.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- curl.spec	1 Dec 2009 13:29:27 -0000	1.124
+++ curl.spec	2 Dec 2009 17:55:24 -0000	1.125
@@ -1,13 +1,14 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
 Source2: curlbuild.h
 Patch1: curl-7.19.7-modelfree.patch
 Patch2: curl-7.19.7-ssl-retry.patch
+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
@@ -81,6 +82,7 @@ use cURL's capabilities internally.
 # upstream patches (already applied)
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Fedora patches
 %patch101 -p1
@@ -170,6 +172,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Dec 02 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-4
+- avoid use of uninitialized value in lib/nss.c
+
 * Tue Dec 01 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-3
 - do not require valgrind on s390 and s390x
 - temporarily disabled SCP/SFTP test-suite (#539444)