From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53745) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2zae-0006sY-6v for guix-patches@gnu.org; Tue, 25 Apr 2017 08:29:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2zaY-0001mW-Hh for guix-patches@gnu.org; Tue, 25 Apr 2017 08:29:08 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:40745) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d2zaY-0001mQ-Do for guix-patches@gnu.org; Tue, 25 Apr 2017 08:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d2zaY-0001Rz-5Y for guix-patches@gnu.org; Tue, 25 Apr 2017 08:29:02 -0400 Subject: bug#26651: [PATCH] gnu: nss-pam-ldap: Look for nslcd.conf in global /etc/ directory. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2zaC-0006np-5Q for guix-patches@gnu.org; Tue, 25 Apr 2017 08:28:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2za7-0001Ux-MH for guix-patches@gnu.org; Tue, 25 Apr 2017 08:28:40 -0400 Received: from sinope02.bbbm.mdc-berlin.de ([141.80.25.24]:60692) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2za7-0001P8-Bd for guix-patches@gnu.org; Tue, 25 Apr 2017 08:28:35 -0400 Received: from localhost (localhost [127.0.0.1]) by sinope02.bbbm.mdc-berlin.de (Postfix) with ESMTP id 98BD0936B5D for ; Tue, 25 Apr 2017 14:28:26 +0200 (CEST) Received: from sinope02.bbbm.mdc-berlin.de ([127.0.0.1]) by localhost (sinope02.bbbm.mdc-berlin.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jX2pParQpw-7 for ; Tue, 25 Apr 2017 14:28:21 +0200 (CEST) Received: from HTCATWO.mdc-berlin.net (puck.citx.mdc-berlin.de [141.80.36.101]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by sinope02.bbbm.mdc-berlin.de (Postfix) with ESMTPS for ; Tue, 25 Apr 2017 14:28:21 +0200 (CEST) From: Ricardo Wurmus Date: Tue, 25 Apr 2017 14:25:31 +0200 Message-ID: <20170425122531.2522-1-ricardo.wurmus@mdc-berlin.de> MIME-Version: 1.0 Content-Type: text/plain List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 26651@debbugs.gnu.org Cc: Ricardo Wurmus * gnu/packages/openldap.scm (nss-pam-ldapd)[arguments]: Set "--with-ldap-conf-file" to look for global configuration file; add build phase to install example configuration file in the package output directory. --- gnu/packages/openldap.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index b67510647..61f7a9469 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -94,8 +94,23 @@ `(#:configure-flags (list (string-append "--with-pam-seclib-dir=" (assoc-ref %outputs "out") "/lib/security/") - (string-append "--with-ldap-conf-file=" - (assoc-ref %outputs "out") "/etc/nslcd.conf")))) + ;; nslcd cannot be convinced to look at run-time for its + ;; configuration file at a location that differs from the + ;; configured location. + "--with-ldap-conf-file=/etc/nslcd.conf") + #:phases + (modify-phases %standard-phases + ;; This is necessary because we tell nslcd with configure flags that + ;; it should look for its configuration file at /etc/nslcd.conf. The + ;; build system tries to install a default configuration to that very + ;; location. + (add-after 'unpack 'override-nslcd.conf-install-path + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile.in" + (("\\$\\(DESTDIR\\)\\$\\(NSLCD_CONF_PATH\\)") + (string-append (assoc-ref outputs "out") + "/etc/nslcd.conf.example"))) + #t))))) (inputs `(("linux-pam" ,linux-pam) ("openldap" ,openldap) -- 2.11.1