diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2018-01-13 23:39:39 -0500 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2018-01-19 12:05:58 +1000 |
| commit | 9058d7fe9aa2bb494d5a6572c167db75d6d02d30 (patch) | |
| tree | a6f9ef7e809f615340b3a7b34bc0f0495819187f | |
| parent | d911438352ebec5a887dac02ceb0bb99f54b34fc (diff) | |
| download | pacman-9058d7fe9aa2bb494d5a6572c167db75d6d02d30.tar.gz pacman-9058d7fe9aa2bb494d5a6572c167db75d6d02d30.zip | |
pacman-key: do not set a default keyserver
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 <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/pacman-key.sh.in | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 293a42de..5bf6c7a1 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) |