[arch-commits] Commit in thunderbird-extension-enigmail/repos/community-any (6 files)

Jonas Witschel diabonas at archlinux.org
Fri Jul 10 12:44:06 UTC 2020


    Date: Friday, July 10, 2020 @ 12:44:05
  Author: diabonas
Revision: 663094

archrelease: copy trunk to community-any

Added:
  thunderbird-extension-enigmail/repos/community-any/0001-Disable-Thunderbird-78-upgrade-warning-message.patch
    (from rev 663093, thunderbird-extension-enigmail/trunk/0001-Disable-Thunderbird-78-upgrade-warning-message.patch)
  thunderbird-extension-enigmail/repos/community-any/0001-preferences-disable-pEpAutoDownload-by-default.patch
    (from rev 663093, thunderbird-extension-enigmail/trunk/0001-preferences-disable-pEpAutoDownload-by-default.patch)
  thunderbird-extension-enigmail/repos/community-any/PKGBUILD
    (from rev 663093, thunderbird-extension-enigmail/trunk/PKGBUILD)
Deleted:
  thunderbird-extension-enigmail/repos/community-any/0001-Disable-Thunderbird-78-upgrade-warning-message.patch
  thunderbird-extension-enigmail/repos/community-any/0001-preferences-disable-pEpAutoDownload-by-default.patch
  thunderbird-extension-enigmail/repos/community-any/PKGBUILD

-----------------------------------------------------------+
 0001-Disable-Thunderbird-78-upgrade-warning-message.patch |   62 ++---
 0001-preferences-disable-pEpAutoDownload-by-default.patch |   80 +++---
 PKGBUILD                                                  |  143 ++++++------
 3 files changed, 146 insertions(+), 139 deletions(-)

Deleted: 0001-Disable-Thunderbird-78-upgrade-warning-message.patch
===================================================================
--- 0001-Disable-Thunderbird-78-upgrade-warning-message.patch	2020-07-10 12:43:57 UTC (rev 663093)
+++ 0001-Disable-Thunderbird-78-upgrade-warning-message.patch	2020-07-10 12:44:05 UTC (rev 663094)
@@ -1,31 +0,0 @@
-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
-

Copied: thunderbird-extension-enigmail/repos/community-any/0001-Disable-Thunderbird-78-upgrade-warning-message.patch (from rev 663093, thunderbird-extension-enigmail/trunk/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-10 12:44:05 UTC (rev 663094)
@@ -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
+

Deleted: 0001-preferences-disable-pEpAutoDownload-by-default.patch
===================================================================
--- 0001-preferences-disable-pEpAutoDownload-by-default.patch	2020-07-10 12:43:57 UTC (rev 663093)
+++ 0001-preferences-disable-pEpAutoDownload-by-default.patch	2020-07-10 12:44:05 UTC (rev 663094)
@@ -1,40 +0,0 @@
-From 03993708d4d1fb327f102f45d7aa4e9c4fa8237b Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz at archlinux.org>
-Date: Thu, 10 Jan 2019 11:38:38 -0500
-Subject: [PATCH] preferences: disable pEpAutoDownload by default and avoid p=p
-
-Distributions should not automatically download this untrusted code;
-should be opt-in by users or be packaged separately.
-
-Additionally, we are an advanced distro and should generally avoid p=p
-in favor of the user's PGP keys. Moreover, p=p is undocumented and seems
-to lead to unintuitive use of the wrong PGP keys in new installations.
----
- package/prefs/defaultPrefs.js | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/package/prefs/defaultPrefs.js b/package/prefs/defaultPrefs.js
-index d5ca1249..f7ddc864 100755
---- a/package/prefs/defaultPrefs.js
-+++ b/package/prefs/defaultPrefs.js
-@@ -14,7 +14,7 @@
- // 0: force using Enigmail
- // 1: automatic mode (use pEp if Enigmail and S/MIME are not configured for any identity)
- // 2: force using pEp
--pref("extensions.enigmail.juniorMode", 1);
-+pref("extensions.enigmail.juniorMode", 0);
- 
- // the last configured Enigmail version
- pref("extensions.enigmail.configuredVersion", "");
-@@ -204,7 +204,7 @@ pref("extensions.enigmail.warnDownloadContactKeys", true);
- pref("extensions.enigmail.wrapHtmlBeforeSend", true);
- 
- // automatically download pepmda if it is available (without askin user)
--pref("extensions.enigmail.pEpAutoDownload", true);
-+pref("extensions.enigmail.pEpAutoDownload", false);
- 
- // holds the last result of the last check for pEp updates
- pref("extensions.enigmail.pEpLastUpdate", 0);
--- 
-2.23.0
-

Copied: thunderbird-extension-enigmail/repos/community-any/0001-preferences-disable-pEpAutoDownload-by-default.patch (from rev 663093, thunderbird-extension-enigmail/trunk/0001-preferences-disable-pEpAutoDownload-by-default.patch)
===================================================================
--- 0001-preferences-disable-pEpAutoDownload-by-default.patch	                        (rev 0)
+++ 0001-preferences-disable-pEpAutoDownload-by-default.patch	2020-07-10 12:44:05 UTC (rev 663094)
@@ -0,0 +1,40 @@
+From 03993708d4d1fb327f102f45d7aa4e9c4fa8237b Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz at archlinux.org>
+Date: Thu, 10 Jan 2019 11:38:38 -0500
+Subject: [PATCH] preferences: disable pEpAutoDownload by default and avoid p=p
+
+Distributions should not automatically download this untrusted code;
+should be opt-in by users or be packaged separately.
+
+Additionally, we are an advanced distro and should generally avoid p=p
+in favor of the user's PGP keys. Moreover, p=p is undocumented and seems
+to lead to unintuitive use of the wrong PGP keys in new installations.
+---
+ package/prefs/defaultPrefs.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/package/prefs/defaultPrefs.js b/package/prefs/defaultPrefs.js
+index d5ca1249..f7ddc864 100755
+--- a/package/prefs/defaultPrefs.js
++++ b/package/prefs/defaultPrefs.js
+@@ -14,7 +14,7 @@
+ // 0: force using Enigmail
+ // 1: automatic mode (use pEp if Enigmail and S/MIME are not configured for any identity)
+ // 2: force using pEp
+-pref("extensions.enigmail.juniorMode", 1);
++pref("extensions.enigmail.juniorMode", 0);
+ 
+ // the last configured Enigmail version
+ pref("extensions.enigmail.configuredVersion", "");
+@@ -204,7 +204,7 @@ pref("extensions.enigmail.warnDownloadContactKeys", true);
+ pref("extensions.enigmail.wrapHtmlBeforeSend", true);
+ 
+ // automatically download pepmda if it is available (without askin user)
+-pref("extensions.enigmail.pEpAutoDownload", true);
++pref("extensions.enigmail.pEpAutoDownload", false);
+ 
+ // holds the last result of the last check for pEp updates
+ pref("extensions.enigmail.pEpLastUpdate", 0);
+-- 
+2.23.0
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-10 12:43:57 UTC (rev 663093)
+++ PKGBUILD	2020-07-10 12:44:05 UTC (rev 663094)
@@ -1,68 +0,0 @@
-# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
-# Maintainer: Jonas Witschel <diabonas at archlinux.org>
-# Contributor: Daniel Landau <daniel.landau at iki.fi>
-# Contributor: Einhard Leichtfuß <alguien at respiranto.de>
-# Contributor: Xyne
-# Contributor: David Manouchehri <d at 32t.ca>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Thomas Jost <schnouki schnouki net>
-# Contributor: Hinrich Harms <arch hinrich de>
-
-pkgname=thunderbird-extension-enigmail
-pkgver=2.1.7
-pkgrel=1
-pkgdesc="OpenPGP message encryption and authentication for Thunderbird"
-arch=('any')
-url="https://www.enigmail.net/"
-license=('MPL' 'GPL3')
-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")
-sha512sums=('1b57091c8ab9aaa086f327b78d904d688c850b6d39e37e2dac82e0629c0279723eae4608ecd08a24efe9ed1bdc86fbc497e97cd800c7349a70612a42b98f3e41'
-            'SKIP'
-            'baebd963400574db89be747a4419534f945bdc64136d4014656ff98a9615a23984bca724da3f3840670979aab08ce441eee067921e21d0cb216938a20ed785b2'
-            '4ddf887765e4296b3c639748d875b179d1e2a5fb38ad16e2918f115a9ff9a05e2f9c66218544f7ab8189f096908df761d4047fd5d23972c02737e46c4a0c843c')
-b2sums=('8f6d1ec16b48219c75c6dbcddf4807ed57965eeec29776e7c757d5aa34da6bfdbbb58964ee3d7de2efcb65ab69fa5b020f1a8ec01cd8eee662d8195a217cdc69'
-        'SKIP'
-        'c593ed7b094d9feecb2f14624cf0628ab390c96f0fb0212ab0069333508b59057ef4b0518da1bf59eb8aaf0942303c4c45afab76d0b8e77a93763eab975cb4c0'
-        'a2ba38e56f14a87834023076a75a6c59bc17488104227d8db3e31072f2dcc6488808a980b4073111dec4cf4661349c3e995b8226808c3038d96f2cab666eb90b')
-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
-}
-
-build() {
-    cd "${srcdir}"/enigmail
-
-    ./configure
-    make -j1 # fails with -j greater than 1
-}
-
-package() {
-    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)" ||
-            [[ -z $_extension_id ]]; then
-        _extension_id="$(sed -n 's/.*"id": "\(.*\)".*/\1/p' build-tb/dist/manifest.json)"
-    fi
-    _extension_dest="${pkgdir}/usr/lib/thunderbird/extensions/${_extension_id}"
-    # Should this extension be unpacked or not?
-    if grep -q '<em:unpack>true</em:unpack>' build-tb/dist/install.rdf 2>/dev/null; then
-        install -dm755 "${_extension_dest}"
-        cp -R build-tb/dist/* "${_extension_dest}"
-        chmod -R ugo+rX "${_extension_dest}"
-    else
-        install -Dm644 build-tb/enigmail-${pkgver}.xpi "${_extension_dest}.xpi"
-    fi
-}

Copied: thunderbird-extension-enigmail/repos/community-any/PKGBUILD (from rev 663093, thunderbird-extension-enigmail/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-07-10 12:44:05 UTC (rev 663094)
@@ -0,0 +1,75 @@
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Maintainer: Jonas Witschel <diabonas at archlinux.org>
+# Contributor: Daniel Landau <daniel.landau at iki.fi>
+# Contributor: Einhard Leichtfuß <alguien at respiranto.de>
+# Contributor: Xyne
+# Contributor: David Manouchehri <d at 32t.ca>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: Thomas Jost <schnouki schnouki net>
+# Contributor: Hinrich Harms <arch hinrich de>
+
+pkgname=thunderbird-extension-enigmail
+pkgver=2.1.7
+pkgrel=2
+pkgdesc="OpenPGP message encryption and authentication for Thunderbird"
+arch=('any')
+url="https://www.enigmail.net/"
+license=('MPL' 'GPL3')
+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"
+        "enigmail-reprodible-xpi-timestamps.patch::https://gitlab.com/enigmail/enigmail/-/commit/e905796792feff11ec92d3757e0c54dea0d605d3.patch")
+sha512sums=('1b57091c8ab9aaa086f327b78d904d688c850b6d39e37e2dac82e0629c0279723eae4608ecd08a24efe9ed1bdc86fbc497e97cd800c7349a70612a42b98f3e41'
+            'SKIP'
+            'baebd963400574db89be747a4419534f945bdc64136d4014656ff98a9615a23984bca724da3f3840670979aab08ce441eee067921e21d0cb216938a20ed785b2'
+            '4ddf887765e4296b3c639748d875b179d1e2a5fb38ad16e2918f115a9ff9a05e2f9c66218544f7ab8189f096908df761d4047fd5d23972c02737e46c4a0c843c'
+            '1ba5b64fb93737899d61d1f6755822eb6de5ac29a5016cc1a6260c480904c347b656b9e37c6476bc3c07058d750ff90ff04b5ebe65844f88975b98ec3064eaac')
+b2sums=('8f6d1ec16b48219c75c6dbcddf4807ed57965eeec29776e7c757d5aa34da6bfdbbb58964ee3d7de2efcb65ab69fa5b020f1a8ec01cd8eee662d8195a217cdc69'
+        'SKIP'
+        'c593ed7b094d9feecb2f14624cf0628ab390c96f0fb0212ab0069333508b59057ef4b0518da1bf59eb8aaf0942303c4c45afab76d0b8e77a93763eab975cb4c0'
+        'a2ba38e56f14a87834023076a75a6c59bc17488104227d8db3e31072f2dcc6488808a980b4073111dec4cf4661349c3e995b8226808c3038d96f2cab666eb90b'
+        '906c099f4d01a5d265cc96172ad00e44fca7c043eaad9827f5f319b294134e522d615100027ddbb89638d0b553a64451f4f116ddef5549081ba888217cb8c252')
+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)
+    patch -p1 -i ../enigmail-reprodible-xpi-timestamps.patch
+}
+
+build() {
+    cd "${srcdir}"/enigmail
+
+    ./configure
+    make -j1 # fails with -j greater than 1
+}
+
+package() {
+    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)" ||
+            [[ -z $_extension_id ]]; then
+        _extension_id="$(sed -n 's/.*"id": "\(.*\)".*/\1/p' build-tb/dist/manifest.json)"
+    fi
+    _extension_dest="${pkgdir}/usr/lib/thunderbird/extensions/${_extension_id}"
+    # Should this extension be unpacked or not?
+    if grep -q '<em:unpack>true</em:unpack>' build-tb/dist/install.rdf 2>/dev/null; then
+        install -dm755 "${_extension_dest}"
+        cp -R build-tb/dist/* "${_extension_dest}"
+        chmod -R ugo+rX "${_extension_dest}"
+    else
+        install -Dm644 build-tb/enigmail-${pkgver}.xpi "${_extension_dest}.xpi"
+    fi
+}


More information about the arch-commits mailing list