From 21ee30a359fdab83d7d2ba104c1eee49d2a79f69 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 16 Aug 2011 11:18:11 +0200
Subject: curl, sync with rawhide, prepare EL-5 build

---
 0004-curl-7.21.7-d6f319f.patch | 118 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 0004-curl-7.21.7-d6f319f.patch

(limited to '0004-curl-7.21.7-d6f319f.patch')

diff --git a/0004-curl-7.21.7-d6f319f.patch b/0004-curl-7.21.7-d6f319f.patch
new file mode 100644
index 0000000..33f430d
--- /dev/null
+++ b/0004-curl-7.21.7-d6f319f.patch
@@ -0,0 +1,118 @@
+From 857fed6e245a9620b0f25a2f4ca6d6dc01584674 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 15 Aug 2011 13:48:45 +0200
+Subject: [PATCH] nss: start with no database if the selected database is
+ broken
+
+Bug: https://bugzilla.redhat.com/728562
+
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ lib/nss.c |   63 +++++++++++++++++++++++++++++++++++++-----------------------
+ 1 files changed, 39 insertions(+), 24 deletions(-)
+
+diff --git a/lib/nss.c b/lib/nss.c
+index 3dc0ba6..94a530b 100644
+--- a/lib/nss.c
++++ b/lib/nss.c
+@@ -898,10 +898,42 @@ isTLSIntoleranceError(PRInt32 err)
+   }
+ }
+ 
+-static CURLcode init_nss(struct SessionHandle *data)
++static CURLcode nss_init_core(struct SessionHandle *data, const char *cert_dir)
++{
++  if(NSS_IsInitialized())
++    return CURLE_OK;
++
++  if(cert_dir) {
++    SECStatus rv;
++    const bool use_sql = NSS_VersionCheck("3.12.0");
++    char *certpath = aprintf("%s%s", use_sql ? "sql:" : "", cert_dir);
++    if(!certpath)
++      return CURLE_OUT_OF_MEMORY;
++
++    infof(data, "Initializing NSS with certpath: %s\n", certpath);
++    rv = NSS_Initialize(certpath, "", "", "", NSS_INIT_READONLY);
++    free(certpath);
++
++    if(rv == SECSuccess)
++      return CURLE_OK;
++
++    infof(data, "Unable to initialize NSS database\n");
++  }
++
++  infof(data, "Initializing NSS with certpath: none\n");
++  if(NSS_NoDB_Init(NULL) == SECSuccess)
++    return CURLE_OK;
++
++  infof(data, "Unable to initialize NSS\n");
++  return CURLE_SSL_CACERT_BADFILE;
++}
++
++static CURLcode nss_init(struct SessionHandle *data)
+ {
+   char *cert_dir;
+   struct_stat st;
++  CURLcode rv;
++
+   if(initialized)
+     return CURLE_OK;
+ 
+@@ -922,31 +954,14 @@ static CURLcode init_nss(struct SessionHandle *data)
+     }
+   }
+ 
+-  if(!NSS_IsInitialized()) {
+-    SECStatus rv;
+-    initialized = 1;
+-    infof(data, "Initializing NSS with certpath: %s\n",
+-          cert_dir ? cert_dir : "none");
+-    if(!cert_dir) {
+-      rv = NSS_NoDB_Init(NULL);
+-    }
+-    else {
+-      char *certpath =
+-        PR_smprintf("%s%s", NSS_VersionCheck("3.12.0") ? "sql:" : "",
+-                    cert_dir);
+-      rv = NSS_Initialize(certpath, "", "", "", NSS_INIT_READONLY);
+-      PR_smprintf_free(certpath);
+-    }
+-    if(rv != SECSuccess) {
+-      infof(data, "Unable to initialize NSS database\n");
+-      initialized = 0;
+-      return CURLE_SSL_CACERT_BADFILE;
+-    }
+-  }
++  rv = nss_init_core(data, cert_dir);
++  if(rv)
++    return rv;
+ 
+   if(num_enabled_ciphers() == 0)
+     NSS_SetDomesticPolicy();
+ 
++  initialized = 1;
+   return CURLE_OK;
+ }
+ 
+@@ -981,7 +996,7 @@ CURLcode Curl_nss_force_init(struct SessionHandle *data)
+   }
+ 
+   PR_Lock(nss_initlock);
+-  rv = init_nss(data);
++  rv = nss_init(data);
+   PR_Unlock(nss_initlock);
+   return rv;
+ }
+@@ -1184,7 +1199,7 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
+ 
+   /* FIXME. NSS doesn't support multiple databases open at the same time. */
+   PR_Lock(nss_initlock);
+-  curlerr = init_nss(conn->data);
++  curlerr = nss_init(conn->data);
+   if(CURLE_OK != curlerr) {
+     PR_Unlock(nss_initlock);
+     goto error;
+-- 
+1.7.4.4
+
-- 
cgit