Date: Thursday, October 31, 2019 @ 04:23:27 Author: eschwartz Revision: 521018
archrelease: copy trunk to community-any Added: thunderbird-extension-enigmail/repos/community-any/0001-preferences-disable-pEpAutoDownload-by-default.patch (from rev 521017, thunderbird-extension-enigmail/trunk/0001-preferences-disable-pEpAutoDownload-by-default.patch) thunderbird-extension-enigmail/repos/community-any/PKGBUILD (from rev 521017, thunderbird-extension-enigmail/trunk/PKGBUILD) Deleted: thunderbird-extension-enigmail/repos/community-any/0001-preferences-disable-pEpAutoDownload-by-default.patch thunderbird-extension-enigmail/repos/community-any/PKGBUILD -----------------------------------------------------------+ 0001-preferences-disable-pEpAutoDownload-by-default.patch | 67 +++--- PKGBUILD | 122 ++++++------ 2 files changed, 101 insertions(+), 88 deletions(-) Deleted: 0001-preferences-disable-pEpAutoDownload-by-default.patch =================================================================== --- 0001-preferences-disable-pEpAutoDownload-by-default.patch 2019-10-31 04:23:08 UTC (rev 521017) +++ 0001-preferences-disable-pEpAutoDownload-by-default.patch 2019-10-31 04:23:27 UTC (rev 521018) @@ -1,27 +0,0 @@ -From 83d412cf08d76fab5e79b6f261c3145372337d5e Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <eschwa...@archlinux.org> -Date: Thu, 10 Jan 2019 11:38:38 -0500 -Subject: [PATCH] preferences: disable pEpAutoDownload by default - -Distributions should not automatically download this untrusted code; -should be opt-in by users or be packaged separately. ---- - package/prefs/defaultPrefs.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/package/prefs/defaultPrefs.js b/package/prefs/defaultPrefs.js -index d5ca1249..f8c10a47 100755 ---- a/package/prefs/defaultPrefs.js -+++ b/package/prefs/defaultPrefs.js -@@ -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.20.1 - Copied: thunderbird-extension-enigmail/repos/community-any/0001-preferences-disable-pEpAutoDownload-by-default.patch (from rev 521017, 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 2019-10-31 04:23:27 UTC (rev 521018) @@ -0,0 +1,40 @@ +From 03993708d4d1fb327f102f45d7aa4e9c4fa8237b Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwa...@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 2019-10-31 04:23:08 UTC (rev 521017) +++ PKGBUILD 2019-10-31 04:23:27 UTC (rev 521018) @@ -1,61 +0,0 @@ -# Maintainer: Eli Schwartz <eschwa...@archlinux.org> -# Contributor: Daniel Landau <daniel.lan...@iki.fi> -# Contributor: Einhard Leichtfuß <algu...@respiranto.de> -# Contributor: Xyne -# Contributor: David Manouchehri <d...@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.2 -pkgrel=1 -pkgdesc="OpenPGP message encryption and authentication for Thunderbird" -arch=('any') -url="https://www.enigmail.net/" -license=('MPL' 'GPL3') -makedepends=('zip' 'python2' 'perl') -replaces=('thunderbird-enigmail') -source=("https://www.enigmail.net/download/source/enigmail-${pkgver}.tar.gz"{,.asc} - "0001-preferences-disable-pEpAutoDownload-by-default.patch") -sha512sums=('c76dcdb0561ee6e94ab19c2ed8cddac71297ffc9ad14ac3d37cd8966cc4111cbc74d1b01ccaa044acef699de27a2cc7ba1ade7a31db8ab930095722ffc62be93' - 'SKIP' - '4307c7b6bce7febba7a8186467c3bc93ec3428e1cd75cddad659e4d4a71832f1c8d46e4c811da38ff1dc38b1961a82bd84e7c90b7c63ce080be49ce69571c016') -b2sums=('335c7569e2c46dde645c8992cd7017dc57a0174e109ddada2719cb60de010c8ca3691c1d31e8435986b459936bd1602153e462fb5f93d7ffd1244ea867d8d3bc' - 'SKIP' - 'feb16236a5e5f19a7b7b3259d204732e8a9a5fee78726c5bae67d7a998c10edc89d2131acaa44c6d524ab346670b8b969e0ffd5b8f3fafe0b5b7ae90a1984764') -validpgpkeys=('4F9F89F5505AC1D1A260631CDB1187B9DD5F693B') # Patrick Brunschwig <patr...@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 -} - -build() { - cd "${srcdir}"/enigmail - - ./configure - make -j1 # fails with -j greater than 1 -} - -package() { - depends=('thunderbird>=68' 'gnupg') - cd "${srcdir}"/enigmail - - if ! _extension_id="$(sed -n '/.*<em:id>\(.*\)<\/em:id>.*/{s//\1/p;q}' build/dist/install.rdf 2>/dev/null)" || - [[ -z $_extension_id ]]; then - _extension_id="$(sed -n 's/.*"id": "\(.*\)".*/\1/p' build/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/dist/install.rdf 2>/dev/null; then - install -dm755 "${_extension_dest}" - cp -R build/dist/* "${_extension_dest}" - chmod -R ugo+rX "${_extension_dest}" - else - install -Dm644 build/enigmail-${pkgver}.xpi "${_extension_dest}.xpi" - fi -} Copied: thunderbird-extension-enigmail/repos/community-any/PKGBUILD (from rev 521017, thunderbird-extension-enigmail/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-10-31 04:23:27 UTC (rev 521018) @@ -0,0 +1,61 @@ +# Maintainer: Eli Schwartz <eschwa...@archlinux.org> +# Contributor: Daniel Landau <daniel.lan...@iki.fi> +# Contributor: Einhard Leichtfuß <algu...@respiranto.de> +# Contributor: Xyne +# Contributor: David Manouchehri <d...@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.3 +pkgrel=1 +pkgdesc="OpenPGP message encryption and authentication for Thunderbird" +arch=('any') +url="https://www.enigmail.net/" +license=('MPL' 'GPL3') +makedepends=('zip' 'python2' 'perl') +replaces=('thunderbird-enigmail') +source=("https://www.enigmail.net/download/source/enigmail-${pkgver}.tar.gz"{,.asc} + "0001-preferences-disable-pEpAutoDownload-by-default.patch") +sha512sums=('270c46c282af9e8770ea509c55b0bc315ce715839b1751aa1a0b1ed8374e7ec93333bf8a6d4112adcbacc526d481ad2b276dc12099c48cc9c22fc8409de8d6d0' + 'SKIP' + 'baebd963400574db89be747a4419534f945bdc64136d4014656ff98a9615a23984bca724da3f3840670979aab08ce441eee067921e21d0cb216938a20ed785b2') +b2sums=('090e60739f44c99e011c12202b3de064162c7b1460a24e3280944d7ae7989c1d7dbbe595544fa575e41a62c3de2e19be1c4991b9014487de14ee935da4452d18' + 'SKIP' + 'c593ed7b094d9feecb2f14624cf0628ab390c96f0fb0212ab0069333508b59057ef4b0518da1bf59eb8aaf0942303c4c45afab76d0b8e77a93763eab975cb4c0') +validpgpkeys=('4F9F89F5505AC1D1A260631CDB1187B9DD5F693B') # Patrick Brunschwig <patr...@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 +} + +build() { + cd "${srcdir}"/enigmail + + ./configure + make -j1 # fails with -j greater than 1 +} + +package() { + depends=('thunderbird>=68' '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 +}