[xulrunner] Fixed rhbz#966424 - unable to install addons

[Jan Horak]

commit 06dfb191830baefb784531bdf3449a1c932e4059
Author: Jan Horak <jhorak at redhat.com>
Date:   Wed Jun 12 17:35:59 2013 +0200

    Fixed rhbz#966424 - unable to install addons

 rhbz-966424.patch |   24 ++++++++++++++++++++++++
 xulrunner.spec    |    9 ++++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/rhbz-966424.patch b/rhbz-966424.patch
new file mode 100644
index 0000000..37ddc6e
--- /dev/null
+++ b/rhbz-966424.patch
@@ -0,0 +1,24 @@
+diff --git a/toolkit/mozapps/shared/CertUtils.jsm b/toolkit/toolkit/mozapps/shared/CertUtils.jsm
+--- a/toolkit/mozapps/shared/CertUtils.jsm
++++ b/toolkit/mozapps/shared/CertUtils.jsm
+@@ -170,17 +170,19 @@ this.checkCert =
+   issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3);
+   var tokenNames = issuerCert.getAllTokenNames({});
+ 
+   if (!tokenNames || !tokenNames.some(isBuiltinToken))
+     throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT);
+ }
+ 
+ function isBuiltinToken(tokenName) {
+-  return tokenName == "Builtin Object Token";
++  return tokenName == "Builtin Object Token" ||
++         tokenName == "Default Trust" ||
++         tokenName == "System Trust";
+ }
+ 
+ /**
+  * This class implements nsIBadCertListener.  Its job is to prevent "bad cert"
+  * security dialogs from being shown to the user.  It is better to simply fail
+  * if the certificate is bad. See bug 304286.
+  *
+  * @param  aAllowNonBuiltInCerts (optional)
diff --git a/xulrunner.spec b/xulrunner.spec
index 7b5de8a..249c9d1 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -76,7 +76,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        21.0
-Release:        7%{?pre_tag}%{?dist}
+Release:        8%{?pre_tag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -99,6 +99,8 @@ Patch19:        xulrunner-21.0-s390-inlines.patch
 Patch20:        mozilla-193-pkgconfig.patch
 Patch21:        rhbz-911314.patch
 Patch23:        mozilla-851850.patch
+# Unable to install addons from https pages
+Patch24:        rhbz-966424.patch
 
 # Upstream patches
 Patch104:       mozilla-844883.patch
@@ -239,6 +241,8 @@ cd %{tarballdir}
 %patch104 -p1 -b .844883
 %endif
 
+%patch24  -p1 -b .966424
+
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
 
@@ -516,6 +520,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Jun 12 2013 Jan Horak <jhorak at redhat.com> - 21.0-8
+- Fixed rhbz#966424 - unable to install addons
+
 * Mon Jun  3 2013 Jan Horak <jhorak at redhat.com> - 21.0-7
 - Using upstream build flags for crashreporter