diff options
| author | iarspider <iarspider@gmail.com> | 2021-11-19 17:31:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-19 10:31:40 -0600 |
| commit | 7be632b55808ce5250c2c7e8738dce3c4101bd5c (patch) | |
| tree | cdf9c82dc8483638eb6c3c6e5170fc341568dff3 | |
| parent | 047062eedf677d01a89e2e7d387f6eb0e5452ede (diff) | |
| download | spack-7be632b55808ce5250c2c7e8738dce3c4101bd5c.tar.gz spack-7be632b55808ce5250c2c7e8738dce3c4101bd5c.tar.bz2 spack-7be632b55808ce5250c2c7e8738dce3c4101bd5c.tar.xz spack-7be632b55808ce5250c2c7e8738dce3c4101bd5c.zip | |
New version: openldap 2.6.0; (#27520)
* New version: openldap 2.6.0;
fix recipe for groff (requires pkg-config to find uchardet);
fix recipe for openldap (requires groff to build documentation)
* Restrict openldap versions of py-python-ldap and percona-server
* Update var/spack/repos/builtin/packages/groff/package.py
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
* Update package.py
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
4 files changed, 8 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/groff/package.py b/var/spack/repos/builtin/packages/groff/package.py index ce2cc490bc..1525e11d3e 100644 --- a/var/spack/repos/builtin/packages/groff/package.py +++ b/var/spack/repos/builtin/packages/groff/package.py @@ -43,6 +43,7 @@ class Groff(AutotoolsPackage, GNUMirrorPackage): depends_on('texinfo', type='build', when='@1.22.4:') # configure complains when there is no uchardet that enhances preconv depends_on('uchardet', when='@1.22.4:') + depends_on('pkgconfig', type='build') depends_on('libice', when='+x') depends_on('libxaw', when='+x') diff --git a/var/spack/repos/builtin/packages/openldap/package.py b/var/spack/repos/builtin/packages/openldap/package.py index 7591a3d4b6..81f660736d 100644 --- a/var/spack/repos/builtin/packages/openldap/package.py +++ b/var/spack/repos/builtin/packages/openldap/package.py @@ -17,8 +17,9 @@ class Openldap(AutotoolsPackage): """ homepage = "https://www.openldap.org/" - url = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.48.tgz" + url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.6.0.tgz" + version('2.6.0', sha256='b71c580eac573e9aba15d95f33dd4dd08f2ed4f0d7fc09e08ad4be7ed1e41a4f') version('2.4.49', sha256='e3b117944b4180f23befe87d0dcf47f29de775befbc469dcf4ac3dab3311e56e') version('2.4.48', sha256='d9523ffcab5cd14b709fcf3cb4d04e8bc76bb8970113255f372bc74954c6074d') @@ -42,6 +43,7 @@ class Openldap(AutotoolsPackage): # 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') # Ref: https://www.linuxfromscratch.org/blfs/view/svn/server/openldap.html @when('+client_only') diff --git a/var/spack/repos/builtin/packages/percona-server/package.py b/var/spack/repos/builtin/packages/percona-server/package.py index 22095246ab..57226e5c9f 100644 --- a/var/spack/repos/builtin/packages/percona-server/package.py +++ b/var/spack/repos/builtin/packages/percona-server/package.py @@ -21,7 +21,8 @@ class PerconaServer(CMakePackage): depends_on('openssl') depends_on('ncurses') depends_on('readline') - depends_on('openldap') + # Links to libldap_r, which was merged with libldap in OpenLDAP 2.5 + depends_on('openldap@:2.4') depends_on('libtirpc') depends_on('curl') depends_on('bison', type='build') 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 ca12163460..6bb7b686df 100644 --- a/var/spack/repos/builtin/packages/py-python-ldap/package.py +++ b/var/spack/repos/builtin/packages/py-python-ldap/package.py @@ -17,7 +17,8 @@ class PyPythonLdap(PythonPackage): version('3.2.0', sha256='7d1c4b15375a533564aad3d3deade789221e450052b21ebb9720fb822eccdb8e') version('3.0.0', sha256='86746b912a2cd37a54b06c694f021b0c8556d4caeab75ef50435ada152e2fbe1') - depends_on('openldap+client_only', type=('build', 'link', 'run')) + # See https://github.com/python-ldap/python-ldap/issues/432 + depends_on('openldap+client_only @:2.4', type=('build', 'link', 'run')) depends_on('py-setuptools', type='build') depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) depends_on('py-pyasn1@0.3.7:', type=('build', 'run')) |