summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/icedove/PKGBUILD15
-rw-r--r--libre/icedove/rhbz-966424.patch23
-rw-r--r--nonprism/icedove/PKGBUILD15
-rw-r--r--nonprism/icedove/rhbz-966424.patch23
4 files changed, 66 insertions, 10 deletions
diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD
index 9fdf683e7..1f1679160 100644
--- a/libre/icedove/PKGBUILD
+++ b/libre/icedove/PKGBUILD
@@ -3,15 +3,15 @@
# We're getting this from Debian Sid
_debname=icedove
-_debver=31.0
-_debrel=deb3
+_debver=31.1.2
+_debrel=deb1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
pkgname=${_debname}
epoch=1
pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=1
pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
arch=('i686' 'x86_64' 'mips64el')
license=('MPL' 'GPL' 'LGPL')
@@ -27,12 +27,14 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
"${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.xz"
mozconfig
vendor.js
+ rhbz-966424.patch
${pkgname}.desktop)
options=(!emptydirs)
-md5sums=('1ea1f4340b1ab29a29aed74f4d6197bd'
- 'f97baf462902b155b370f010c112ad82'
+md5sums=('2825660683f79a18e443329fef9bb978'
+ '8aa5c95cf36bb49086e47c491df329e0'
'5f2297712c3dab7b15d7d5c8a6fa22d2'
'b960d6e999cf49e8875743e35a00ed41'
+ '8c1578232b7a60fa1caa9a0b322d1e2b'
'e785e0c267f4435ae1a9aa0b03bcacfb')
prepare() {
@@ -88,6 +90,9 @@ prepare() {
cp "${srcdir}/mozconfig" .mozconfig
+ # https://bugs.archlinux.org/task/41689
+ patch -Np1 -d mozilla -i ../../rhbz-966424.patch
+
# configure script misdetects the preprocessor without an optimization level
# https://bugs.archlinux.org/task/34644
sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure
diff --git a/libre/icedove/rhbz-966424.patch b/libre/icedove/rhbz-966424.patch
new file mode 100644
index 000000000..c4c332e9e
--- /dev/null
+++ b/libre/icedove/rhbz-966424.patch
@@ -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)
diff --git a/nonprism/icedove/PKGBUILD b/nonprism/icedove/PKGBUILD
index cb32b5466..b079c37ab 100644
--- a/nonprism/icedove/PKGBUILD
+++ b/nonprism/icedove/PKGBUILD
@@ -3,15 +3,15 @@
# We're getting this from Debian Sid
_debname=icedove
-_debver=31.0
-_debrel=deb3
+_debver=31.1.2
+_debrel=deb1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
pkgname=${_debname}
epoch=1
pkgver=${_debver}.${_debrel}
-pkgrel=2.nonprism1
+pkgrel=1.nonprism1
pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird, without support for unsafe and dangerous for privacy protocols"
arch=('i686' 'x86_64' 'mips64el')
license=('MPL' 'GPL' 'LGPL')
@@ -27,12 +27,14 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
"${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.xz"
mozconfig
vendor.js
+ rhbz-966424.patch
${pkgname}.desktop)
options=(!emptydirs)
-md5sums=('1ea1f4340b1ab29a29aed74f4d6197bd'
- 'f97baf462902b155b370f010c112ad82'
+md5sums=('2825660683f79a18e443329fef9bb978'
+ '8aa5c95cf36bb49086e47c491df329e0'
'5f2297712c3dab7b15d7d5c8a6fa22d2'
'b960d6e999cf49e8875743e35a00ed41'
+ '8c1578232b7a60fa1caa9a0b322d1e2b'
'e785e0c267f4435ae1a9aa0b03bcacfb')
prepare() {
@@ -102,6 +104,9 @@ prepare() {
cp "${srcdir}/mozconfig" .mozconfig
+ # https://bugs.archlinux.org/task/41689
+ patch -Np1 -d mozilla -i ../../rhbz-966424.patch
+
# configure script misdetects the preprocessor without an optimization level
# https://bugs.archlinux.org/task/34644
sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure
diff --git a/nonprism/icedove/rhbz-966424.patch b/nonprism/icedove/rhbz-966424.patch
new file mode 100644
index 000000000..c4c332e9e
--- /dev/null
+++ b/nonprism/icedove/rhbz-966424.patch
@@ -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)