diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 21:21:05 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 21:21:05 +0000 |
| commit | 307d0f3ba61c1526f991c202087e9d0f961acdab (patch) | |
| tree | 0b15a34683565d6389862f7c8751a68e32a6268d /debian/patches/Use-hkps-keys.openpgp.org-as-the-default-keyserver.patch | |
| parent | Merging upstream version 2.2.43. (diff) | |
| download | gnupg2-307d0f3ba61c1526f991c202087e9d0f961acdab.tar.xz gnupg2-307d0f3ba61c1526f991c202087e9d0f961acdab.zip | |
Adding debian version 2.2.43-1.debian/2.2.43-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/Use-hkps-keys.openpgp.org-as-the-default-keyserver.patch')
| -rw-r--r-- | debian/patches/Use-hkps-keys.openpgp.org-as-the-default-keyserver.patch | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/debian/patches/Use-hkps-keys.openpgp.org-as-the-default-keyserver.patch b/debian/patches/Use-hkps-keys.openpgp.org-as-the-default-keyserver.patch index cc9ee90..ab4eccf 100644 --- a/debian/patches/Use-hkps-keys.openpgp.org-as-the-default-keyserver.patch +++ b/debian/patches/Use-hkps-keys.openpgp.org-as-the-default-keyserver.patch @@ -36,14 +36,14 @@ bug. Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net> --- configure.ac | 2 +- - doc/dirmngr.texi | 6 +++++- - 2 files changed, 6 insertions(+), 2 deletions(-) + doc/dirmngr.texi | 9 +++++++-- + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 0a4ae1e..c48cb8c 100644 +index 1ea8b7a..a3ff5c4 100644 --- a/configure.ac +++ b/configure.ac -@@ -1837,7 +1837,7 @@ AC_DEFINE_UNQUOTED(SCDAEMON_SOCK_NAME, "S.scdaemon", +@@ -1828,7 +1828,7 @@ AC_DEFINE_UNQUOTED(SCDAEMON_SOCK_NAME, "S.scdaemon", AC_DEFINE_UNQUOTED(DIRMNGR_SOCK_NAME, "S.dirmngr", [The name of the dirmngr socket]) AC_DEFINE_UNQUOTED(DIRMNGR_DEFAULT_KEYSERVER, @@ -53,19 +53,22 @@ index 0a4ae1e..c48cb8c 100644 AC_DEFINE_UNQUOTED(GPGEXT_GPG, "gpg", [The standard binary file suffix]) diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi -index ab831de..f7c7672 100644 +index 39c0c45..4ac6174 100644 --- a/doc/dirmngr.texi +++ b/doc/dirmngr.texi -@@ -331,7 +331,11 @@ whether Tor is locally running or not. The check for a running Tor is +@@ -339,8 +339,13 @@ whether Tor is locally running or not. The check for a running Tor is done for each new connection. If no keyserver is explicitly configured, dirmngr will use the --built-in default of @code{https://keyserver.ubuntu.com}. +-built-in default of @code{https://keyserver.ubuntu.com}. To avoid the +-use of a default keyserver the value @code{none} can be used. +built-in default of @code{https://keys.openpgp.org}. + +Note that the above default is a Debian-specific choice. Upstream +GnuPG prefers @code{hkps://keyserver.ubuntu.com}. See +/usr/share/doc/gpgconf/NEWS.Debian.gz for more details. ++ ++To avoid the use of a default keyserver the value @code{none} can be used. Windows users with a keyserver running on their Active Directory may use the short form @code{ldap:///} for @var{name} to access this directory. |