[arch-commits] Commit in firefox/trunk (PKGBUILD rhbz-966424.patch)

[Jan Steffens]

    Date: Thursday, August 28, 2014 @ 20:28:50
  Author: heftig
Revision: 220747

https://bugs.archlinux.org/task/41689

Added:
  firefox/trunk/rhbz-966424.patch
Modified:
  firefox/trunk/PKGBUILD

-------------------+
 PKGBUILD          |    8 ++++++--
 rhbz-966424.patch |   23 +++++++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-28 16:25:22 UTC (rev 220746)
+++ PKGBUILD	2014-08-28 18:28:50 UTC (rev 220747)
@@ -4,7 +4,7 @@
 
 pkgname=firefox
 pkgver=31.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone web browser from mozilla.org"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
@@ -21,7 +21,7 @@
 install=firefox.install
 options=('!emptydirs' '!makeflags')
 source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2{,.asc}
-        mozconfig firefox.desktop firefox-install-dir.patch vendor.js
+        mozconfig firefox.desktop firefox-install-dir.patch vendor.js rhbz-966424.patch
         firefox-20.0.1-fixed-loading-icon.png)
 sha256sums=('95c789f2f171c4c7bd832999a22bfa9461ac47ba33e97a46392c90e576baf9db'
             'SKIP'
@@ -29,6 +29,7 @@
             'd2a7610393ba259c35e3227b92e02ec91095a95189f56ac93ccdf6732772719c'
             'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd'
             '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4'
+            '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -43,6 +44,9 @@
   cp ../mozconfig .mozconfig
   patch -Np1 -i ../firefox-install-dir.patch
 
+  # https://bugs.archlinux.org/task/41689
+  patch -Np1 -i ../rhbz-966424.patch
+
   echo -n "$_google_api_key" >google-api-key
   echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-api-key\"" >>.mozconfig
 

Added: rhbz-966424.patch
===================================================================
--- rhbz-966424.patch	                        (rev 0)
+++ rhbz-966424.patch	2014-08-28 18:28:50 UTC (rev 220747)
@@ -0,0 +1,23 @@
+--- a/toolkit/modules/CertUtils.jsm
++++ b/toolkit/modules/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)