git.iko.soy/typeable/nixpkgs
on master help sign in
gnupg: vendor SKS patch

This quickly became a 404 upstream. Fixes https://github.com/NixOS/nixpkgs/64256.

commit4cab72953c6a8823a85302e8f0303477d1b20ae9 authorAlyssa Ross <hi@alyssa.is> dateWed 3 Jul 2019, 16:34 (7 years ago) parentd505283
2 files changed+35−4
pkgs/tools/security/gnupg/0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch+34 pkgs/tools/security/gnupg/22.nix+1−4
pkgs/tools/security/gnupg/0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patchnew file+34
@@ -0,0 +1,34 @@
1+From 1c9cc97e9d47d73763810dcb4a36b6cdf31a2254 Mon Sep 17 00:00:00 2001
2+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
3+Date: Sun, 30 Jun 2019 11:54:35 -0400
4+Subject: [PATCH] dirmngr: Only use SKS pool CA for SKS pool
5+
6+* dirmngr/http.c (http_session_new): when checking whether the
7+keyserver is the HKPS pool, check specifically against the pool name,
8+as ./configure might have been used to select a different default
9+keyserver. It makes no sense to apply Kristian's certificate
10+authority to anything other than the literal host
11+hkps.pool.sks-keyservers.net.
12+
13+Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
14+GnuPG-Bug-Id: 4593
15+---
16+ dirmngr/http.c | 2 +-
17+ 1 file changed, 1 insertion(+), 1 deletion(-)
18+
19+diff --git a/dirmngr/http.c b/dirmngr/http.c
20+index 384f2569d..8e5d53939 100644
21+--- a/dirmngr/http.c
22++++ b/dirmngr/http.c
23+@@ -767,7 +767,7 @@ http_session_new (http_session_t *r_session,
24+
25+ is_hkps_pool = (intended_hostname
26+ && !ascii_strcasecmp (intended_hostname,
27+- get_default_keyserver (1)));
28++ "hkps.pool.sks-keyservers.net"));
29+
30+ /* If the user has not specified a CA list, and they are looking
31+ * for the hkps pool from sks-keyservers.net, then default to
32+--
33+2.22.0
34+
pkgs/tools/security/gnupg/22.nix+1−4
@@ -32,10 +32,7 @@ stdenv.mkDerivation rec {
3232
3333 patches = [
3434 ./fix-libusb-include-path.patch
35− (fetchpatch {
36− url = https://files.gnupg.net/file/data/qmxjhc6kuja3orybj7st/PHID-FILE-vvzlnw36427pdnug2amc/file;
37− sha256 = "13snxkmlgmvn0rgxh5k2sgxkp5mbxqiznzm45sw649nvs3ccghq8";
38− })
35+ ./0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch
3936 ];
4037 postPatch = ''
4138 sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' \