gnupg: bumped versions, added maintainer (#23734)

6 files changed, 49 insertions, 19 deletions

diff --git a/var/spack/repos/builtin/packages/gnupg/package.py b/var/spack/repos/builtin/packages/gnupg/package.py
index f6397210ea..51d30b7f97 100644
--- a/var/spack/repos/builtin/packages/gnupg/package.py
+++ b/var/spack/repos/builtin/packages/gnupg/package.py
@@ -12,6 +12,10 @@ class Gnupg(AutotoolsPackage):
     homepage = "https://gnupg.org/index.html"
     url      = "https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.19.tar.bz2"
 
+    maintainers = ['alalazo']
+
+    version('2.3.1',  sha256='c498db346a9b9a4b399e514c8f56dfc0a888ce8f327f10376ff984452cd154ec')
+    version('2.2.27', sha256='34e60009014ea16402069136e0a5f63d9b65f90096244975db5cea74b3d02399')
     version('2.2.25', sha256='c55307b247af4b6f44d2916a25ffd1fb64ce2e509c3c3d028dbe7fbf309dc30a')
     version('2.2.24', sha256='9090b400faae34f08469d78000cfec1cee5b9c553ce11347cc96ef16eab98c46')
     version('2.2.23', sha256='10b55e49d78b3e49f1edb58d7541ecbdad92ddaeeb885b6f486ed23d1cd1da5c')
@@ -25,8 +29,13 @@ class Gnupg(AutotoolsPackage):
     version('2.1.21', sha256='7aead8a8ba75b69866f583b6c747d91414d523bfdfbe9a8e0fe026b16ba427dd')
 
     depends_on('npth@1.2:')
+
     depends_on('libgpg-error@1.24:')
+    depends_on('libgpg-error@1.41:', when='@2.3:')
+
     depends_on('libgcrypt@1.7.0:')
+    depends_on('libgcrypt@1.9.1:', when='@2.3:')
+
     depends_on('libksba@1.3.4:')
     depends_on('libassuan@2.4:', when='@:2.2.3')
     depends_on('libassuan@2.5:', when='@2.2.15:')
diff --git a/var/spack/repos/builtin/packages/libassuan/package.py b/var/spack/repos/builtin/packages/libassuan/package.py
index 87ccabb146..4baf3ffa01 100644
--- a/var/spack/repos/builtin/packages/libassuan/package.py
+++ b/var/spack/repos/builtin/packages/libassuan/package.py
@@ -3,16 +3,19 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
-
 
 class Libassuan(AutotoolsPackage):
     """Libassuan is a small library implementing the so-called Assuan
-       protocol."""
+    protocol.
+    """
 
     homepage = "https://gnupg.org/software/libassuan/index.html"
     url = "https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.4.5.tar.bz2"
 
+    maintainers = ['alalazo']
+
+    version('2.5.5', sha256='8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4')
+    version('2.5.4', sha256='c080ee96b3bd519edd696cfcebdecf19a3952189178db9887be713ccbcb5fbf0')
     version('2.5.3', sha256='91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702')
     version('2.4.5', sha256='fbfea5d1dbcdee34f2597b0afb3d8bb4eda96c924a1e01b01c2acde68b81625f')
     version('2.4.3', sha256='22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71')
@@ -21,5 +24,7 @@ class Libassuan(AutotoolsPackage):
 
     def configure_args(self):
         return [
+            '--enable-static',
+            '--enable-shared',
             '--with-libgpg-error-prefix=' + self.spec['libgpg-error'].prefix
         ]
diff --git a/var/spack/repos/builtin/packages/libgcrypt/package.py b/var/spack/repos/builtin/packages/libgcrypt/package.py
index f295e6e1c7..a0faa4e087 100644
--- a/var/spack/repos/builtin/packages/libgcrypt/package.py
+++ b/var/spack/repos/builtin/packages/libgcrypt/package.py
@@ -12,6 +12,10 @@ class Libgcrypt(AutotoolsPackage):
     homepage = "https://gnupg.org/software/libgcrypt/index.html"
     url      = "https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.5.tar.bz2"
 
+    maintainers = ['alalazo']
+
+    version('1.9.3', sha256='97ebe4f94e2f7e35b752194ce15a0f3c66324e0ff6af26659bbfb5ff2ec328fd')
+    version('1.9.2', sha256='b2c10d091513b271e47177274607b1ffba3d95b188bbfa8797f948aec9053c5a')
     version('1.9.1', sha256='c5a67a8b9b2bd370fb415ed1ee31c7172e5683076493cf4a3678a0fbdf0265d9')
     version('1.8.7', sha256='03b70f028299561b7034b8966d7dd77ef16ed139c43440925fe8782561974748')
     version('1.8.6', sha256='0cba2700617b99fc33864a0c16b1fa7fdf9781d9ed3509f5d767178e5fd7b975')
diff --git a/var/spack/repos/builtin/packages/libgpg-error/package.py b/var/spack/repos/builtin/packages/libgpg-error/package.py
index 768f81d69d..2083e2e61e 100644
--- a/var/spack/repos/builtin/packages/libgpg-error/package.py
+++ b/var/spack/repos/builtin/packages/libgpg-error/package.py
@@ -12,22 +12,24 @@ class LibgpgError(AutotoolsPackage):
     homepage = "https://www.gnupg.org/related_software/libgpg-error/index.en.html"
     url      = "https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.37.tar.bz2"
 
+    maintainers = ['alalazo']
+
+    version('1.42', sha256='fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23')
+    version('1.41', sha256='64b078b45ac3c3003d7e352a5e05318880a5778c42331ce1ef33d1a0d9922742')
+    version('1.40', sha256='e6b0392e852a8ad069242265c513c946b492b00816f3967a97d297886939623a')
     version('1.37', sha256='b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763')
     version('1.36', sha256='babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c')
     version('1.27', sha256='4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2')
     version('1.21', sha256='b7dbdb3cad63a740e9f0c632a1da32d4afdb694ec86c8625c98ea0691713b84d')
     version('1.18', sha256='9ff1d6e61d4cef7c1d0607ceef6d40dc33f3da7a3094170c3718c00153d80810')
 
-    depends_on('awk', type=('build'))
+    depends_on('awk', type='build')
     # Patch for using gawk@5, c.f. https://dev.gnupg.org/T4459
     patch('awk-5.patch', when='@1.36^gawk@5:')
 
     def configure_args(self):
-        args = ['--enable-static']
-
-        if self.run_tests:
-            args.append('--enable-tests')
-        else:
-            args.append('--disable-tests')
-
-        return args
+        return [
+            '--enable-static',
+            '--enable-shared',
+            '--enable-tests' if self.run_tests else '--disable-tests'
+        ]
diff --git a/var/spack/repos/builtin/packages/libksba/package.py b/var/spack/repos/builtin/packages/libksba/package.py
index 4e484edb31..728b93798e 100644
--- a/var/spack/repos/builtin/packages/libksba/package.py
+++ b/var/spack/repos/builtin/packages/libksba/package.py
@@ -3,16 +3,19 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
-
 
 class Libksba(AutotoolsPackage):
     """Libksba is a library to make the tasks of working with X.509
-       certificates, CMS data and related objects more easy. """
+    certificates, CMS data and related objects easier.
+    """
 
     homepage = "https://gnupg.org/software/libksba/index.html"
     url = "https://gnupg.org/ftp/gcrypt/libksba/libksba-1.3.5.tar.bz2"
 
+    maintainers = ['alalazo']
+
+    version('1.5.1', sha256='b0f4c65e4e447d9a2349f6b8c0e77a28be9531e4548ba02c545d1f46dc7bf921')
+    version('1.5.0', sha256='ae4af129216b2d7fdea0b5bf2a788cd458a79c983bb09a43f4d525cc87aba0ba')
     version('1.4.0', sha256='bfe6a8e91ff0f54d8a329514db406667000cb207238eded49b599761bfca41b6')
     version('1.3.5', sha256='41444fd7a6ff73a79ad9728f985e71c9ba8cd3e5e53358e70d5f066d35c1a340')
 
@@ -22,5 +25,7 @@ class Libksba(AutotoolsPackage):
 
     def configure_args(self):
         return [
+            '--enable-static',
+            '--enable-shared',
             '--with-libgpg-error-prefix=' + self.spec['libgpg-error'].prefix
         ]
diff --git a/var/spack/repos/builtin/packages/pinentry/package.py b/var/spack/repos/builtin/packages/pinentry/package.py
index 26728fdff8..01fce6c5ea 100644
--- a/var/spack/repos/builtin/packages/pinentry/package.py
+++ b/var/spack/repos/builtin/packages/pinentry/package.py
@@ -3,18 +3,21 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
-
 
 class Pinentry(AutotoolsPackage):
     """pinentry is a small collection of dialog programs that allow GnuPG to
-    read passphrases and PIN numbers in a secure manner. There are versions for
-    the common GTK and Qt toolkits as well as for the text terminal (Curses).
+    read passphrases and PIN numbers in a secure manner.
+
+    There are versions for the common GTK and Qt toolkits as well as for
+    the text terminal (Curses).
     """
 
     homepage = "https://gnupg.org/related_software/pinentry/index.html"
     url      = "https://gnupg.org/ftp/gcrypt/pinentry/pinentry-1.1.0.tar.bz2"
 
+    maintainers = ['alalazo']
+
+    version('1.1.1', sha256='cd12a064013ed18e2ee8475e669b9f58db1b225a0144debdb85a68cecddba57f')
     version('1.1.0', sha256='68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570')
 
     depends_on('libgpg-error@1.16:')
@@ -22,6 +25,8 @@ class Pinentry(AutotoolsPackage):
 
     def configure_args(self):
         return [
+            '--enable-static',
+            '--enable-shared',
             # Autotools automatically enables these if dependencies found
             # TODO: add variants for these
             '--disable-pinentry-curses',