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

Jan Steffens heftig at archlinux.org
Thu Aug 28 18:29:01 UTC 2014


    Date: Thursday, August 28, 2014 @ 20:29:00
  Author: heftig
Revision: 118035

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

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-28 16:27:02 UTC (rev 118034)
+++ PKGBUILD	2014-08-28 18:29:00 UTC (rev 118035)
@@ -3,7 +3,7 @@
 
 pkgname=seamonkey
 pkgver=2.26.1
-pkgrel=1
+pkgrel=2
 pkgdesc="SeaMonkey internet suite"
 arch=('i686' 'x86_64')
 license=('MPL')
@@ -17,10 +17,12 @@
 url="http://www.seamonkey-project.org/"
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.bz2
         mozconfig
-        seamonkey-2.0-lang.patch)
+        seamonkey-2.0-lang.patch
+        rhbz-966424.patch)
 md5sums=('4bfa46b370b4d211eef56b90277a9517'
          '9b6d65e9b77acf9fd7c6e3578a5d2acd'
-         '25b6fe16ac24cd5c852213e5c1adb272')
+         '25b6fe16ac24cd5c852213e5c1adb272'
+         '8c1578232b7a60fa1caa9a0b322d1e2b')
 
 prepare() {
   cd comm-release
@@ -27,6 +29,9 @@
   cp ../mozconfig .mozconfig
   patch -Np1 -i ../seamonkey-2.0-lang.patch
 
+  # https://bugs.archlinux.org/task/41689
+  patch -Np1 -d mozilla -i ../../rhbz-966424.patch
+
   # Don't exit with error when some libs are missing which we have in
   # system.
   sed -i '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' suite/installer/Makefile.in

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




More information about the arch-commits mailing list