diff options
| author | João Figueiredo | 2021-07-24 00:23:31 +0100 |
|---|---|---|
| committer | João Figueiredo | 2021-07-24 00:23:31 +0100 |
| commit | e3c023be87b823ada34f5bd511c7207a531f71ed (patch) | |
| tree | 690946695c2aa31fa2f3b1edc4238194fe4b0f05 /drop-import-clean.patch | |
| parent | e5ccfb853ccc4e984bef0237d872d5043320c257 (diff) | |
| download | aur-e3c023be87b823ada34f5bd511c7207a531f71ed.tar.gz | |
Merged with official ABS gnupg PKGBUILD
Diffstat (limited to 'drop-import-clean.patch')
| -rw-r--r-- | drop-import-clean.patch | 45 |
1 files changed, 10 insertions, 35 deletions
diff --git a/drop-import-clean.patch b/drop-import-clean.patch index 9c42fece93ad..628b5896d502 100644 --- a/drop-import-clean.patch +++ b/drop-import-clean.patch @@ -1,52 +1,27 @@ -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. - -GnuPG-Bug-Id: 4628 -Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net> ---- - doc/gpg.texi | 2 +- - g10/gpg.c | 3 +-- - 2 files changed, 2 insertions(+), 3 deletions(-) - diff --git a/doc/gpg.texi b/doc/gpg.texi -index 4870441d4..551459a74 100644 +index 36d500d..a1c04fa 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi -@@ -1963,7 +1963,7 @@ are available for all keyserver types, some common options are: +@@ -2018,7 +2018,7 @@ are available for all keyserver types, some common options are: @end table -The default list of options is: "self-sigs-only, import-clean, +The default list of options is: "self-sigs-only, - repair-keys, repair-pks-subkey-bug, export-attributes, - honor-pka-record". - + repair-keys, repair-pks-subkey-bug, export-attributes". However, if + the actual used source is an LDAP server "no-self-sigs-only" is + assumed unless "self-sigs-only" has been explictly configured. diff --git a/g10/gpg.c b/g10/gpg.c -index 68cc22041..fa2bcfa5e 100644 +index 733d444..8c95820 100644 --- a/g10/gpg.c +++ b/g10/gpg.c -@@ -2407,6 +2407,5 @@ main (int argc, char **argv) +@@ -2446,8 +2446,7 @@ main (int argc, char **argv) + | IMPORT_REPAIR_PKS_SUBKEY_BUG | IMPORT_SELF_SIGS_ONLY | IMPORT_COLLAPSE_UIDS - | IMPORT_COLLAPSE_SUBKEYS - | IMPORT_CLEAN); + | IMPORT_COLLAPSE_SUBKEYS); opt.keyserver_options.export_options = EXPORT_ATTRIBUTES; - opt.keyserver_options.options = KEYSERVER_HONOR_PKA_RECORD; --- -2.27.0 - + opt.keyserver_options.options = 0; + opt.verify_options = (LIST_SHOW_UID_VALIDITY |