From 99b46757ccb7a2504cbf8877dac9cefe5b167bdb Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 5 Feb 2022 16:13:26 +0100 Subject: [PATCH 1/4] gnupg: 2.3.3 -> 2.3.4 --- pkgs/tools/security/gnupg/23.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/23.nix b/pkgs/tools/security/gnupg/23.nix index ef7a5cf85e71..6c20b79cc9fd 100644 --- a/pkgs/tools/security/gnupg/23.nix +++ b/pkgs/tools/security/gnupg/23.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null && enableMinimal == false; stdenv.mkDerivation rec { pname = "gnupg"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - sha256 = "0dz9x0r5021bhk1kjh29m1q13xbslwb8yn9qzcp7b9m1lrnvi2ap"; + sha256 = "sha256-80aOyvsdf5rXtR/R23rr8XzridLvqKBc8vObTUBUAq4="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From b9597a916ab87dd1ac3d5ca3666714bcc07cd12f Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 5 Feb 2022 16:13:54 +0100 Subject: [PATCH 2/4] gnupg: remove patch for darwin warnings Fixed in 2.3.4 --- pkgs/tools/security/gnupg/23.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/tools/security/gnupg/23.nix b/pkgs/tools/security/gnupg/23.nix index 6c20b79cc9fd..34c26d7051dc 100644 --- a/pkgs/tools/security/gnupg/23.nix +++ b/pkgs/tools/security/gnupg/23.nix @@ -34,13 +34,6 @@ stdenv.mkDerivation rec { ./tests-add-test-cases-for-import-without-uid.patch ./allow-import-of-previously-known-keys-even-without-UI.patch ./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch - ] ++ lib.optional stdenv.isDarwin [ - # Remove an innocent warning printed on systems without procfs - # https://dev.gnupg.org/T5656 - (fetchpatch { - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/890be5f6af88e7913d177af87a50129049e681bb/gnupg/2.3.3-proc-error.patch"; - sha256 = "sha256-oiTa7Nf+AEmhZ683CJEaCb559PXJ6RpSSgRLpxz4CKU="; - }) ]; postPatch = '' sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' configure doc/dirmngr.texi doc/gnupg.info-1 From 5e94b6a1db6779684426f4ac484c33ddeb795211 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 12 Feb 2022 19:20:02 +0100 Subject: [PATCH 3/4] gnupg: remove unneeded SOURCE_DATE_EPOCH patch --- pkgs/tools/security/gnupg/23.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/tools/security/gnupg/23.nix b/pkgs/tools/security/gnupg/23.nix index 34c26d7051dc..144bfab9c467 100644 --- a/pkgs/tools/security/gnupg/23.nix +++ b/pkgs/tools/security/gnupg/23.nix @@ -37,9 +37,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' configure doc/dirmngr.texi doc/gnupg.info-1 - # Fix broken SOURCE_DATE_EPOCH usage - remove on the next upstream update - sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.am - sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.in '' + lib.optionalString (stdenv.isLinux && pcsclite != null) '' sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; From 8c6becd90467e6decc16fa33a7e3424bbaa01164 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 12 Feb 2022 19:22:01 +0100 Subject: [PATCH 4/4] gnupg: fix default keyserver patch --- pkgs/tools/security/gnupg/23.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/gnupg/23.nix b/pkgs/tools/security/gnupg/23.nix index 144bfab9c467..e80804cd002f 100644 --- a/pkgs/tools/security/gnupg/23.nix +++ b/pkgs/tools/security/gnupg/23.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch ]; postPatch = '' - sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' configure doc/dirmngr.texi doc/gnupg.info-1 + sed -i 's,\(hkps\|https\)://keyserver.ubuntu.com,hkps://keys.openpgp.org,g' configure configure.ac doc/dirmngr.texi doc/gnupg.info-1 '' + lib.optionalString (stdenv.isLinux && pcsclite != null) '' sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c '';