gnu: 389-ds-base: Update to 1.4.0.21.

* gnu/packages/openldap.scm (389-ds-base): Update to 1.4.0.21.
[arguments]: Add phase "fix-includes".
[inputs]: Add cracklib.
This commit is contained in:
Ricardo Wurmus 2019-03-19 20:01:08 +01:00
parent 3d7a7b1dd6
commit cbc6a28b67
No known key found for this signature in database
GPG key ID: 197A5888235FACAC

View file

@ -2,7 +2,7 @@
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -36,6 +36,7 @@ (define-module (gnu packages openldap)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages networking) #:use-module (gnu packages networking)
#:use-module (gnu packages password-utils)
#:use-module (gnu packages pcre) #:use-module (gnu packages pcre)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
@ -198,14 +199,14 @@ (define-public python-ldap
(define-public 389-ds-base (define-public 389-ds-base
(package (package
(name "389-ds-base") (name "389-ds-base")
(version "1.4.0.13") (version "1.4.0.21")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://releases.pagure.org/389-ds-base/" (uri (string-append "https://releases.pagure.org/389-ds-base/"
"389-ds-base-" version ".tar.bz2")) "389-ds-base-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"01dm3zq3w5ami9pwcjbjz8wfbx9krjxybjrgc4wyhrxlzd90ylzj")))) "1qd1ap5d5nxyiq0d19czfwc3h7iwl9lmr5sy7d7xmpr2by59aysr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((srfi srfi-1) `(#:modules ((srfi srfi-1)
@ -228,6 +229,11 @@ (define-public 389-ds-base
"--disable-perl") "--disable-perl")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-includes
(lambda _
(substitute* "include/ldaputil/certmap.h"
(("nss3/cert.h") "nss/cert.h"))
#t))
(add-after 'unpack 'fix-install-location-of-python-tools (add-after 'unpack 'fix-install-location-of-python-tools
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -286,6 +292,7 @@ (define-public 389-ds-base
#t))))) #t)))))
(inputs (inputs
`(("bdb" ,bdb) `(("bdb" ,bdb)
("cracklib" ,cracklib)
("cyrus-sasl" ,cyrus-sasl) ("cyrus-sasl" ,cyrus-sasl)
("gnutls" ,gnutls) ("gnutls" ,gnutls)
("httpd" ,httpd) ("httpd" ,httpd)