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

Eli Schwartz eschwartz at archlinux.org
Thu Oct 1 15:02:01 UTC 2020


    Date: Thursday, October 1, 2020 @ 15:01:52
  Author: eschwartz
Revision: 714194

upgpkg: thunderbird-extension-enigmail 2.2.4-1: upstream release for thunderbird 78

Migration-only tool for thunderbird versions which natively support PGP. This
is the end of the line for enigmail.

Only compatible with >=78

Modified:
  thunderbird-extension-enigmail/trunk/0001-genxpi-make-XPI-files-reproducible.patch
  thunderbird-extension-enigmail/trunk/PKGBUILD

-----------------------------------------------+
 0001-genxpi-make-XPI-files-reproducible.patch |   47 +++++++++++-------------
 PKGBUILD                                      |   25 +++---------
 2 files changed, 29 insertions(+), 43 deletions(-)

Modified: 0001-genxpi-make-XPI-files-reproducible.patch
===================================================================
--- 0001-genxpi-make-XPI-files-reproducible.patch	2020-10-01 13:06:06 UTC (rev 714193)
+++ 0001-genxpi-make-XPI-files-reproducible.patch	2020-10-01 15:01:52 UTC (rev 714194)
@@ -1,4 +1,4 @@
-From a68b0efbd2002aeb6aa1240b8611cbb97b84d7a7 Mon Sep 17 00:00:00 2001
+From 52c76d2380eaa057f083bcdad3bf7a93817f680c Mon Sep 17 00:00:00 2001
 From: Jonas Witschel <diabonas at gmx.de>
 Date: Fri, 10 Jul 2020 19:02:43 +0200
 Subject: [PATCH] genxpi: make XPI files reproducible
@@ -12,14 +12,14 @@
 of unreproducibilty use "export TZ=UTC" and "zip -X", resp. Also make the mtime
 of the generated XPI file reproducible using "zip -o" for good measure.
 ---
- util/genxpi | 23 +++++++++++++++++------
- 1 file changed, 17 insertions(+), 6 deletions(-)
+ util/genxpi | 19 +++++++++++++------
+ 1 file changed, 13 insertions(+), 6 deletions(-)
 
 diff --git a/util/genxpi b/util/genxpi
-index 9d7c39e5..36110e02 100755
+index 1ef552ea..d2d1a384 100755
 --- a/util/genxpi
 +++ b/util/genxpi
-@@ -60,9 +60,10 @@ find chrome/content/modules -name "*.js*" | LC_ALL=C sort > chrome/content/modul
+@@ -55,9 +55,10 @@ find chrome/content/modules -name "*.js*" | LC_ALL=C sort > chrome/content/modul
  
  echo "Creating ${xpiFile} file"
  
@@ -30,36 +30,35 @@
 +export TZ=UTC
 +
 +set chrome/content/preferences/defaultPrefs.js \
-     chrome/content/modules/addrbook.jsm \
-     chrome/content/modules/amPrefsService.jsm \
      chrome/content/modules/app.jsm \
-@@ -184,9 +185,15 @@ zip -9 --must-match\
-     chrome/content/modules/all-modules.txt \
-     chrome/content/am-enigprefs.xul
+     chrome/content/modules/armor.jsm \
+     chrome/content/modules/buildDate.jsm \
+@@ -114,16 +115,22 @@ zip -9 --must-match\
+     chrome/content/modules/windows.jsm \
+     chrome/content/modules/all-modules.txt
  
--zip -9 \
--    ../${xpiFile} \
--    chrome/content/ui/*.* \
 +# Set modification timestamps to a fixed value for reproducibilty
 +[ -n "$SOURCE_DATE_EPOCH" ] && touch --date "@$SOURCE_DATE_EPOCH" -- "$@"
 +zip -9 -o -X --must-match ../${xpiFile} "$@"
 +
-+if [ $? -ne 0 ]; then
-+  exit 1
-+fi
-+
+ if [ $? -ne 0 ]; then
+   exit 1
+ fi
+ 
+-zip -9 \
+-    ../${xpiFile} \
+-    chrome/content/ui/*.* \
 +set chrome/content/ui/*.* \
-     chrome/skin/aero/*.* \
-     chrome/skin/modern/*.* \
-     chrome/skin/tb-mac/*.* \
-@@ -198,3 +205,7 @@ zip -9 \
-     bootstrap.js \
+     chrome/content/skin/*.* \
+     chrome/locale/*/*.* \
+     webextension.js \
      chrome.manifest \
-     ${pkgFile}
+     schema.json \
+     manifest.json
 +
 +# Set modification timestamps to a fixed value for reproducibilty
 +[ -n "$SOURCE_DATE_EPOCH" ] && touch --date "@$SOURCE_DATE_EPOCH" -- "$@"
 +zip -9 -o -X ../${xpiFile} "$@"
 -- 
-2.27.0
+2.28.0
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-01 13:06:06 UTC (rev 714193)
+++ PKGBUILD	2020-10-01 15:01:52 UTC (rev 714194)
@@ -9,7 +9,7 @@
 # Contributor: Hinrich Harms <arch hinrich de>
 
 pkgname=thunderbird-extension-enigmail
-pkgver=2.1.8
+pkgver=2.2.4
 pkgrel=1
 pkgdesc="OpenPGP message encryption and authentication for Thunderbird"
 arch=('any')
@@ -18,31 +18,18 @@
 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"
-        "0001-Disable-Thunderbird-78-upgrade-warning-message.patch"
         "0001-genxpi-make-XPI-files-reproducible.patch")
-sha512sums=('b21867c08b5e51af4e82a9ecc6e0a7fc056fb165e6cec8fc11d8ed54fd97b30ca5597b5a23243da0803d08aa04a4a3732d56eae9454db89ecd10fcd750b0b1fb'
+sha512sums=('bf23f52ed61002b05e2e432a0abd1f576fe6eb97d94ab2241e17be86138cee153d668747f5759b967d9a4977be3dc901ee78ddb168347bdbbfed9229d27f786d'
             'SKIP'
-            'baebd963400574db89be747a4419534f945bdc64136d4014656ff98a9615a23984bca724da3f3840670979aab08ce441eee067921e21d0cb216938a20ed785b2'
-            '24a25881fe73ac15154df36203a1fb773f556ca58127a4e51681e8dcdf473c42f0abbb5a5750075d1a0dfb685d8e7e56af51598025f57a17e78ca1ca87f2337e'
-            '3902e09d801f8a3fd493450a85c23d3cd95c68465df0025599e6c923b9708a6cb0cb09920170ec5055d55a56e287ae468460fca150f7be8af9d83cffa1a40427')
-b2sums=('8908705a05277b018d40260ea095d2a2d9dee9300c7c4b06a708846e93a68242f60599fd92a2dc4c6d53026723433b7548b55e9fc97fdbe667af38a526f03f8a'
+            '78457902b66792e75f284e5e5a73e5431b71908da79c94f1b9e45faf0f4cefcbe4e3c355d226e7e0a682dd65e913a3a68ef3dc4d6223f9584962fb7c13f70eb4')
+b2sums=('e6d5eab4cba2cd66669ddf38f8152511606c48ce995be331551a7b403ecbd06967c22702a06e06aa89219b5c905e835ddb4d146c0fc2cb11e1a647e46854dd1f'
         'SKIP'
-        'c593ed7b094d9feecb2f14624cf0628ab390c96f0fb0212ab0069333508b59057ef4b0518da1bf59eb8aaf0942303c4c45afab76d0b8e77a93763eab975cb4c0'
-        'af4a02eba9b605998d6965b6d087cd31c7f24dbe355c46f77aecf060efb8707837060b47abd8648b74ebd59251b245b5c7c1159a7c10371bbfe9b3b7f83c1915'
-        '55709a3fd099fab4b11289518a44f2b53e81031606529cec5b4786e796de438faefa52f2a7ab3d29d6b3aca120e279f30d6d7ba3c3e3d02ca2abcb85f1652661')
+        'f0fe6d5b0637002a16f066fc25b3c69113d88651163b3eab4a5da179842d5ddf4e5185dbc45491a5d4800b5cf00a5a89e355768263a710bd467ff070608de900')
 validpgpkeys=('4F9F89F5505AC1D1A260631CDB1187B9DD5F693B') # Patrick Brunschwig <patrick at enigmail.net>
 
 prepare() {
     cd "${srcdir}"/enigmail
 
-    # 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
-
     # Make timestamps in the generated XPI file respect SOURCE_DATE_EPOCH
     # (https://gitlab.com/enigmail/enigmail/-/merge_requests/45 and
     #  https://gitlab.com/enigmail/enigmail/-/merge_requests/46)
@@ -57,7 +44,7 @@
 }
 
 package() {
-    depends=('thunderbird>=68' 'thunderbird<78' 'gnupg')
+    depends=('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)" ||


More information about the arch-commits mailing list