bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pacman-key: do not set a default keyserver

Browse source 
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>
This commit is contained in:
Eli Schwartz 2018-01-13 23:39:39 -05:00 • committed by Allan McRae
parent d911438352
commit 9058d7fe9a
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/pacman-key.sh.in
View file

@ -51,8 +51,6 @@ UPDATEDB=0
USE_COLOR='y' USE_COLOR='y'
VERIFY=0 VERIFY=0
DEFAULT_KEYSERVER='hkp://pool.sks-keyservers.net'
m4_include(library/output_format.sh) m4_include(library/output_format.sh)
usage() { usage() {
@ -210,8 +208,6 @@ initialize() {
add_gpg_conf_option "$conffile" 'no-greeting' add_gpg_conf_option "$conffile" 'no-greeting'
add_gpg_conf_option "$conffile" 'no-permission-warning' add_gpg_conf_option "$conffile" 'no-permission-warning'
add_gpg_conf_option "$conffile" 'lock-never' 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' add_gpg_conf_option "$conffile" 'keyserver-options' 'timeout=10'
# set up a private signing key (if none available) # set up a private signing key (if none available)