From owner-freebsd-ports@FreeBSD.ORG Tue Jul 15 14:41:14 2003 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 51B8237B404 for ; Tue, 15 Jul 2003 14:41:14 -0700 (PDT) Received: from gw.celabo.org (gw.celabo.org [208.42.49.153]) by mx1.FreeBSD.org (Postfix) with ESMTP id 484D943F3F for ; Tue, 15 Jul 2003 14:41:13 -0700 (PDT) (envelope-from nectar@celabo.org) Received: from madman.celabo.org (madman.celabo.org [10.0.1.111]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "madman.celabo.org", Issuer "celabo.org CA" (verified OK)) by gw.celabo.org (Postfix) with ESMTP id BF45C54840; Tue, 15 Jul 2003 16:41:12 -0500 (CDT) Received: by madman.celabo.org (Postfix, from userid 1001) id 5D7606FBF8; Tue, 15 Jul 2003 16:41:12 -0500 (CDT) Date: Tue, 15 Jul 2003 16:41:12 -0500 From: "Jacques A. Vidrine" To: Oliver Eikemeier Message-ID: <20030715214112.GF86657@madman.celabo.org> References: <20030710110751.GA6966@watt.intra.caraldi.com> <3F0D68D7.50502@fillmore-labs.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <3F0D68D7.50502@fillmore-labs.com> X-Url: http://www.celabo.org/ User-Agent: Mutt/1.5.4i-ja.1 cc: Jean-Baptiste Quenot cc: ports@freebsd.org Subject: Re: Patch port nss_ldap's Makefile for ldap.conf location X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jul 2003 21:41:14 -0000 On Thu, Jul 10, 2003 at 03:23:35PM +0200, Oliver Eikemeier wrote: > Jean-Baptiste Quenot wrote: > > >Please find below a patch that fixes the location of ldap.conf to > >reflect the location specified by the associated port pam_ldap. The > >config file should be $(PREFIX)/etc/ldap.conf, not /etc/ldap.conf. > > Thanks for your feedback, it's appreciated. One minor point, though: > You should refer to the file as ${LOCALBASE}/etc/ldap.conf, see > No, actually I must have had braindamage when I configured the port to install anything in ${LOCALBASE}. That's just plain wrong. Now, if I wanted to reference _OpenLDAP's_ configuration file, then sure, I'd use ${LOCALBASE}. But that would be ${LOCALBASE}/etc/openldap/ldap.conf. Below is the patch that I'm considering committing. I would appreciate feedback --- I don't want to cause a lot of churn. Cheers, -- Jacques Vidrine . NTT/Verio SME . FreeBSD UNIX . Heimdal nectar@celabo.org . jvidrine@verio.net . nectar@freebsd.org . nectar@kth.se Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net/nss_ldap/Makefile,v retrieving revision 1.5 diff -c -r1.5 Makefile *** Makefile 25 Apr 2003 00:07:20 -0000 1.5 --- Makefile 15 Jul 2003 21:35:23 -0000 *************** *** 7,13 **** PORTNAME= nss_ldap PORTVERSION= 1.${NSS_LDAP_VERSION} ! PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.padl.com/download/ DISTNAME= ${PORTNAME}-${NSS_LDAP_VERSION} --- 7,13 ---- PORTNAME= nss_ldap PORTVERSION= 1.${NSS_LDAP_VERSION} ! PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.padl.com/download/ DISTNAME= ${PORTNAME}-${NSS_LDAP_VERSION} *************** *** 21,35 **** GNU_CONFIGURE= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib" post-extract: ${CP} ${FILESDIR}/bsdnss.c ${WRKSRC} do-install: ! ${INSTALL_PROGRAM} ${WRKSRC}/nss_ldap.so ${LOCALBASE}/lib/nss_ldap.so.1 .include .if ${OSVERSION} < 500112 --- 21,45 ---- GNU_CONFIGURE= yes INSTALLS_SHLIB= yes + PKGMESSAGE= ${WRKDIR}/pkg-message CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib" + CONFIGURE_ARGS= --with-ldap-conf-file=${PREFIX}/etc/nss_ldap.conf \ + --with-ldap-secret-file=${PREFIX}/etc/nss_ldap.secret + post-extract: ${CP} ${FILESDIR}/bsdnss.c ${WRKSRC} + post-build: + ${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-message > ${PKGMESSAGE} + do-install: ! ${INSTALL_PROGRAM} ${WRKSRC}/nss_ldap.so ${PREFIX}/lib/nss_ldap.so.1 ! ${INSTALL_DATA} ${WRKSRC}/ldap.conf ${PREFIX}/etc/nss_ldap.conf.sample ! ${CAT} ${PKGMESSAGE} ! .include .if ${OSVERSION} < 500112 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/net/nss_ldap/pkg-plist,v retrieving revision 1.2 diff -c -r1.2 pkg-plist *** pkg-plist 17 Apr 2003 14:28:01 -0000 1.2 --- pkg-plist 15 Jul 2003 21:24:09 -0000 *************** *** 1 **** --- 1,2 ---- + etc/nss_ldap.conf.sample lib/nss_ldap.so.1 diff -c /dev/null pkg-message *** /dev/null Tue Jul 15 16:36:38 2003 --- pkg-message Tue Jul 15 16:35:45 2003 *************** *** 0 **** --- 1,15 ---- + ===================================================================== + The nss_ldap module expects to find its configuration files at the + following paths: + + LDAP configuration: %%PREFIX%%/etc/nss_ldap.conf + LDAP secret (optional): %%PREFIX%%/etc/nss_ldap.secret + + + WARNING: For users of previous versions of this port: + WARNING: + WARNING: Previous versions of this port expected configuration files + WARNING: to be located at /etc/ldap.conf and /etc/ldap.secret. You + WARNING: may need to move these configuration files to their new + WARNING: location specified above. + =====================================================================