[arch-commits] Commit in thunderbird-extension-enigmail/trunk (2 files)

[Jonas Witschel]

    Date: Sunday, July 5, 2020 @ 12:00:00
  Author: diabonas
Revision: 657815

upgpkg: thunderbird-extension-enigmail 2.1.7-1: (final) upstream release

This is the last version of Enigmail, Thunderbird 78 will not support the
extension any more, offering native OpenPGP support instead. By default the
extension displays a warning to this effect, which might lead some users to
perform unsupported partial upgrades. Hence we disable this warning and replace
it by a versioned dependency on thunderbird<78 to prevent accidental
installations of Enigmail in combination with the next Thunderbird release.

Added:
  thunderbird-extension-enigmail/trunk/0001-Disable-Thunderbird-78-upgrade-warning-message.patch
Modified:
  thunderbird-extension-enigmail/trunk/PKGBUILD

-----------------------------------------------------------+
 0001-Disable-Thunderbird-78-upgrade-warning-message.patch |   31 ++++++++++++
 PKGBUILD                                                  |   20 +++++--
 2 files changed, 44 insertions(+), 7 deletions(-)

Added: 0001-Disable-Thunderbird-78-upgrade-warning-message.patch
===================================================================
--- 0001-Disable-Thunderbird-78-upgrade-warning-message.patch	                        (rev 0)
+++ 0001-Disable-Thunderbird-78-upgrade-warning-message.patch	2020-07-05 12:00:00 UTC (rev 657815)
@@ -0,0 +1,31 @@
+From e60a1b92dc4876ffcb077fafb097246f60eff766 Mon Sep 17 00:00:00 2001
+From: Jonas Witschel <diabonas at archlinux.org>
+Date: Sun, 5 Jul 2020 13:43:42 +0200
+Subject: [PATCH] Disable Thunderbird 78 upgrade warning message
+
+---
+ package/configure.jsm | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/package/configure.jsm b/package/configure.jsm
+index 1a10f901..da521a22 100644
+--- a/package/configure.jsm
++++ b/package/configure.jsm
+@@ -309,6 +309,13 @@ var EnigmailConfigure = {
+   },
+ 
+   upgradeTo217: function(win) {
+-    if (!EnigmailCompat.isPostbox()) displayUpgradeInfo(win);
++    /* Enigmail obtained from addons.mozilla.org shows a warning that the extension will stop
++       working with Thunderbird >= 78 and that users should hold back on upgrading Thunderbird until
++       its new builtin OpenPGP support is mature (expected for Thunderbird 78.2). This makes sense for
++       users of the builtin Thunderbird auto-update function, but less so for user obtaining Thunderbird
++       from a distribution repository, since it encourages partial upgrades. Hence for Arch Linux we
++       remove this warning and add a versioned dependency on Thunderbird < 78 instead to prevent users
++       from accidentally upgrading to the next release while still having Enigmail installed. */
++    // if (!EnigmailCompat.isPostbox()) displayUpgradeInfo(win);
+   }
+ };
+-- 
+2.27.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-05 11:39:26 UTC (rev 657814)
+++ PKGBUILD	2020-07-05 12:00:00 UTC (rev 657815)
@@ -9,7 +9,7 @@
 # Contributor: Hinrich Harms <arch hinrich de>
 
 pkgname=thunderbird-extension-enigmail
-pkgver=2.1.6
+pkgver=2.1.7
 pkgrel=1
 pkgdesc="OpenPGP message encryption and authentication for Thunderbird"
 arch=('any')
@@ -18,13 +18,16 @@
 makedepends=('zip' 'python' 'perl')
 replaces=('thunderbird-enigmail')
 source=("https://www.enigmail.net/download/source/enigmail-${pkgver}.tar.gz"{,.asc}
-        "0001-preferences-disable-pEpAutoDownload-by-default.patch")
-sha512sums=('72159287601ed95052fcdeb3c973714e775150ba41894ecb6474798fd5109ab18dee0e3b8874a920fd07d3b184ed2034cf75f7baff4e14307d8739a312193919'
+        "0001-preferences-disable-pEpAutoDownload-by-default.patch"
+        "0001-Disable-Thunderbird-78-upgrade-warning-message.patch")
+sha512sums=('1b57091c8ab9aaa086f327b78d904d688c850b6d39e37e2dac82e0629c0279723eae4608ecd08a24efe9ed1bdc86fbc497e97cd800c7349a70612a42b98f3e41'
             'SKIP'
-            'baebd963400574db89be747a4419534f945bdc64136d4014656ff98a9615a23984bca724da3f3840670979aab08ce441eee067921e21d0cb216938a20ed785b2')
-b2sums=('e95569dcd58f16e64079436a24b152e7d5e3cfbc2067fe909b0f714a8acbcf80db7b1c288302c0ca11b2536fb2ff4f4376bd5de582f3b65fd01938182c9e8f9c'
+            'baebd963400574db89be747a4419534f945bdc64136d4014656ff98a9615a23984bca724da3f3840670979aab08ce441eee067921e21d0cb216938a20ed785b2'
+            '4ddf887765e4296b3c639748d875b179d1e2a5fb38ad16e2918f115a9ff9a05e2f9c66218544f7ab8189f096908df761d4047fd5d23972c02737e46c4a0c843c')
+b2sums=('8f6d1ec16b48219c75c6dbcddf4807ed57965eeec29776e7c757d5aa34da6bfdbbb58964ee3d7de2efcb65ab69fa5b020f1a8ec01cd8eee662d8195a217cdc69'
         'SKIP'
-        'c593ed7b094d9feecb2f14624cf0628ab390c96f0fb0212ab0069333508b59057ef4b0518da1bf59eb8aaf0942303c4c45afab76d0b8e77a93763eab975cb4c0')
+        'c593ed7b094d9feecb2f14624cf0628ab390c96f0fb0212ab0069333508b59057ef4b0518da1bf59eb8aaf0942303c4c45afab76d0b8e77a93763eab975cb4c0'
+        'a2ba38e56f14a87834023076a75a6c59bc17488104227d8db3e31072f2dcc6488808a980b4073111dec4cf4661349c3e995b8226808c3038d96f2cab666eb90b')
 validpgpkeys=('4F9F89F5505AC1D1A260631CDB1187B9DD5F693B') # Patrick Brunschwig <patrick at enigmail.net>
 
 prepare() {
@@ -33,6 +36,9 @@
     # Using vendor settings via /usr/lib/thunderbird/defaults/preferences/enigmail.js
     # does not seem to work.
     patch -p1 -i ../0001-preferences-disable-pEpAutoDownload-by-default.patch
+
+    # Disable warning message in favour of a versioned dependency to discourage partial upgrades
+    patch -p1 -i ../0001-Disable-Thunderbird-78-upgrade-warning-message.patch
 }
 
 build() {
@@ -43,7 +49,7 @@
 }
 
 package() {
-    depends=('thunderbird>=68' 'gnupg')
+    depends=('thunderbird>=68' 'thunderbird<78' 'gnupg')
     cd "${srcdir}"/enigmail
 
     if ! _extension_id="$(sed -n '/.*<em:id>\(.*\)<\/em:id>.*/{s//\1/p;q}' build-tb/dist/install.rdf 2>/dev/null)" ||