[arch-commits] Commit in firefox/trunk (3 files)

[Jan Steffens]

    Date: Monday, March 30, 2015 @ 09:52:43
  Author: heftig
Revision: 235274

Fix https://bugs.archlinux.org/task/43971

Added:
  firefox/trunk/0001-Mark-p11-kit-s-trust-stores-as-built-in.patch
Modified:
  firefox/trunk/PKGBUILD
Deleted:
  firefox/trunk/rhbz-966424.patch

----------------------------------------------------+
 0001-Mark-p11-kit-s-trust-stores-as-built-in.patch |   48 +++++++++++++++++++
 PKGBUILD                                           |    8 +--
 rhbz-966424.patch                                  |   14 -----
 3 files changed, 53 insertions(+), 17 deletions(-)

Added: 0001-Mark-p11-kit-s-trust-stores-as-built-in.patch
===================================================================
--- 0001-Mark-p11-kit-s-trust-stores-as-built-in.patch	                        (rev 0)
+++ 0001-Mark-p11-kit-s-trust-stores-as-built-in.patch	2015-03-30 07:52:43 UTC (rev 235274)
@@ -0,0 +1,48 @@
+From 78d475b31e634a42a041b9cd01563761ad984a08 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Mon, 30 Mar 2015 08:59:51 +0200
+Subject: [PATCH] Mark p11-kit's trust stores as built-in
+
+Needed for the crypto glue integration via replacing libnssckbi.so.
+---
+ security/certverifier/CertVerifier.cpp | 8 ++++++++
+ toolkit/modules/CertUtils.jsm          | 4 +++-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/security/certverifier/CertVerifier.cpp b/security/certverifier/CertVerifier.cpp
+index fca5f89..81d3ad2 100644
+--- a/security/certverifier/CertVerifier.cpp
++++ b/security/certverifier/CertVerifier.cpp
+@@ -77,6 +77,14 @@ IsCertBuiltInRoot(CERTCertificate* cert, bool& result) {
+       result = true;
+       return SECSuccess;
+     }
++    if (strcmp("Default Trust", token) == 0) {
++      result = true;
++      return SECSuccess;
++    }
++    if (strcmp("System Trust", token) == 0) {
++      result = true;
++      return SECSuccess;
++    }
+   }
+   return SECSuccess;
+ }
+diff --git a/toolkit/modules/CertUtils.jsm b/toolkit/modules/CertUtils.jsm
+index 00a2c52..309412e 100644
+--- a/toolkit/modules/CertUtils.jsm
++++ b/toolkit/modules/CertUtils.jsm
+@@ -174,7 +174,9 @@ this.checkCert =
+ }
+ 
+ function isBuiltinToken(tokenName) {
+-  return tokenName == "Builtin Object Token";
++  return tokenName == "Builtin Object Token" ||
++         tokenName == "Default Trust" ||
++         tokenName == "System Trust";
+ }
+ 
+ /**
+-- 
+2.3.4
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-30 07:31:30 UTC (rev 235273)
+++ PKGBUILD	2015-03-30 07:52:43 UTC (rev 235274)
@@ -22,7 +22,8 @@
 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 rhbz-966424.patch
+        mozconfig firefox.desktop firefox-install-dir.patch vendor.js
+        0001-Mark-p11-kit-s-trust-stores-as-built-in.patch
         firefox-fixed-loading-icon.png)
 sha256sums=('9143bddc64746bf6471b5ae55b9013586b0ffd6c5515c5566b4015e0bf1e16ab'
             'SKIP'
@@ -30,7 +31,7 @@
             '7eefe43ba2b4249a4ea2d04a739b80945583aaa5a3d6872a1b7ea7a3d190f882'
             'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd'
             '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4'
-            '4f0046b39a8d98f6e4fc3360ec490cb2416e38c7b3e92699f7e511c206c2c961'
+            '142857962d3f7aae7b4c4be1fddd647b3705b494e41e00fe638d7583404f3cac'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213')
 validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
 
@@ -47,7 +48,8 @@
   patch -Np1 -i ../firefox-install-dir.patch
 
   # https://bugs.archlinux.org/task/41689
-  patch -Np2 -i ../rhbz-966424.patch
+  # https://bugs.archlinux.org/task/43971
+  patch -Np1 -i ../0001-Mark-p11-kit-s-trust-stores-as-built-in.patch
 
   echo -n "$_google_api_key" >google-api-key
   echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-api-key\"" >>.mozconfig

Deleted: rhbz-966424.patch
===================================================================
--- rhbz-966424.patch	2015-03-30 07:31:30 UTC (rev 235273)
+++ rhbz-966424.patch	2015-03-30 07:52:43 UTC (rev 235274)
@@ -1,14 +0,0 @@
-diff -up firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm.966424 firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm
---- firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm.966424	2014-10-14 08:12:14.358697255 +0200
-+++ firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm	2014-10-14 08:17:59.962181908 +0200
-@@ -174,7 +174,9 @@ this.checkCert =
- }
- 
- function isBuiltinToken(tokenName) {
--  return tokenName == "Builtin Object Token";
-+  return tokenName == "Builtin Object Token" ||
-+         tokenName == "Default Trust" ||
-+         tokenName == "System Trust";
- }
- 
- /**