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

[Evangelos Foutras]

    Date: Tuesday, April 21, 2015 @ 03:27:09
  Author: foutrelis
Revision: 131763

upgpkg: xulrunner 37.0.2-1

- libvpx 1.4.0 rebuild.
- New upstream release.
- Drop patch that accepts p11-kit's trust stores; nss 3.18-3 uses the
  same token label as libnssckbi.

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-21 01:02:47 UTC (rev 131762)
+++ PKGBUILD	2015-04-21 01:27:09 UTC (rev 131763)
@@ -4,7 +4,7 @@
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
 
 pkgname=xulrunner
-pkgver=37.0.1
+pkgver=37.0.2
 pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64')
@@ -15,15 +15,13 @@
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.bz2
         mozconfig
         mozilla-pkgconfig.patch
-        shared-libs.patch
-        rhbz-966424.patch)
+        shared-libs.patch)
 options=('!emptydirs' '!makeflags' 'staticlibs')
 replaces=('xulrunner-oss')
-sha256sums=('b06a8c9bb04d128ab0637abf7dc1b2c36ffe8930c76e1f37e5abe18c48815952'
+sha256sums=('c08bc152c54bb26d21320ddc2fb57c29ea5f4d84f3d04434698d9d6172c2cd60'
             'df0e663e7f9246b84936882e564270fac541c6bb39450b759abe686e5c27a052'
             '1aa9ebe67542a2b8c28905d070829ada5b29438c6a7961f2b0cdd6b92d8b9f5c'
-            '59d9fc421bc10a5515b73e159f44a72365bf7b7e8b3fc8a8c46043ef40bd3a40'
-            '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a')
+            '59d9fc421bc10a5515b73e159f44a72365bf7b7e8b3fc8a8c46043ef40bd3a40')
 
 prepare() {
   cd "$srcdir/mozilla-release"
@@ -33,9 +31,6 @@
   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"

Deleted: rhbz-966424.patch
===================================================================
--- rhbz-966424.patch	2015-04-21 01:02:47 UTC (rev 131762)
+++ rhbz-966424.patch	2015-04-21 01:27:09 UTC (rev 131763)
@@ -1,23 +0,0 @@
---- 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)