summarylogtreecommitdiffstats
path: root/drop-import-clean.patch
diff options
context:
space:
mode:
Diffstat (limited to 'drop-import-clean.patch')
-rw-r--r--drop-import-clean.patch18
1 files changed, 17 insertions, 1 deletions
diff --git a/drop-import-clean.patch b/drop-import-clean.patch
index 628b5896d502..0a96799a1cb3 100644
--- a/drop-import-clean.patch
+++ b/drop-import-clean.patch
@@ -1,4 +1,20 @@
-diff --git a/doc/gpg.texi b/doc/gpg.texi
+From 1690a464b28fa24ce82189a9bf5d7ce9b44804b8 Mon Sep 17 00:00:00 2001
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 15 Jul 2019 16:24:35 -0400
+Subject: [PATCH 3/7] gpg: drop import-clean from default keyserver import
+ options
+
+* g10/gpg.c (main): drop IMPORT_CLEAN from the
+default opt.keyserver_options.import_options
+* doc/gpg.texi: reflect this change in the documentation
+
+Given that SELF_SIGS_ONLY is already set, it's not clear what
+additional benefit IMPORT_CLEAN provides. Furthermore, IMPORT_CLEAN
+means that receiving an OpenPGP certificate from a keyserver will
+potentially delete data that is otherwise held in the local keyring,
+which is surprising to users who expect retrieval from the keyservers
+to be purely additive.diff --git a/doc/gpg.texi b/doc/gpg.texi
+
index 36d500d..a1c04fa 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi