[PATCH] pacman-key: do not set a default keyserver

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] pacman-key: do not set a default keyserver

Eli Schwartz-2
Recent versions of GnuPG are perfectly capable of using sane defaults,
and the default SKS keyserver over hkps:// is better than hardcoding the
same keyserver over hkp:// anyway.

Fixes FS#55278

Signed-off-by: Eli Schwartz <[hidden email]>
---
 scripts/pacman-key.sh.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
index 7b158da7..8996e127 100644
--- a/scripts/pacman-key.sh.in
+++ b/scripts/pacman-key.sh.in
@@ -51,8 +51,6 @@ UPDATEDB=0
 USE_COLOR='y'
 VERIFY=0
 
-DEFAULT_KEYSERVER='hkp://pool.sks-keyservers.net'
-
 m4_include(library/output_format.sh)
 
 usage() {
@@ -210,8 +208,6 @@ initialize() {
  add_gpg_conf_option "$conffile" 'no-greeting'
  add_gpg_conf_option "$conffile" 'no-permission-warning'
  add_gpg_conf_option "$conffile" 'lock-never'
- keyserv=${KEYSERVER:-$DEFAULT_KEYSERVER}
- add_gpg_conf_option "$conffile" 'keyserver' "$keyserv"
  add_gpg_conf_option "$conffile" 'keyserver-options' 'timeout=10'
 
  # set up a private signing key (if none available)
--
2.15.1