Date: Thursday, December 12, 2019 @ 21:58:48 Author: diabonas Revision: 537486
archrelease: copy trunk to community-any Added: thunderbird-extension-enigmail/repos/community-any/0001-preferences-disable-pEpAutoDownload-by-default.patch (from rev 537485, thunderbird-extension-enigmail/trunk/0001-preferences-disable-pEpAutoDownload-by-default.patch) thunderbird-extension-enigmail/repos/community-any/PKGBUILD (from rev 537485, 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 | 80 +++---- PKGBUILD | 123 ++++++------ 2 files changed, 102 insertions(+), 101 deletions(-) Deleted: 0001-preferences-disable-pEpAutoDownload-by-default.patch =================================================================== --- 0001-preferences-disable-pEpAutoDownload-by-default.patch 2019-12-12 21:58:39 UTC (rev 537485) +++ 0001-preferences-disable-pEpAutoDownload-by-default.patch 2019-12-12 21:58:48 UTC (rev 537486) @@ -1,40 +0,0 @@ -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 - Copied: thunderbird-extension-enigmail/repos/community-any/0001-preferences-disable-pEpAutoDownload-by-default.patch (from rev 537485, 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-12-12 21:58:48 UTC (rev 537486) @@ -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-12-12 21:58:39 UTC (rev 537485) +++ PKGBUILD 2019-12-12 21:58:48 UTC (rev 537486) @@ -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.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 -} Copied: thunderbird-extension-enigmail/repos/community-any/PKGBUILD (from rev 537485, thunderbird-extension-enigmail/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-12-12 21:58:48 UTC (rev 537486) @@ -0,0 +1,62 @@ +# Maintainer: Eli Schwartz <eschwa...@archlinux.org> +# Maintainer: Jonas Witschel <diabo...@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.4 +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") +sha512sums=('bddcc32271bc15945a4683522e117ab5c3db8175ffa9e45091326ca926fe5a8c824f6e92a1e0efc2f820f9700586fe0fd87a57a2fc0d1efe4332e2e35b1af33d' + 'SKIP' + 'baebd963400574db89be747a4419534f945bdc64136d4014656ff98a9615a23984bca724da3f3840670979aab08ce441eee067921e21d0cb216938a20ed785b2') +b2sums=('ba9fa7aee425bea015569e8ec5166b634f828911b0143cfca50df8f2ded53df450be48a062c5108d28594bbf9b85a373c82b7a9322109eb08a50ef575c934c37' + '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 +}