3 files changed, 91 insertions, 41 deletions
diff --git a/libre/icedove-extension-enigmail/0001-preferences-disable-pEpAutoDownload-by-default.patch b/libre/icedove-extension-enigmail/0001-preferences-disable-pEpAutoDownload-by-default.patch
new file mode 100644
index 000000000..afc10a9d6
--- /dev/null
+++ b/libre/icedove-extension-enigmail/0001-preferences-disable-pEpAutoDownload-by-default.patch
@@ -0,0 +1,27 @@
+From 83d412cf08d76fab5e79b6f261c3145372337d5e Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@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
+
diff --git a/libre/icedove-extension-enigmail/PKGBUILD b/libre/icedove-extension-enigmail/PKGBUILD
new file mode 100644
index 000000000..974f23652
--- /dev/null
+++ b/libre/icedove-extension-enigmail/PKGBUILD
@@ -0,0 +1,64 @@
+# Maintainer (Arch): Eli Schwartz <eschwartz@archlinux.org>
+# Contributor (Arch): Daniel Landau <daniel.landau@iki.fi>
+# Contributor (Arch): Einhard Leichtfuß <alguien@respiranto.de>
+# Contributor (Arch): Xyne
+# Contributor (Arch): David Manouchehri <d@32t.ca>
+# Contributor (Arch): Alexander Fehr <pizzapunk gmail com>
+# Contributor (Arch): Thomas Jost <schnouki schnouki net>
+# Contributor (Arch): Hinrich Harms <arch hinrich de>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+
+_pkgname=thunderbird-extension-enigmail
+pkgname=icedove-extension-enigmail
+pkgver=2.0.9
+pkgrel=1
+pkgdesc="OpenPGP message encryption and authentication for Icedove"
+arch=('any')
+url="https://www.enigmail.net/"
+license=('MPL' 'GPL3')
+makedepends=('zip' 'python2' 'perl')
+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=('2053148b0e5e763dfc1f8decff0fea2a40ebd306e4844440bd9a3ced4e1f7ff2f16bccf72f85e73b7c51b40629489ad125b9bc166558e3b4144038ba45fcb197'
+            'SKIP'
+            '4307c7b6bce7febba7a8186467c3bc93ec3428e1cd75cddad659e4d4a71832f1c8d46e4c811da38ff1dc38b1961a82bd84e7c90b7c63ce080be49ce69571c016')
+validpgpkeys=('4F9F89F5505AC1D1A260631CDB1187B9DD5F693B') # Patrick Brunschwig <patrick@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=('icedove' '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/icedove/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
+}
diff --git a/pcr/icedove-enigmail/PKGBUILD b/pcr/icedove-enigmail/PKGBUILD
deleted file mode 100644
index f14e27585..000000000
--- a/pcr/icedove-enigmail/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer (Arch): Einhard Leichtfuß <archer@respiranto.de>
-# Contributor (Arch): Daniel Landau <daniel.landau@iki.fi>
-# Contributor (Arch): Xyne
-# Contributor (Arch): David Manouchehri <d@32t.ca>
-# Contributor (Arch): Alexander Fehr <pizzapunk gmail com>
-# Contributor (Arch): Thomas Jost <schnouki schnouki net>
-# Contributor (Arch): Hinrich Harms <arch hinrich de>
-# Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-
-_pkgname=thunderbird-enigmail
-pkgname=icedove-enigmail
-pkgver=1.9.9
-pkgrel=1
-pkgdesc="Icedove extension that enables sending and receiving signed and encrypted email messages"
-arch=('any')
-url="https://www.enigmail.net/"
-license=('MPL' 'GPL')
-depends=('icedove>=38' 'gnupg>=2.0.7')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname)
-makedepends=('zip' 'python2' 'perl>=5.8')
-source=("https://www.enigmail.net/download/source/enigmail-${pkgver}.tar.gz"{,.asc})
-validpgpkeys=('4F9F89F5505AC1D1A260631CDB1187B9DD5F693B') # Patrick Brunschwig
-sha512sums=('39b37305362c88527d897ed95aa9d8457137d5f026359d19b838ab9df531c14099e157afdc8fefae78a6fa2ddded8dbfbeaf84eb91ac6cfbb05ae808731da2cb'
-            'SKIP')
-
-build() {
-  cd "$srcdir/enigmail"
-  PYTHON=/usr/bin/python2 ./configure
-  make -j1 # fails with -j greater than 1
-}
-
-package() {
-  cd "$srcdir/enigmail"
-  emid="$(sed -n '/.*<em:id>\(.*\)<\/em:id>.*/{s//\1/p;q}' package/install.rdf)"
-  install -d -m755 "$pkgdir"/usr/lib/icedove/extensions/"$emid"
-  cd "$pkgdir"/usr/lib/icedove/extensions/"$emid"
-  bsdtar -xf "$srcdir"/enigmail/build/enigmail-*.xpi
-}