aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2021-09-26 02:16:10 +0200
committerJakub Jirutka <jakub@jirutka.cz>2021-09-26 02:03:09 +0200
commitae4caf358e478af9887bb3794bd12f8fdf3c4a8a (patch)
treebd88905bec84dac29e551581672fb73e3f565657
parent4a3eb020a4e989019d6e8066de8a556427e494bc (diff)
downloadaports-ae4caf358e478af9887bb3794bd12f8fdf3c4a8a.tar.gz
aports-ae4caf358e478af9887bb3794bd12f8fdf3c4a8a.tar.bz2
aports-ae4caf358e478af9887bb3794bd12f8fdf3c4a8a.tar.xz
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.
-rw-r--r--main/gnupg/APKBUILD4
-rw-r--r--main/gnupg/change-default-keyserver.patch25
2 files changed, 28 insertions, 1 deletions
diff --git a/main/gnupg/APKBUILD b/main/gnupg/APKBUILD
index 2ca0d14c95..7c7f7cf96d 100644
--- a/main/gnupg/APKBUILD
+++ b/main/gnupg/APKBUILD
@@ -3,7 +3,7 @@
pkgname=gnupg
pkgver=2.2.19
_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"
@@ -72,4 +73,5 @@ scdaemon() {
sha512sums="d7700136ac9f0a8cf04b33da4023a42427fced648c2f90d76250c92904353b85fe728bdd89a713d847e8d38e5900c98d46075614492fdc3d1421f927a92f49dd gnupg-2.2.19.tar.bz2
c6cc4595081c5b025913fa3ebecf0dff87a84f3c669e3fef106e4fa040f1d4314ee52dd4c0e0002b213034fb0810221cfdd0033eae5349b6e3978f05d08bcac7 0001-Include-sys-select.h-for-FD_SETSIZE.patch
b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f26527b03ea88eec16d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b fix-i18n.patch
+770f9c9c32fa1a297bef34f00cc4e5837f6afe5f26a9739465d8096223b15705947dfe538b2039762a765525cf08fdf2b75b57497d905240ebf965090c3d032e 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 0000000000..f2be04460d
--- /dev/null
+++ b/main/gnupg/change-default-keyserver.patch
@@ -0,0 +1,25 @@
+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])