OpenLDAP package: update dependencies for 2.6.0 (#27830)

Update a number of dependency constraints for @2.6.0: (including
adding new optional dependency package wiredtiger).

3 files changed, 77 insertions, 21 deletions

diff --git a/var/spack/repos/builtin/packages/openldap/package.py b/var/spack/repos/builtin/packages/openldap/package.py
index 81f660736d..91c9d70ad8 100644
--- a/var/spack/repos/builtin/packages/openldap/package.py
+++ b/var/spack/repos/builtin/packages/openldap/package.py
@@ -31,62 +31,73 @@ class Openldap(AutotoolsPackage):
             values=('gnutls', 'openssl'), multi=False)
 
     variant('perl', default=False, description='Perl backend to Slapd')
+    variant('sasl', default=True,  description='Build with Cyrus SASL support')
+    variant('static', default=False, description='Build static libraries')
+    variant('shared', default=True, description='Build shared libraries')
+    variant('dynamic', default=True, description='Enable linking built binaries with dynamic libs')
+    variant('wt', default=False, description='Enable WiredTiger backend', when='@2.5.0:')
+    conflicts('~static', when='~shared')
 
     depends_on('icu4c', when='+icu')
     depends_on('gnutls', when='~client_only tls=gnutls')
     depends_on('openssl', when='~client_only tls=openssl')
+    depends_on('openssl@1.1.1:', when='~client_only tls=openssl @2.6.0:')
     depends_on('unixodbc', when='~client_only')
     depends_on('postgresql', when='~client_only')
     depends_on('berkeley-db', when='~client_only')  # for slapd
     # Recommended dependencies by Linux From Scratch
-    # depends_on('cyrus-sasl', when='~client_only') # not avail. in spack yet
+    depends_on('cyrus-sasl', when='+sasl')
     # depends_on('openslp', when='~client_only') # not avail. in spack yet
     # depends_on('Pth', when='~client_only') # not avail. in spack yet
     depends_on('perl', when='~client_only+perl')  # for slapd
     depends_on('groff', type='build')
+    depends_on('pkgconfig', type='build')
+    depends_on('wiredtiger', when='@2.6.0:')
 
     # Ref: https://www.linuxfromscratch.org/blfs/view/svn/server/openldap.html
     @when('+client_only')
     def configure_args(self):
-        return ['CPPFLAGS=-D_GNU_SOURCE',
-                '--enable-static',
-                '--enable-dynamic',
+        args = ['CPPFLAGS=-D_GNU_SOURCE',
                 '--disable-debug',
                 '--disable-slapd',
                 ]
+        args += self.with_or_without('cyrus-sasl', variant='sasl')
+        args += self.enable_or_disable('static')
+        args += self.enable_or_disable('shared')
+        args += self.enable_or_disable('dynamic')
+        return args
 
     @when('~client_only')
     def configure_args(self):
         # Ref: https://www.openldap.org/lists/openldap-technical/201009/msg00304.html
         args = ['CPPFLAGS=-D_GNU_SOURCE',  # fixes a build error, see Ref above
-                '--enable-static',
                 '--disable-debug',
-                '--with-cyrus-sasl',
-                '--enable-dynamic',
                 '--enable-crypt',
                 '--enable-spasswd',
                 '--enable-slapd',
                 '--enable-modules',
                 '--enable-rlookups',
                 '--enable-backends=mod',
-                '--disable-ndb',
                 '--disable-sql',
-                '--disable-shell',
-                '--disable-bdb',
-                '--disable-hdb',
                 '--enable-overlays=mod',
                 ]
 
-        if '~client_only' in self.spec:
-            if 'tls=gnutls' in self.spec:
-                args.append('--with-tls=gnutls')
-            if 'tls=openssl' in self.spec:
-                args.append('--with-tls=openssl')
+        if self.spec.satisfies('@:2.5'):
+            args.extend(('--disable-ndb', '--disable-shell', '--disable-bdb',
+                         '--disable-hdb'))
+
+        args += self.enable_or_disable('static')
+        args += self.enable_or_disable('shared')
+        args += self.enable_or_disable('dynamic')
+        args += self.with_or_without('cyrus-sasl', variant='sasl')
+        args.append('--with-tls=' + self.spec.variants['tls'].value)
+        if self.spec.satisfies('@2.6.0: tls=gnutls'):
+            args += ['--disable-autoca']
+
+        if self.spec.satisfies('@2.5.0:'):
+            args += self.enable_or_disable('wt')
 
-        if '+perl' in self.spec:
-            args.append('--enable-perl')
-        else:
-            args.append('--disable-perl')
+        args += self.enable_or_disable('perl')
 
         return args
 
diff --git a/var/spack/repos/builtin/packages/py-python-ldap/package.py b/var/spack/repos/builtin/packages/py-python-ldap/package.py
index 6bb7b686df..7b07e7229e 100644
--- a/var/spack/repos/builtin/packages/py-python-ldap/package.py
+++ b/var/spack/repos/builtin/packages/py-python-ldap/package.py
@@ -14,6 +14,8 @@ class PyPythonLdap(PythonPackage):
     homepage = "https://www.python-ldap.org/en/python-ldap-3.2.0/"
     pypi = "python-ldap/python-ldap-3.2.0.tar.gz"
 
+    version('3.4.0', sha256='60464c8fc25e71e0fd40449a24eae482dcd0fb7fcf823e7de627a6525b3e0d12')
+    version('3.3.1', sha256='4711cacf013e298754abd70058ccc995758177fb425f1c2d30e71adfc1d00aa5')
     version('3.2.0', sha256='7d1c4b15375a533564aad3d3deade789221e450052b21ebb9720fb822eccdb8e')
     version('3.0.0', sha256='86746b912a2cd37a54b06c694f021b0c8556d4caeab75ef50435ada152e2fbe1')
 
@@ -23,4 +25,8 @@ class PyPythonLdap(PythonPackage):
     depends_on('python@2.7:2.8,3.4:', type=('build', 'run'))
     depends_on('py-pyasn1@0.3.7:', type=('build', 'run'))
     depends_on('py-pyasn1-modules@0.1.5:', type=('build', 'run'))
-    depends_on('cyrus-sasl', type='link')
+    depends_on('cyrus-sasl', type='link', when='^openldap+sasl')
+
+    def patch(self):
+        if self.spec.satisfies('^openldap~sasl'):
+            filter_file('HAVE_SASL ', '', 'setup.cfg')
diff --git a/var/spack/repos/builtin/packages/wiredtiger/package.py b/var/spack/repos/builtin/packages/wiredtiger/package.py
new file mode 100644
index 0000000000..a613d9dc46
--- /dev/null
+++ b/var/spack/repos/builtin/packages/wiredtiger/package.py
@@ -0,0 +1,39 @@
+# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack import *
+
+
+class Wiredtiger(AutotoolsPackage):
+    """WiredTiger is an high performance, scalable, production quality,
+       NoSQL, Open Source extensible platform for data management."""
+
+    homepage = "https://source.wiredtiger.com/"
+    url      = "https://github.com/wiredtiger/wiredtiger/releases/download/10.0.0/wiredtiger-10.0.0.tar.bz2"
+
+    version('10.0.0', sha256='4830107ac744c0459ef99697652aa3e655c2122005a469a49d221e692fb834a5')
+
+    depends_on('python@3:', type=('build', 'run'), when='+python')
+    depends_on('swig', type=('build', 'run'), when='+python')
+    depends_on('lz4', when='+lz4')
+    depends_on('snappy', when='+snappy')
+    depends_on('zlib', when='+zlib')
+    depends_on('zstd', when='+zstd')
+    depends_on('rsync', type='build')
+
+    variant('python', default=False, description='Compile Python API')
+    variant('lz4', default=False, description='Build the lz4 compressor extension')
+    variant('snappy', default=False, description='Build the snappy compressor extension')
+    variant('zlib', default=False, description='Build the zlib compressor extension')
+    variant('zstd', default=False, description='Build the zstd compressor extension')
+
+    def configure_args(self):
+        args = []
+        args += self.enable_or_disable('python')
+        args += self.enable_or_disable('lz4')
+        args += self.enable_or_disable('snappy')
+        args += self.enable_or_disable('zlib')
+        args += self.enable_or_disable('zstd')
+        return args