diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2021-09-26 01:53:24 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2021-09-26 01:47:06 +0200 |
| commit | 7dab305ca6e124503037ed23b325130ca3cfba57 (patch) | |
| tree | de295605be60da23aed5718ccb8562aef740137f /main | |
| parent | 2f64a8ea7888d625d2d4e999d60432fbbc8b50fe (diff) | |
main/gnupg: change the default keyserver to keyserver.ubuntu.com
hkps.pool.sks-keyservers.net is dead. This patch backports the change of
the default keyserver from newer versions of gnupg to keyserver.ubuntu.com.
Diffstat (limited to 'main')
| -rw-r--r-- | main/gnupg/APKBUILD | 4 | ||||
| -rw-r--r-- | main/gnupg/change-default-keyserver.patch | 47 |
2 files changed, 50 insertions, 1 deletions
diff --git a/main/gnupg/APKBUILD b/main/gnupg/APKBUILD index bb7f4fcb82e..ced1c4301b0 100644 --- a/main/gnupg/APKBUILD +++ b/main/gnupg/APKBUILD @@ -3,7 +3,7 @@ pkgname=gnupg pkgver=2.2.23 _ver=${pkgver/_beta/-beta} -pkgrel=0 +pkgrel=1 pkgdesc="GNU Privacy Guard 2 - a PGP replacement tool" url="https://www.gnupg.org/" arch="all" @@ -16,6 +16,7 @@ subpackages="$pkgname-doc $pkgname-scdaemon" source="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$_ver.tar.bz2 0001-Include-sys-select.h-for-FD_SETSIZE.patch fix-i18n.patch + change-default-keyserver.patch 60-scdaemon.rules " install="$pkgname-scdaemon.pre-install" @@ -77,4 +78,5 @@ scdaemon() { sha512sums="736b39628f7e4adc650b3f9937c81f27e9ad41e77f5345dc54262c91c1cf7004243fa7f932313bcde955e0e9b3f1afc639bac18023ae878b1d26e3c5a3cabb90 gnupg-2.2.23.tar.bz2 c6cc4595081c5b025913fa3ebecf0dff87a84f3c669e3fef106e4fa040f1d4314ee52dd4c0e0002b213034fb0810221cfdd0033eae5349b6e3978f05d08bcac7 0001-Include-sys-select.h-for-FD_SETSIZE.patch b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f26527b03ea88eec16d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b fix-i18n.patch +628923b6541bac7a0670d716a4527c3b7bc891ac7cac29625ed56921141c9fbe10f9fff3137f699d196ed60784a78a1411c564c72ee35db9a35eaea5316a1659 change-default-keyserver.patch 4bfb9742279c2d1c872d63cd4bcb01f6a2a13d94618eff954d3a37451fa870a9bb29687330854ee47e8876d6e60dc81cb2569c3931beaefacda33db23c464402 60-scdaemon.rules" diff --git a/main/gnupg/change-default-keyserver.patch b/main/gnupg/change-default-keyserver.patch new file mode 100644 index 00000000000..8096fb9b8c4 --- /dev/null +++ b/main/gnupg/change-default-keyserver.patch @@ -0,0 +1,47 @@ +hkps.pool.sks-keyservers.net is dead. This patch backports the change of +the default keyserver from newer versions of gnupg to keyserver.ubuntu.com. + +--- a/configure ++++ b/configure +@@ -16059,7 +16059,7 @@ + + + cat >>confdefs.h <<_ACEOF +-#define DIRMNGR_DEFAULT_KEYSERVER "hkps://hkps.pool.sks-keyservers.net" ++#define DIRMNGR_DEFAULT_KEYSERVER "hkps://keyserver.ubuntu.com" + _ACEOF + + +--- a/configure.ac ++++ b/configure.ac +@@ -1839,7 +1839,7 @@ + AC_DEFINE_UNQUOTED(DIRMNGR_SOCK_NAME, "S.dirmngr", + [The name of the dirmngr socket]) + AC_DEFINE_UNQUOTED(DIRMNGR_DEFAULT_KEYSERVER, +- "hkps://hkps.pool.sks-keyservers.net", ++ "hkps://keyserver.ubuntu.com", + [The default keyserver for dirmngr to use, if none is explicitly given]) + + AC_DEFINE_UNQUOTED(GPGEXT_GPG, "gpg", [The standard binary file suffix]) +--- a/doc/dirmngr.texi ++++ b/doc/dirmngr.texi +@@ -328,7 +328,7 @@ + done for each new connection. + + If no keyserver is explicitly configured, dirmngr will use the +-built-in default of hkps://hkps.pool.sks-keyservers.net. ++built-in default of @code{https://keyserver.ubuntu.com}. + + @item --nameserver @var{ipaddr} + @opindex nameserver +--- a/doc/gnupg.info-1 ++++ b/doc/gnupg.info-1 +@@ -1733,7 +1733,7 @@ + a running Tor is done for each new connection. + + If no keyserver is explicitly configured, dirmngr will use the +- built-in default of hkps://hkps.pool.sks-keyservers.net. ++ built-in default of https://keyserver.ubuntu.com. + + '--nameserver IPADDR' + In "Tor mode" Dirmngr uses a public resolver via Tor to resolve DNS |