[arch-commits] Commit in thunderbird-extension-enigmail/repos/community-any (3 files)
Eli Schwartz
eschwartz at archlinux.org
Thu Jan 10 20:53:12 UTC 2019
Date: Thursday, January 10, 2019 @ 20:53:07
Author: eschwartz
Revision: 422061
archrelease: copy trunk to community-any
Added:
thunderbird-extension-enigmail/repos/community-any/0001-preferences-disable-pEpAutoDownload-by-default.patch
(from rev 422060, thunderbird-extension-enigmail/trunk/0001-preferences-disable-pEpAutoDownload-by-default.patch)
thunderbird-extension-enigmail/repos/community-any/PKGBUILD
(from rev 422060, thunderbird-extension-enigmail/trunk/PKGBUILD)
Deleted:
thunderbird-extension-enigmail/repos/community-any/PKGBUILD
-----------------------------------------------------------+
0001-preferences-disable-pEpAutoDownload-by-default.patch | 27 ++
PKGBUILD | 109 ++++++------
2 files changed, 87 insertions(+), 49 deletions(-)
Copied: thunderbird-extension-enigmail/repos/community-any/0001-preferences-disable-pEpAutoDownload-by-default.patch (from rev 422060, 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-01-10 20:53:07 UTC (rev 422061)
@@ -0,0 +1,27 @@
+From 83d412cf08d76fab5e79b6f261c3145372337d5e 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
+
+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
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-01-10 20:52:53 UTC (rev 422060)
+++ PKGBUILD 2019-01-10 20:53:07 UTC (rev 422061)
@@ -1,49 +0,0 @@
-# Maintainer: Eli Schwartz <eschwartz 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.0.8
-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})
-sha512sums=('9d2e95c2eae6ca22897eb8b2961964d96fd633e7d33a8c0c04a29b4cbc8585777598578abfb0484b96827ca165fe9c8b873e5e7f7cb3ba8cd0779ddc4f10e305'
- 'SKIP')
-validpgpkeys=('4F9F89F5505AC1D1A260631CDB1187B9DD5F693B') # Patrick Brunschwig <patrick at enigmail.net>
-
-build() {
- cd "${srcdir}"/enigmail
-
- ./configure
- make -j1 # fails with -j greater than 1
-}
-
-package() {
- depends=('thunderbird' 'gnupg')
- cd "${srcdir}"/enigmail
-
- if [[ -f package/install.rdf ]]; then
- _extension_id="$(sed -n '/.*<em:id>\(.*\)<\/em:id>.*/{s//\1/p;q}' build/dist/install.rdf)"
- else
- _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 422060, thunderbird-extension-enigmail/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-01-10 20:53:07 UTC (rev 422061)
@@ -0,0 +1,60 @@
+# Maintainer: Eli Schwartz <eschwartz 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.0.9
+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=('2053148b0e5e763dfc1f8decff0fea2a40ebd306e4844440bd9a3ced4e1f7ff2f16bccf72f85e73b7c51b40629489ad125b9bc166558e3b4144038ba45fcb197'
+ 'SKIP'
+ '4307c7b6bce7febba7a8186467c3bc93ec3428e1cd75cddad659e4d4a71832f1c8d46e4c811da38ff1dc38b1961a82bd84e7c90b7c63ce080be49ce69571c016')
+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
+}
+
+build() {
+ cd "${srcdir}"/enigmail
+
+ ./configure
+ # https://gitlab.com/enigmail/enigmail/merge_requests/34
+ make -j1 XPI_MODULE_VERS=${pkgver} # fails with -j greater than 1
+}
+
+package() {
+ depends=('thunderbird' 'gnupg')
+ cd "${srcdir}"/enigmail
+
+ if [[ -f package/install.rdf ]]; then
+ _extension_id="$(sed -n '/.*<em:id>\(.*\)<\/em:id>.*/{s//\1/p;q}' build/dist/install.rdf)"
+ else
+ _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
+}
More information about the arch-commits
mailing list