[icedove-extension-enigmail]: upgrade to v2.1.7

1 files changed, 47 insertions, 15 deletions

diff --git a/libre/icedove-extension-enigmail/PKGBUILD b/libre/icedove-extension-enigmail/PKGBUILD
index edece235d..db0fb5208 100644
--- a/libre/icedove-extension-enigmail/PKGBUILD
+++ b/libre/icedove-extension-enigmail/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer (Arch): Eli Schwartz <eschwartz@archlinux.org>
+# Maintainer (Arch): Jonas Witschel <diabonas@archlinux.org>
 # Contributor (Arch): Daniel Landau <daniel.landau@iki.fi>
 # Contributor (Arch): Einhard Leichtfuß <alguien@respiranto.de>
 # Contributor (Arch): Xyne
@@ -9,18 +10,18 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 # parabola changes and rationale:
-# * allow building arch-dependent versioned packages
+# * allow building per-arch versioned packages
 # * apply dependency version constraints
 
 
 _pkgname=thunderbird-extension-enigmail
 pkgname=icedove-extension-enigmail
-_pkgver_x86_64=2.1.6
-_pkgver_i686=2.1.6
+_pkgver_x86_64=2.1.7
+_pkgver_i686=2.1.7
 _pkgver_armv7h=2.1.6
-_pkgrel_x86_64=3
-_pkgrel_i686=3
-_pkgrel_armv7h=2
+_pkgrel_x86_64=3.parabola1
+_pkgrel_i686=3.parabola1
+_pkgrel_armv7h=2.parabola1
 _icedove_epoch=1
 eval "pkgver=\$_pkgver_${CARCH}" # this is actually an 'any' package
 eval "pkgrel=\$_pkgrel_${CARCH}" # but our different arches do not always roll at the same speed
@@ -33,17 +34,41 @@ replaces=($_pkgname 'icedove-enigmail')
 conflicts=($_pkgname)
 provides=($_pkgname)
 source=("https://www.enigmail.net/download/source/enigmail-${pkgver}.tar.gz"{,.asc}
-        "0001-preferences-disable-pEpAutoDownload-by-default.patch")
-_sha512sums_x86_64=('72159287601ed95052fcdeb3c973714e775150ba41894ecb6474798fd5109ab18dee0e3b8874a920fd07d3b184ed2034cf75f7baff4e14307d8739a312193919'
+        "0001-preferences-disable-pEpAutoDownload-by-default.patch"
+        "0001-Disable-Thunderbird-78-upgrade-warning-message.patch"
+        "0001-genxpi-make-XPI-files-reproducible.patch")
+_sha512sums_x86_64=('1b57091c8ab9aaa086f327b78d904d688c850b6d39e37e2dac82e0629c0279723eae4608ecd08a24efe9ed1bdc86fbc497e97cd800c7349a70612a42b98f3e41'
                     'SKIP'
-                    'baebd963400574db89be747a4419534f945bdc64136d4014656ff98a9615a23984bca724da3f3840670979aab08ce441eee067921e21d0cb216938a20ed785b2')
-_sha512sums_i686=('72159287601ed95052fcdeb3c973714e775150ba41894ecb6474798fd5109ab18dee0e3b8874a920fd07d3b184ed2034cf75f7baff4e14307d8739a312193919'
+                    'baebd963400574db89be747a4419534f945bdc64136d4014656ff98a9615a23984bca724da3f3840670979aab08ce441eee067921e21d0cb216938a20ed785b2'
+                    '4ddf887765e4296b3c639748d875b179d1e2a5fb38ad16e2918f115a9ff9a05e2f9c66218544f7ab8189f096908df761d4047fd5d23972c02737e46c4a0c843c'
+                    '3902e09d801f8a3fd493450a85c23d3cd95c68465df0025599e6c923b9708a6cb0cb09920170ec5055d55a56e287ae468460fca150f7be8af9d83cffa1a40427')
+_sha512sums_i686=('1b57091c8ab9aaa086f327b78d904d688c850b6d39e37e2dac82e0629c0279723eae4608ecd08a24efe9ed1bdc86fbc497e97cd800c7349a70612a42b98f3e41'
                   'SKIP'
-                  'baebd963400574db89be747a4419534f945bdc64136d4014656ff98a9615a23984bca724da3f3840670979aab08ce441eee067921e21d0cb216938a20ed785b2')
+                  'baebd963400574db89be747a4419534f945bdc64136d4014656ff98a9615a23984bca724da3f3840670979aab08ce441eee067921e21d0cb216938a20ed785b2'
+                  '4ddf887765e4296b3c639748d875b179d1e2a5fb38ad16e2918f115a9ff9a05e2f9c66218544f7ab8189f096908df761d4047fd5d23972c02737e46c4a0c843c'
+                  '3902e09d801f8a3fd493450a85c23d3cd95c68465df0025599e6c923b9708a6cb0cb09920170ec5055d55a56e287ae468460fca150f7be8af9d83cffa1a40427')
 _sha512sums_armv7h=('72159287601ed95052fcdeb3c973714e775150ba41894ecb6474798fd5109ab18dee0e3b8874a920fd07d3b184ed2034cf75f7baff4e14307d8739a312193919'
                     'SKIP'
-                    'baebd963400574db89be747a4419534f945bdc64136d4014656ff98a9615a23984bca724da3f3840670979aab08ce441eee067921e21d0cb216938a20ed785b2')
+                    'baebd963400574db89be747a4419534f945bdc64136d4014656ff98a9615a23984bca724da3f3840670979aab08ce441eee067921e21d0cb216938a20ed785b2'
+                    '4ddf887765e4296b3c639748d875b179d1e2a5fb38ad16e2918f115a9ff9a05e2f9c66218544f7ab8189f096908df761d4047fd5d23972c02737e46c4a0c843c'
+                    '3902e09d801f8a3fd493450a85c23d3cd95c68465df0025599e6c923b9708a6cb0cb09920170ec5055d55a56e287ae468460fca150f7be8af9d83cffa1a40427')
 eval "sha512sums=(\${_sha512sums_${CARCH}[*]})"
+_b2sums_x86_64=('8f6d1ec16b48219c75c6dbcddf4807ed57965eeec29776e7c757d5aa34da6bfdbbb58964ee3d7de2efcb65ab69fa5b020f1a8ec01cd8eee662d8195a217cdc69'
+                'SKIP'
+                'c593ed7b094d9feecb2f14624cf0628ab390c96f0fb0212ab0069333508b59057ef4b0518da1bf59eb8aaf0942303c4c45afab76d0b8e77a93763eab975cb4c0'
+                'a2ba38e56f14a87834023076a75a6c59bc17488104227d8db3e31072f2dcc6488808a980b4073111dec4cf4661349c3e995b8226808c3038d96f2cab666eb90b'
+                '55709a3fd099fab4b11289518a44f2b53e81031606529cec5b4786e796de438faefa52f2a7ab3d29d6b3aca120e279f30d6d7ba3c3e3d02ca2abcb85f1652661')
+_b2sums_i686=('8f6d1ec16b48219c75c6dbcddf4807ed57965eeec29776e7c757d5aa34da6bfdbbb58964ee3d7de2efcb65ab69fa5b020f1a8ec01cd8eee662d8195a217cdc69'
+              'SKIP'
+              'c593ed7b094d9feecb2f14624cf0628ab390c96f0fb0212ab0069333508b59057ef4b0518da1bf59eb8aaf0942303c4c45afab76d0b8e77a93763eab975cb4c0'
+              'a2ba38e56f14a87834023076a75a6c59bc17488104227d8db3e31072f2dcc6488808a980b4073111dec4cf4661349c3e995b8226808c3038d96f2cab666eb90b'
+              '55709a3fd099fab4b11289518a44f2b53e81031606529cec5b4786e796de438faefa52f2a7ab3d29d6b3aca120e279f30d6d7ba3c3e3d02ca2abcb85f1652661')
+_b2sums_armv7h=('8f6d1ec16b48219c75c6dbcddf4807ed57965eeec29776e7c757d5aa34da6bfdbbb58964ee3d7de2efcb65ab69fa5b020f1a8ec01cd8eee662d8195a217cdc69'
+                'SKIP'
+                'c593ed7b094d9feecb2f14624cf0628ab390c96f0fb0212ab0069333508b59057ef4b0518da1bf59eb8aaf0942303c4c45afab76d0b8e77a93763eab975cb4c0'
+                'a2ba38e56f14a87834023076a75a6c59bc17488104227d8db3e31072f2dcc6488808a980b4073111dec4cf4661349c3e995b8226808c3038d96f2cab666eb90b'
+                '55709a3fd099fab4b11289518a44f2b53e81031606529cec5b4786e796de438faefa52f2a7ab3d29d6b3aca120e279f30d6d7ba3c3e3d02ca2abcb85f1652661')
+eval "b2sums=(\${_b2sums_${CARCH}[*]})"
 validpgpkeys=('4F9F89F5505AC1D1A260631CDB1187B9DD5F693B') # Patrick Brunschwig <patrick@enigmail.net>
 
 
@@ -71,6 +96,13 @@ prepare() {
     # 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)
+    patch -p1 -i ../0001-genxpi-make-XPI-files-reproducible.patch
 }
 
 build() {
@@ -81,10 +113,8 @@ build() {
 }
 
 package() {
-    cd "${srcdir}"/enigmail
-
     # dependency version contraints
-    local min_max_icedove_vers=( $(grep strict_.*_version build-tb/dist/manifest.json | sed 's|.*: "\([0-9]*\)\..*|\1|g') )
+    local min_max_icedove_vers=( $(grep strict_.*_version "${srcdir}"/enigmail/build-tb/dist/manifest.json | sed 's|.*: "\([0-9]*\)\..*|\1|g') )
     local min_icedove_ver=${min_max_icedove_vers[0]}
     local max_icedove_ver=${min_max_icedove_vers[1]}
     local icedove_constraint_string="icedove>=${_icedove_epoch}:${min_icedove_ver} icedove<${_icedove_epoch}:$(( max_icedove_ver + 1 ))"
@@ -96,6 +126,8 @@ package() {
          return 1
     fi
 
+    cd "${srcdir}"/enigmail
+
     if ! _extension_id="$(sed -n '/.*<em:id>\(.*\)<\/em:id>.*/{s//\1/p;q}' build-tb/dist/install.rdf 2>/dev/null)" ||
             [[ -z $_extension_id ]]; then
         _extension_id="$(sed -n 's/.*"id": "\(.*\)".*/\1/p' build-tb/dist/manifest.json)"