diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-19 04:38:13 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-19 04:38:13 +0000 |
| commit | f29c37eef239be064a88e5447073dbbc8b82e562 (patch) | |
| tree | 8f87d81b92143c9f0920e303a2df036f2549079f /debian/patches/gpg-drop-import-clean-from-default-keyserver-import-optio.patch | |
| parent | Releasing progress-linux version 2.2.43-3~progress7.99u1. (diff) | |
| download | gnupg2-f29c37eef239be064a88e5447073dbbc8b82e562.tar.xz gnupg2-f29c37eef239be064a88e5447073dbbc8b82e562.zip | |
Merging debian version 2.2.43-4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/gpg-drop-import-clean-from-default-keyserver-import-optio.patch')
| -rw-r--r-- | debian/patches/gpg-drop-import-clean-from-default-keyserver-import-optio.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/gpg-drop-import-clean-from-default-keyserver-import-optio.patch b/debian/patches/gpg-drop-import-clean-from-default-keyserver-import-optio.patch index 29667b7..f9fef2c 100644 --- a/debian/patches/gpg-drop-import-clean-from-default-keyserver-import-optio.patch +++ b/debian/patches/gpg-drop-import-clean-from-default-keyserver-import-optio.patch @@ -21,10 +21,10 @@ Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net> 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/gpg.texi b/doc/gpg.texi -index 39c996b..fd0baab 100644 +index d1142a3..b658253 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi -@@ -2005,7 +2005,7 @@ are available for all keyserver types, some common options are: +@@ -2048,7 +2048,7 @@ are available for all keyserver types, some common options are: @end table @@ -34,10 +34,10 @@ index 39c996b..fd0baab 100644 honor-pka-record". However, if the actual used source is an LDAP server "no-self-sigs-only" is diff --git a/g10/gpg.c b/g10/gpg.c -index bd65612..d77c757 100644 +index 2296351..a75d0b8 100644 --- a/g10/gpg.c +++ b/g10/gpg.c -@@ -2383,8 +2383,7 @@ main (int argc, char **argv) +@@ -2414,8 +2414,7 @@ main (int argc, char **argv) opt.export_options = EXPORT_ATTRIBUTES; opt.keyserver_options.import_options = (IMPORT_REPAIR_KEYS | IMPORT_REPAIR_PKS_SUBKEY_BUG |