summaryrefslogtreecommitdiff
path: root/libre/icedove-extension-enigmail/0001-preferences-disable-pEpAutoDownload-by-default.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/icedove-extension-enigmail/0001-preferences-disable-pEpAutoDownload-by-default.patch')
-rw-r--r--libre/icedove-extension-enigmail/0001-preferences-disable-pEpAutoDownload-by-default.patch25
1 files changed, 19 insertions, 6 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
index afc10a9d6..cb4dd1972 100644
--- a/libre/icedove-extension-enigmail/0001-preferences-disable-pEpAutoDownload-by-default.patch
+++ b/libre/icedove-extension-enigmail/0001-preferences-disable-pEpAutoDownload-by-default.patch
@@ -1,18 +1,31 @@
-From 83d412cf08d76fab5e79b6f261c3145372337d5e Mon Sep 17 00:00:00 2001
+From 03993708d4d1fb327f102f45d7aa4e9c4fa8237b 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
+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 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 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..f8c10a47 100755
+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);
@@ -23,5 +36,5 @@ index d5ca1249..f8c10a47 100755
// holds the last result of the last check for pEp updates
pref("extensions.enigmail.pEpLastUpdate", 0);
--
-2.20.1
+2.23.0