rpms/curl/devel curl-7.18.2-nss-thread-safety.patch, 1.2, 1.3 curl.spec, 1.81, 1.82

[Jindrich Novy]

Author: jnovy

Update of /cvs/pkgs/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30092

Modified Files:
	curl-7.18.2-nss-thread-safety.patch curl.spec 
Log Message:
* Tue Sep 09 2008 Jindrich Novy <jnovy at redhat.com> 7.18.2-7
- update the thread safety patch, thanks to Rob Crittenden (#462217)


curl-7.18.2-nss-thread-safety.patch:

Index: curl-7.18.2-nss-thread-safety.patch
===================================================================
RCS file: /cvs/pkgs/rpms/curl/devel/curl-7.18.2-nss-thread-safety.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- curl-7.18.2-nss-thread-safety.patch	4 Sep 2008 01:02:07 -0000	1.2
+++ curl-7.18.2-nss-thread-safety.patch	19 Sep 2008 11:43:05 -0000	1.3
@@ -1,6 +1,6 @@
-diff -urN curl-7.18.2.orig/lib/nss.c curl-7.18.2/lib/nss.c
---- curl-7.18.2.orig/lib/nss.c	2008-09-03 20:56:33.000000000 -0400
-+++ curl-7.18.2/lib/nss.c	2008-09-03 20:57:07.000000000 -0400
+diff -u --recursive curl-7.18.2/lib/nss.c curl-7.18.2.new/lib/nss.c
+--- curl-7.18.2/lib/nss.c	2008-09-16 11:13:00.000000000 -0400
++++ curl-7.18.2.new/lib/nss.c	2008-09-16 11:29:13.000000000 -0400
 @@ -73,6 +73,8 @@
  
  PRFileDesc *PR_ImportTCPSocket(PRInt32 osfd);
@@ -10,13 +10,11 @@
  int initialized = 0;
  
  #define HANDSHAKE_TIMEOUT 30
-@@ -718,9 +720,12 @@
-  * @retval 1 SSL initialized successfully
+@@ -719,8 +721,11 @@
   */
  int Curl_nss_init(void)
--{
+ {
 -  if(!initialized)
-+{ 
 +  /* curl_global_init() is not thread-safe so this test is ok */
 +  if (nss_initlock == NULL) {
      PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 256);
@@ -54,7 +52,7 @@
      initialized = 1;
  
      certDir = getenv("SSL_DIR"); /* Look in $SSL_DIR */
-@@ -832,8 +848,11 @@
+@@ -832,6 +848,8 @@
      if(rv != SECSuccess) {
        infof(conn->data, "Unable to initialize NSS database\n");
        curlerr = CURLE_SSL_CACERT_BADFILE;
@@ -62,7 +60,13 @@
 +      initialized = 0;
        goto error;
      }
-+    PR_Unlock(nss_initlock);
  
-     NSS_SetDomesticPolicy();
+@@ -854,6 +872,7 @@
+     }
+ #endif
+   }
++  PR_Unlock(nss_initlock);
  
+   model = PR_NewTCPSocket();
+   if(!model)
+Only in curl-7.18.2.new/lib: nss.c.orig


Index: curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/curl/devel/curl.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- curl.spec	4 Sep 2008 00:47:20 -0000	1.81
+++ curl.spec	19 Sep 2008 11:43:05 -0000	1.82
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.18.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -120,6 +120,9 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Tue Sep 09 2008 Jindrich Novy <jnovy at redhat.com> 7.18.2-7
+- update the thread safety patch, thanks to Rob Crittenden (#462217)
+
 * Wed Sep 03 2008 Warren Togami <wtogami at redhat.com> 7.18.2-6
 - add thread safety to libcurl NSS cleanup() functions (#459297)