[arch-commits] Commit in thunderbird-extension-enigmail/repos/community-any (4 files)
Jonas Witschel
diabonas at archlinux.org
Sat Mar 28 17:15:09 UTC 2020
Date: Saturday, March 28, 2020 @ 17:15:08
Author: diabonas
Revision: 605326
archrelease: copy trunk to community-any
Added:
thunderbird-extension-enigmail/repos/community-any/0001-preferences-disable-pEpAutoDownload-by-default.patch
(from rev 605325, thunderbird-extension-enigmail/trunk/0001-preferences-disable-pEpAutoDownload-by-default.patch)
thunderbird-extension-enigmail/repos/community-any/PKGBUILD
(from rev 605325, 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 | 124 ++++++------
2 files changed, 102 insertions(+), 102 deletions(-)
Deleted: 0001-preferences-disable-pEpAutoDownload-by-default.patch
===================================================================
--- 0001-preferences-disable-pEpAutoDownload-by-default.patch 2020-03-28 17:15:00 UTC (rev 605325)
+++ 0001-preferences-disable-pEpAutoDownload-by-default.patch 2020-03-28 17:15:08 UTC (rev 605326)
@@ -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 605325, 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-03-28 17:15:08 UTC (rev 605326)
@@ -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-03-28 17:15:00 UTC (rev 605325)
+++ PKGBUILD 2020-03-28 17:15:08 UTC (rev 605326)
@@ -1,62 +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.5
-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=('0ed104306ee998b368d4a5779c2daf7c20a112c9a37f357bbe10d8c64dd435448c71e83a0e1a1dc9eb10efcf654b1524676f2b490bf6a065e6dd66de0861baea'
- 'SKIP'
- 'baebd963400574db89be747a4419534f945bdc64136d4014656ff98a9615a23984bca724da3f3840670979aab08ce441eee067921e21d0cb216938a20ed785b2')
-b2sums=('e86a340a916a7ac7ef39230e5bb5730198b672ab6c466db5085aa8a818da38e3681a6f22810355db986978c7d547ae50f6d70260a3ccdc9758861d03f3c4e5d5'
- 'SKIP'
- 'c593ed7b094d9feecb2f14624cf0628ab390c96f0fb0212ab0069333508b59057ef4b0518da1bf59eb8aaf0942303c4c45afab76d0b8e77a93763eab975cb4c0')
-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
- 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 605325, thunderbird-extension-enigmail/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-28 17:15:08 UTC (rev 605326)
@@ -0,0 +1,62 @@
+# 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.6
+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=('72159287601ed95052fcdeb3c973714e775150ba41894ecb6474798fd5109ab18dee0e3b8874a920fd07d3b184ed2034cf75f7baff4e14307d8739a312193919'
+ 'SKIP'
+ 'baebd963400574db89be747a4419534f945bdc64136d4014656ff98a9615a23984bca724da3f3840670979aab08ce441eee067921e21d0cb216938a20ed785b2')
+b2sums=('e95569dcd58f16e64079436a24b152e7d5e3cfbc2067fe909b0f714a8acbcf80db7b1c288302c0ca11b2536fb2ff4f4376bd5de582f3b65fd01938182c9e8f9c'
+ 'SKIP'
+ 'c593ed7b094d9feecb2f14624cf0628ab390c96f0fb0212ab0069333508b59057ef4b0518da1bf59eb8aaf0942303c4c45afab76d0b8e77a93763eab975cb4c0')
+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
+ 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
+}
More information about the arch-commits
mailing list