From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39334) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d361K-0007Ih-IR for guix-patches@gnu.org; Tue, 25 Apr 2017 15:21:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d361G-0003HS-64 for guix-patches@gnu.org; Tue, 25 Apr 2017 15:21:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:41905) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d361G-0003HE-08 for guix-patches@gnu.org; Tue, 25 Apr 2017 15:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d361F-0001fe-Mc for guix-patches@gnu.org; Tue, 25 Apr 2017 15:21:01 -0400 Subject: bug#26651: [PATCH] gnu: nss-pam-ldap: Look for nslcd.conf in global /etc/ directory. Resent-Message-ID: From: Kei Kebreau References: <20170425122531.2522-1-ricardo.wurmus@mdc-berlin.de> Date: Tue, 25 Apr 2017 15:19:54 -0400 In-Reply-To: <20170425122531.2522-1-ricardo.wurmus@mdc-berlin.de> (Ricardo Wurmus's message of "Tue, 25 Apr 2017 14:25:31 +0200") Message-ID: <87fugwnvl1.fsf@openmailbox.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" 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: Ricardo Wurmus Cc: 26651@debbugs.gnu.org --=-=-= Content-Type: text/plain Ricardo Wurmus writes: > * 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) LGTM. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlj/oVsACgkQ5qXuPBlG eg1Npw/5AVxC5VACa8rU9+AjVcRGlS880f17f7jKVVFz55+rj8OtE8RsxboL6w81 3KSAQiCoE793hx6F5gZiJ7shdhB9aitiP8t3g33pI5FYL7/7oYKCpfSqROyY59n2 M7VD8OB8LK+k+/W6F1jHTW1wvl3Xu+RwnKio7o/6vlvfmAL1Bl1D+nqAbv+AUAcW feo8Ho7nMK431dcELA9eC/tp77hAkBBze/TOCJg9Oh5N81IfoBb4GAqBEIwCP8zz L/E+os2thrYzn2A3eZggvGBH1KzgNIgT+SInZ+SfsWUA29NmCnwt7PoUF5l9CViY h36ll3yERhg1L/OZpzdOSAABJtRL1JWJuDy5Z84aGZ7T56xDdhF4ill+3aNOr7Sa wR3TkuU2jSe11HdIqBIBKpr96T1tn8N5PKlLohVg7nl/IdDEOqLTdgOMARtETEZd OoxCA4J/nlQOvntKDOqxK1KIyBheAKWaTiMSXVQCt395QPCfH8ZesUTtNwcKJeX3 UFxykkWXV7PsnGqz7J+O+nG0/OFR7PXk2gc7Z9/B7U2Xs+5zomtu+ZZYdPvzVCvT GQ4jjyft8LScb5rmxPpRRH+XhdoUvUQqdjL5uTE2RVm1ax+M/tlvHMSz9+QDhpFf tu9PgOoMNOXBQDAgsB6eMI5Q0dMzS31Z0uKRAP1OXcPXKrWxR4c= =s/VV -----END PGP SIGNATURE----- --=-=-=--