From 7ef19ec1d85c37f94dbf96dedbbf1f11c5e2d894 Mon Sep 17 00:00:00 2001 From: Alberto Invernizzi <9337627+albestro@users.noreply.github.com> Date: Mon, 13 Jan 2025 12:19:38 +0100 Subject: [PATCH] gnupg: bump versions and update libassuan requirement (#48520) --- .../repos/builtin/packages/gnupg/package.py | 16 +++++++++++++++- .../builtin/packages/libgpg-error/package.py | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/gnupg/package.py b/var/spack/repos/builtin/packages/gnupg/package.py index ea45ec28c0f..cee3bf7b552 100644 --- a/var/spack/repos/builtin/packages/gnupg/package.py +++ b/var/spack/repos/builtin/packages/gnupg/package.py @@ -17,6 +17,12 @@ class Gnupg(AutotoolsPackage): license("GPL-3.0-or-later") + version("2.5.3", sha256="23128b136aed4e5121e793d1b6c60ee50c8007a9d926c1313e524d05386b54ac") + version("2.5.2", sha256="7f404ccc6a58493fedc15faef59f3ae914831cff866a23f0bf9d66cfdd0fea29") + version("2.5.1", sha256="8a34bb318499867962c939e156666ada93ed81f01926590ac68f3ff79178375e") + version("2.5.0", sha256="2222c827d4e7087f15e7f72739d004abc1d05c6c5f0a5a12b24c6a6cc5d173fb") + version("2.4.7", sha256="7b24706e4da7e0e3b06ca068231027401f238102c41c909631349dcc3b85eb46") + version("2.4.6", sha256="95acfafda7004924a6f5c901677f15ac1bda2754511d973bb4523e8dd840e17a") version("2.4.5", sha256="f68f7d75d06cb1635c336d34d844af97436c3f64ea14bcb7c869782f96f44277") version("2.4.4", sha256="67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6") version("2.4.3", sha256="a271ae6d732f6f4d80c258ad9ee88dd9c94c8fdc33c3e45328c4d7c126bd219d") @@ -41,15 +47,23 @@ class Gnupg(AutotoolsPackage): depends_on("libgpg-error@1.24:", when="@2:") depends_on("libgpg-error@1.41:", when="@2.3:") depends_on("libgpg-error@1.46:", when="@2.4:") + # https://github.com/gpg/gnupg/commit/d78131490edd7f7db142702b8144bc30e65dbd8d + depends_on("libgpg-error@1.50:", when="@2.5:") + # https://github.com/gpg/gnupg/commit/c3bab200d97460028d842d76484b4c08fb947fef + depends_on("libgpg-error@1.51:", when="@2.5.2:") depends_on("libgcrypt@1.7.0:", when="@2:") depends_on("libgcrypt@1.9.1:", when="@2.3:") + # https://github.com/gpg/gnupg/commit/f305e703d51079a17bcfc15d54f4c5f591dcff56 + depends_on("libgcrypt@1.11:", when="@2.5:") depends_on("libksba@1.3.4:", when="@2:") depends_on("libksba@1.6.3:", when="@2.4:") - depends_on("libassuan@2.5:", when="@2.2.15:") depends_on("libassuan@:2", when="@:2.4.3") + depends_on("libassuan@2.5:", when="@2.2.15:") + # https://github.com/gpg/gnupg/commit/0d20b79ab79819f6177737a61e886d4820e475e2 + depends_on("libassuan@3:", when="@2.5.0:") depends_on("pinentry", type="run", when="@2:") depends_on("iconv", when="@2:") diff --git a/var/spack/repos/builtin/packages/libgpg-error/package.py b/var/spack/repos/builtin/packages/libgpg-error/package.py index 62d6e3dba7c..888138ced46 100644 --- a/var/spack/repos/builtin/packages/libgpg-error/package.py +++ b/var/spack/repos/builtin/packages/libgpg-error/package.py @@ -15,6 +15,7 @@ class LibgpgError(AutotoolsPackage): license("GPL-2.0-or-later AND LGPL-2.1-or-later") + version("1.51", sha256="be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2") version("1.50", sha256="69405349e0a633e444a28c5b35ce8f14484684518a508dc48a089992fe93e20a") version("1.49", sha256="8b79d54639dbf4abc08b5406fb2f37e669a2dec091dd024fb87dd367131c63a9") version("1.48", sha256="89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f")