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

[Jan Steffens]

    Date: Thursday, August 28, 2014 @ 20:29:09
  Author: heftig
Revision: 220748

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

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

-------------------+
 PKGBUILD          |   11 ++++++++---
 rhbz-966424.patch |   23 +++++++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-28 18:28:50 UTC (rev 220747)
+++ PKGBUILD	2014-08-28 18:29:09 UTC (rev 220748)
@@ -6,7 +6,7 @@
 
 pkgname=thunderbird
 pkgver=31.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone Mail/News reader"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL')
@@ -19,7 +19,8 @@
         mozconfig
         thunderbird.desktop
         thunderbird-install-dir.patch
-        vendor.js)
+        vendor.js
+        rhbz-966424.patch)
 options=(!emptydirs)
 sha256sums=('571f8cca980f077ae81999aea69a78153422a75e9e6c07ab74ec6659fe0d6ef4'
             'SKIP'
@@ -26,7 +27,8 @@
             '7af6c21413ff48b5b30ca6987781b639deac2c3ea3f4b9261c8e71132daecd29'
             'd506b771e765e09e2e039b975e25befade8eec97e8950813a32463604955ab4e'
             '9049ab3f9600a1592a54c41a166c76e046c393e1cfe7c4e769155b7317d197ee'
-            'e4ea8e6788163d9f8db8f1f40023db3ea0a1358f9a4510169f2d4c4fe6a887ed')
+            'e4ea8e6788163d9f8db8f1f40023db3ea0a1358f9a4510169f2d4c4fe6a887ed'
+            '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a')
 
 prepare() {
   cd comm-esr31
@@ -34,6 +36,9 @@
 
   cp "$srcdir/mozconfig" .mozconfig
 
+  # https://bugs.archlinux.org/task/41689
+  patch -Np1 -d mozilla -i ../../rhbz-966424.patch
+
   # configure script misdetects the preprocessor without an optimization level
   # https://bugs.archlinux.org/task/34644
   sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure

Added: rhbz-966424.patch
===================================================================
--- rhbz-966424.patch	                        (rev 0)
+++ rhbz-966424.patch	2014-08-28 18:29:09 UTC (rev 220748)
@@ -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)