From bfd045db0edca48c80332fda2bf0bcee93de2f48 Mon Sep 17 00:00:00 2001
From: Jan Horak <jhorak@redhat.com>
Date: Thu, 28 Apr 2011 21:59:55 +0200
Subject: [PATCH] Added comodo/nss patch

---
 mozilla-comodo-646460.patch | 24 ++++++++++++++++++++++++
 xulrunner.spec              |  6 ++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 mozilla-comodo-646460.patch

diff --git a/mozilla-comodo-646460.patch b/mozilla-comodo-646460.patch
new file mode 100644
index 0000000..a9f806d
--- /dev/null
+++ b/mozilla-comodo-646460.patch
@@ -0,0 +1,24 @@
+diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp
+--- a/security/manager/ssl/src/nsNSSIOLayer.cpp
++++ b/security/manager/ssl/src/nsNSSIOLayer.cpp
+@@ -3339,16 +3339,20 @@ cancel_and_failure(nsNSSSocketInfo* info
+ {
+   infoObject->SetCanceled(PR_TRUE);
+   return SECFailure;
+ }
+ 
+ static SECStatus
+ nsNSSBadCertHandler(void *arg, PRFileDesc *sslSocket)
+ {
++  // cert was revoked, don't do anything else
++  if (PR_GetError() == SEC_ERROR_REVOKED_CERTIFICATE)
++    return SECFailure;
++
+   nsNSSShutDownPreventionLock locker;
+   nsNSSSocketInfo* infoObject = (nsNSSSocketInfo *)arg;
+   if (!infoObject)
+     return SECFailure;
+ 
+   if (nsSSLThread::exitRequested())
+     return cancel_and_failure(infoObject);
+ 
diff --git a/xulrunner.spec b/xulrunner.spec
index 9056338..00c9fd7 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -23,7 +23,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.2.17
-Release:        1%{?pretag}%{?dist}
+Release:        2%{?pretag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -48,6 +48,7 @@ Patch20:        mozilla-192-pkgconfig.patch
 Patch24:        crashreporter-remove-static.patch
 
 # Upstream patches
+Patch30:        mozilla-comodo-646460.patch
 
 # ---------------------------------------------------
 
@@ -142,6 +143,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
 
 %patch20 -p1 -b .pk
 %patch24 -p1 -b .static
+%patch30 -p1 -b .646460
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -444,7 +446,7 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
-* Thu Apr 28 2011 Jan Horak <jhorak@redhat.com> - 1.9.2.17-1
+* Thu Apr 28 2011 Jan Horak <jhorak@redhat.com> - 1.9.2.17-2
 - Update to 1.9.2.17
 
 * Tue Mar 22 2011 Christopher Aillon <caillon@redhat.com> - 3.6.16-1