Date: Tuesday, March 31, 2015 @ 07:37:54 Author: foutrelis Revision: 235294
upgpkg: firefox 37.0-1 - New upstream release. - Drop patch that accepts p11-kit's trust stores; nss 3.18-3 uses the same token label as libnssckbi. Modified: firefox/trunk/PKGBUILD Deleted: firefox/trunk/0001-Mark-p11-kit-s-trust-stores-as-built-in.patch ----------------------------------------------------+ 0001-Mark-p11-kit-s-trust-stores-as-built-in.patch | 48 ------------------- PKGBUILD | 17 +----- 2 files changed, 4 insertions(+), 61 deletions(-) Deleted: 0001-Mark-p11-kit-s-trust-stores-as-built-in.patch =================================================================== --- 0001-Mark-p11-kit-s-trust-stores-as-built-in.patch 2015-03-31 04:03:02 UTC (rev 235293) +++ 0001-Mark-p11-kit-s-trust-stores-as-built-in.patch 2015-03-31 05:37:54 UTC (rev 235294) @@ -1,48 +0,0 @@ -From 78d475b31e634a42a041b9cd01563761ad984a08 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <[email protected]> -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-31 04:03:02 UTC (rev 235293) +++ PKGBUILD 2015-03-31 05:37:54 UTC (rev 235294) @@ -3,7 +3,7 @@ # Contributor: Jakub Schmidtke <[email protected]> pkgname=firefox -pkgver=36.0.4 +pkgver=37.0 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org" arch=('i686' 'x86_64') @@ -21,17 +21,14 @@ 'upower: Battery API') install=firefox.install options=('!emptydirs' '!makeflags') -source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2{,.asc} +source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2 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' +sha256sums=('204b4a0c6478cdb4e57cf0947ce66d3c544a96b4c5eee4f64169deed67fb060d' 'ffcb2a0ba2ed08f74931a11043717391ef380234cadccc6f0c13f1186ad80e8b' '7eefe43ba2b4249a4ea2d04a739b80945583aaa5a3d6872a1b7ea7a3d190f882' 'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd' '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4' - '142857962d3f7aae7b4c4be1fddd647b3705b494e41e00fe638d7583404f3cac' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213') validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A') @@ -47,10 +44,6 @@ cp ../mozconfig .mozconfig patch -Np1 -i ../firefox-install-dir.patch - # https://bugs.archlinux.org/task/41689 - # 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 @@ -66,10 +59,8 @@ # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure - # Fix tab loading icon (flickers with libpng 1.6) + # Fix tab loading icon (doesn't work with libpng 1.6) # https://bugzilla.mozilla.org/show_bug.cgi?id=841734 - # TODO: Remove this; Firefox 36 might use CSS animations for the loading icon - # https://bugzilla.mozilla.org/show_bug.cgi?id=759252 cp "$srcdir/firefox-fixed-loading-icon.png" \ browser/themes/linux/tabbrowser/loading.png }
