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

[Jonas Witschel]

    Date: Sunday, September 13, 2020 @ 10:19:39
  Author: diabonas
Revision: 705096

upgpkg: thunderbird-extension-enigmail 2.1.8-1: upstream release

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

-----------------------------------------------------------+
 0001-Disable-Thunderbird-78-upgrade-warning-message.patch |   16 ++++++------
 PKGBUILD                                                  |   15 ++++++-----
 2 files changed, 16 insertions(+), 15 deletions(-)

Modified: 0001-Disable-Thunderbird-78-upgrade-warning-message.patch
===================================================================
--- 0001-Disable-Thunderbird-78-upgrade-warning-message.patch	2020-09-13 10:16:11 UTC (rev 705095)
+++ 0001-Disable-Thunderbird-78-upgrade-warning-message.patch	2020-09-13 10:19:39 UTC (rev 705096)
@@ -1,4 +1,4 @@
-From e60a1b92dc4876ffcb077fafb097246f60eff766 Mon Sep 17 00:00:00 2001
+From de048bbaa2c236914ab6e13008bbc1f434b05e62 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
@@ -8,14 +8,14 @@
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/package/configure.jsm b/package/configure.jsm
-index 1a10f901..da521a22 100644
+index c230cdf0..8f09b54f 100644
 --- a/package/configure.jsm
 +++ b/package/configure.jsm
-@@ -309,6 +309,13 @@ var EnigmailConfigure = {
-   },
+@@ -311,6 +311,13 @@ var EnigmailConfigure = {
+   upgradeTo217: function(win) {
+     if (EnigmailCompat.isPostbox() || (!EnigmailCompat.isAtLeastTb68())) return;
  
-   upgradeTo217: function(win) {
--    if (!EnigmailCompat.isPostbox()) displayUpgradeInfo(win);
+-    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
@@ -23,9 +23,9 @@
 +       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);
++    // displayUpgradeInfo(win);
    }
  };
 -- 
-2.27.0
+2.28.0
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-13 10:16:11 UTC (rev 705095)
+++ PKGBUILD	2020-09-13 10:19:39 UTC (rev 705096)
@@ -9,8 +9,8 @@
 # Contributor: Hinrich Harms <arch hinrich de>
 
 pkgname=thunderbird-extension-enigmail
-pkgver=2.1.7
-pkgrel=3
+pkgver=2.1.8
+pkgrel=1
 pkgdesc="OpenPGP message encryption and authentication for Thunderbird"
 arch=('any')
 url="https://www.enigmail.net/"
@@ -21,15 +21,15 @@
         "0001-preferences-disable-pEpAutoDownload-by-default.patch"
         "0001-Disable-Thunderbird-78-upgrade-warning-message.patch"
         "0001-genxpi-make-XPI-files-reproducible.patch")
-sha512sums=('1b57091c8ab9aaa086f327b78d904d688c850b6d39e37e2dac82e0629c0279723eae4608ecd08a24efe9ed1bdc86fbc497e97cd800c7349a70612a42b98f3e41'
+sha512sums=('b21867c08b5e51af4e82a9ecc6e0a7fc056fb165e6cec8fc11d8ed54fd97b30ca5597b5a23243da0803d08aa04a4a3732d56eae9454db89ecd10fcd750b0b1fb'
             'SKIP'
             'baebd963400574db89be747a4419534f945bdc64136d4014656ff98a9615a23984bca724da3f3840670979aab08ce441eee067921e21d0cb216938a20ed785b2'
-            '4ddf887765e4296b3c639748d875b179d1e2a5fb38ad16e2918f115a9ff9a05e2f9c66218544f7ab8189f096908df761d4047fd5d23972c02737e46c4a0c843c'
+            '24a25881fe73ac15154df36203a1fb773f556ca58127a4e51681e8dcdf473c42f0abbb5a5750075d1a0dfb685d8e7e56af51598025f57a17e78ca1ca87f2337e'
             '3902e09d801f8a3fd493450a85c23d3cd95c68465df0025599e6c923b9708a6cb0cb09920170ec5055d55a56e287ae468460fca150f7be8af9d83cffa1a40427')
-b2sums=('8f6d1ec16b48219c75c6dbcddf4807ed57965eeec29776e7c757d5aa34da6bfdbbb58964ee3d7de2efcb65ab69fa5b020f1a8ec01cd8eee662d8195a217cdc69'
+b2sums=('8908705a05277b018d40260ea095d2a2d9dee9300c7c4b06a708846e93a68242f60599fd92a2dc4c6d53026723433b7548b55e9fc97fdbe667af38a526f03f8a'
         'SKIP'
         'c593ed7b094d9feecb2f14624cf0628ab390c96f0fb0212ab0069333508b59057ef4b0518da1bf59eb8aaf0942303c4c45afab76d0b8e77a93763eab975cb4c0'
-        'a2ba38e56f14a87834023076a75a6c59bc17488104227d8db3e31072f2dcc6488808a980b4073111dec4cf4661349c3e995b8226808c3038d96f2cab666eb90b'
+        'af4a02eba9b605998d6965b6d087cd31c7f24dbe355c46f77aecf060efb8707837060b47abd8648b74ebd59251b245b5c7c1159a7c10371bbfe9b3b7f83c1915'
         '55709a3fd099fab4b11289518a44f2b53e81031606529cec5b4786e796de438faefa52f2a7ab3d29d6b3aca120e279f30d6d7ba3c3e3d02ca2abcb85f1652661')
 validpgpkeys=('4F9F89F5505AC1D1A260631CDB1187B9DD5F693B') # Patrick Brunschwig <patrick at enigmail.net>
 
@@ -44,7 +44,8 @@
     patch -p1 -i ../0001-Disable-Thunderbird-78-upgrade-warning-message.patch
 
     # Make timestamps in the generated XPI file respect SOURCE_DATE_EPOCH
-    # (https://gitlab.com/enigmail/enigmail/-/merge_requests/45)
+    # (https://gitlab.com/enigmail/enigmail/-/merge_requests/45 and
+    #  https://gitlab.com/enigmail/enigmail/-/merge_requests/46)
     patch -p1 -i ../0001-genxpi-make-XPI-files-reproducible.patch
 }