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

[Jan Steffens]

    Date: Thursday, August 28, 2014 @ 20:29:18
  Author: heftig
Revision: 118036

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

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-28 18:29:00 UTC (rev 118035)
+++ PKGBUILD	2014-08-28 18:29:18 UTC (rev 118036)
@@ -5,7 +5,7 @@
 
 pkgname=xulrunner
 pkgver=31.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
@@ -15,13 +15,15 @@
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.bz2
         mozconfig
         mozilla-pkgconfig.patch
-        shared-libs.patch)
+        shared-libs.patch
+        rhbz-966424.patch)
 options=('!emptydirs' '!makeflags' 'staticlibs')
 replaces=('xulrunner-oss')
 sha256sums=('6f4cb97e4debe2225f94bc813057154d2aa2680f5aa69573048633507cecb21e'
             'df0e663e7f9246b84936882e564270fac541c6bb39450b759abe686e5c27a052'
             '23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269'
-	    'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1')
+            'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1'
+            '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a')
 
 prepare() {
   cd "$srcdir/mozilla-release"
@@ -31,6 +33,9 @@
   patch -Np1 -i ../mozilla-pkgconfig.patch
   patch -Np1 -i ../shared-libs.patch
 
+  # https://bugs.archlinux.org/task/41689
+  patch -Np1 -i ../rhbz-966424.patch
+
   # WebRTC build tries to execute "python" and expects Python 2
   # Workaround taken from chromium PKGBUILD
   mkdir "$srcdir/python2-path"
@@ -70,4 +75,3 @@
   sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \
     "$pkgdir"/usr/lib/xulrunner-devel-$pkgver/sdk/bin/{xpt,header,typelib,xpidl}.py
 }
-sha256sums=('6f4cb97e4debe2225f94bc813057154d2aa2680f5aa69573048633507cecb21e' 'df0e663e7f9246b84936882e564270fac541c6bb39450b759abe686e5c27a052' '23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269' 'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1')

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