Date: Wed, 13 Aug 2008 18:03:23 GMT From: Ganael Laplanche <ganael.laplanche@martymac.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/126509: Port update: net/ldapscripts - Update to v1.8.0 Message-ID: <200808131803.m7DI3NKN008666@www.freebsd.org> Resent-Message-ID: <200808131810.m7DIA1Wd020288@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 126509 >Category: ports >Synopsis: Port update: net/ldapscripts - Update to v1.8.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Aug 13 18:10:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Ganael Laplanche >Release: 8.0-CURRENT >Organization: http://contribs.martymac.com >Environment: FreeBSD home.martymac.com 8.0-CURRENT FreeBSD 8.0-CURRENT #19: Tue Jul 15 09:28:43 CEST 2008 root@home.martymac.com:/usr/obj/usr/src/sys/MYKERNEL amd64 >Description: This patch updates net/ldapscripts to v1.8.0. Changes in this port : - Now uses the sources' Makefile - Scripts now installed to sbin/ - Runtime file now installed to ${PREFIX}/lib/ldapscripts/runtime See the CHANGELOG file for details about v1.8.0 (too long to paste here). >How-To-Repeat: >Fix: Patch attached with submission follows: diff -aurN ldapscripts.orig/Makefile ldapscripts/Makefile --- ldapscripts.orig/Makefile 2007-12-11 22:12:49.000000000 +0100 +++ ldapscripts/Makefile 2008-08-13 19:02:31.000000000 +0200 @@ -6,7 +6,7 @@ # PORTNAME= ldapscripts -PORTVERSION= 1.7.2 +PORTVERSION= 1.8.0 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://contribs.martymac.com/ldapscripts/ @@ -16,8 +16,6 @@ MAINTAINER= ganael.laplanche@martymac.com COMMENT= Scripts to manage posix accounts in an OpenLDAP directory -NO_BUILD= yes - WANT_OPENLDAP_VER?= 23 .if (${WANT_OPENLDAP_VER} != 21) && (${WANT_OPENLDAP_VER} != 22) && (${WANT_OPENLDAP_VER} != 23) && (${WANT_OPENLDAP_VER} != 24) BROKEN= Incompatible OpenLDAP version: ${WANT_OPENLDAP_VER} @@ -30,68 +28,36 @@ ldapmodrdn:${PORTSDIR}/net/openldap${WANT_OPENLDAP_VER}-client \ ldappasswd:${PORTSDIR}/net/openldap${WANT_OPENLDAP_VER}-client +USE_ICONV= yes +LIBDIR=${PREFIX}/lib/${PORTNAME} +MAKE_ENV+= MANDIR=${MANPREFIX}/man \ + ETCDIR=${ETCDIR} + MANLANG= "" -MANCOMPRESSED= no +MANCOMPRESSED= yes MAN1= ldapaddgroup.1 ldapaddmachine.1 ldapadduser.1 ldapaddusertogroup.1 \ - ldapdeletegroup.1 ldapdeleteuser.1 ldapdeleteuserfromgroup.1 \ - ldaprenameuser.1 ldapsetprimarygroup.1 _lsldap.1 _ldaprenamemachine.1 \ - _ldaprenamegroup.1 _ldapinit.1 _ldapdeletemachine.1 _ldappasswd.1 _ldapfinger.1 \ - _ldapmodifygroup.1 _ldapmodifymachine.1 _ldapmodifyuser.1 + ldapdeletegroup.1 ldapdeleteuser.1 ldapdeleteuserfromgroup.1 \ + ldaprenameuser.1 ldapsetprimarygroup.1 lsldap.1 ldaprenamemachine.1 \ + ldaprenamegroup.1 ldapinit.1 ldapdeletemachine.1 ldapsetpasswd.1 \ + ldapfinger.1 ldapid.1 ldapmodifygroup.1 ldapmodifymachine.1 \ + ldapmodifyuser.1 MAN5= ldapscripts.5 PORTDOCS= README CHANGELOG COPYING VERSION TODO -# Change /etc to ${PREFIX}/etc +# Unset 'all' target set by default to 'help' +# and set paths to OpenLDAP binaries post-patch: - ${REINPLACE_CMD} -E -e "s|^_RUNTIMEFILE=.*|_RUNTIMEFILE=\"${ETCDIR}/runtime\"|g" ${WRKSRC}/bin/* - ${REINPLACE_CMD} -E -e "s|^_CONFIGFILE=.*|_CONFIGFILE=\"${ETCDIR}/ldapscripts.conf\"|g" ${WRKSRC}/etc/runtime - - ${REINPLACE_CMD} -E -e "s|^BINDPWDFILE=.*|BINDPWDFILE=\"${ETCDIR}/ldapscripts.passwd\"|g" ${WRKSRC}/etc/ldapscripts.conf - ${REINPLACE_CMD} -E -e "s|^LDAPSEARCHBIN=.*|LDAPSEARCHBIN=\"${PREFIX}/bin/ldapsearch\"|g" ${WRKSRC}/etc/ldapscripts.conf - ${REINPLACE_CMD} -E -e "s|^LDAPADDBIN=.*|LDAPADDBIN=\"${PREFIX}/bin/ldapadd\"|g" ${WRKSRC}/etc/ldapscripts.conf - ${REINPLACE_CMD} -E -e "s|^LDAPDELETEBIN=.*|LDAPDELETEBIN=\"${PREFIX}/bin/ldapdelete\"|g" ${WRKSRC}/etc/ldapscripts.conf - ${REINPLACE_CMD} -E -e "s|^LDAPMODIFYBIN=.*|LDAPMODIFYBIN=\"${PREFIX}/bin/ldapmodify\"|g" ${WRKSRC}/etc/ldapscripts.conf - ${REINPLACE_CMD} -E -e "s|^LDAPMODRDNBIN=.*|LDAPMODRDNBIN=\"${PREFIX}/bin/ldapmodrdn\"|g" ${WRKSRC}/etc/ldapscripts.conf - ${REINPLACE_CMD} -E -e "s|^LDAPPASSWDBIN=.*|LDAPPASSWDBIN=\"${PREFIX}/bin/ldappasswd\"|g" ${WRKSRC}/etc/ldapscripts.conf - -# Just copy the scripts -do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/bin/_ldapdeletemachine ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/bin/_ldapinit ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/bin/_lsldap ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/bin/ldapaddgroup ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/bin/ldapadduser ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/bin/ldapdeletegroup ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/bin/ldapdeleteuserfromgroup ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/bin/ldapsetprimarygroup ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/bin/ldapaddmachine ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/bin/ldapaddusertogroup ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/bin/ldapdeleteuser ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/bin/ldaprenameuser ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/bin/_ldaprenamegroup ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/bin/_ldaprenamemachine ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/bin/_ldappasswd ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/bin/_ldapfinger ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/bin/_ldapmodifyuser ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/bin/_ldapmodifygroup ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/bin/_ldapmodifymachine ${PREFIX}/bin - - ${MKDIR} ${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/etc/ldapscripts.conf ${ETCDIR}/ldapscripts.conf.sample - ${CHMOD} 0440 ${ETCDIR}/ldapscripts.conf.sample - if [ ! -f ${ETCDIR}/ldapscripts.conf ]; then \ - ${CP} -p ${ETCDIR}/ldapscripts.conf.sample ${ETCDIR}/ldapscripts.conf; \ - fi - ${INSTALL_DATA} ${WRKSRC}/etc/ldapscripts.passwd ${ETCDIR}/ldapscripts.passwd.sample - ${CHMOD} 0440 ${ETCDIR}/ldapscripts.passwd.sample - if [ ! -f ${ETCDIR}/ldapscripts.passwd ]; then \ - ${CP} -p ${ETCDIR}/ldapscripts.passwd.sample ${ETCDIR}/ldapscripts.passwd; \ - fi - ${INSTALL_DATA} ${WRKSRC}/etc/runtime ${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/etc/ldapaddgroup.template.sample ${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/etc/ldapadduser.template.sample ${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/etc/ldapaddmachine.template.sample ${ETCDIR} + ${REINPLACE_CMD} "s|^all:.*|all:|g" ${WRKSRC}/Makefile + ${REINPLACE_CMD} "s|^LDAPSEARCHBIN=.*|LDAPSEARCHBIN=\"${LOCALBASE}/bin/ldapsearch\"|g" ${WRKSRC}/etc/ldapscripts.conf + ${REINPLACE_CMD} "s|^LDAPADDBIN=.*|LDAPADDBIN=\"${LOCALBASE}/bin/ldapadd\"|g" ${WRKSRC}/etc/ldapscripts.conf + ${REINPLACE_CMD} "s|^LDAPDELETEBIN=.*|LDAPDELETEBIN=\"${LOCALBASE}/bin/ldapdelete\"|g" ${WRKSRC}/etc/ldapscripts.conf + ${REINPLACE_CMD} "s|^LDAPMODIFYBIN=.*|LDAPMODIFYBIN=\"${LOCALBASE}/bin/ldapmodify\"|g" ${WRKSRC}/etc/ldapscripts.conf + ${REINPLACE_CMD} "s|^LDAPMODRDNBIN=.*|LDAPMODRDNBIN=\"${LOCALBASE}/bin/ldapmodrdn\"|g" ${WRKSRC}/etc/ldapscripts.conf + ${REINPLACE_CMD} "s|^LDAPPASSWDBIN=.*|LDAPPASSWDBIN=\"${LOCALBASE}/bin/ldappasswd\"|g" ${WRKSRC}/etc/ldapscripts.conf +# Install remaining stuff +post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} @@ -100,11 +66,6 @@ ${INSTALL_DATA} ${WRKSRC}/VERSION ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR} .endif - - ${INSTALL_MAN} ${WRKSRC}/man/man1/* ${MAN1PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/man/man5/* ${MAN5PREFIX}/man/man5 - -post-install: @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff -aurN ldapscripts.orig/distinfo ldapscripts/distinfo --- ldapscripts.orig/distinfo 2007-12-11 22:12:49.000000000 +0100 +++ ldapscripts/distinfo 2008-08-10 12:15:40.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (ldapscripts-1.7.2.tgz) = ee80c50dd9c95df03d2f90251ba7145c -SHA256 (ldapscripts-1.7.2.tgz) = c66a3d709157d0eb8861206abceb0f2ca93ded5595433d5c4e96908cbed9f8c0 -SIZE (ldapscripts-1.7.2.tgz) = 25973 +MD5 (ldapscripts-1.8.0.tgz) = 23bf66f2cdd747163bc31005fd819181 +SHA256 (ldapscripts-1.8.0.tgz) = 3c86ddf15eeb81453c5a05eaf587d3882ea70308ed99d09afbd4f509b237fa3d +SIZE (ldapscripts-1.8.0.tgz) = 31431 diff -aurN ldapscripts.orig/pkg-descr ldapscripts/pkg-descr --- ldapscripts.orig/pkg-descr 2005-10-17 02:10:24.000000000 +0200 +++ ldapscripts/pkg-descr 2008-08-13 18:54:53.000000000 +0200 @@ -1,5 +1,3 @@ -Ldapscripts - The ldapscripts allow to easily manage POSIX accounts (users, groups, machines) in an LDAP directory. They can be used independently as shell commands or within Samba's configuration. See README for more details. diff -aurN ldapscripts.orig/pkg-plist ldapscripts/pkg-plist --- ldapscripts.orig/pkg-plist 2007-10-13 16:57:21.000000000 +0200 +++ ldapscripts/pkg-plist 2008-08-11 18:41:06.000000000 +0200 @@ -4,27 +4,29 @@ @unexec if cmp -s %D/%%ETCDIR%%/ldapscripts.passwd.sample %D/%%ETCDIR%%/ldapscripts.passwd; then rm -f %D/%%ETCDIR%%/ldapscripts.passwd; fi %%ETCDIR%%/ldapscripts.passwd.sample @exec if [ ! -f %D/%%ETCDIR%%/ldapscripts.passwd ] ; then cp -p %D/%F %B/ldapscripts.passwd; fi -%%ETCDIR%%/runtime %%ETCDIR%%/ldapaddgroup.template.sample %%ETCDIR%%/ldapadduser.template.sample %%ETCDIR%%/ldapaddmachine.template.sample @dirrmtry %%ETCDIR%% -bin/_ldapdeletemachine -bin/_ldapinit -bin/_lsldap -bin/ldapaddgroup -bin/ldapaddmachine -bin/ldapadduser -bin/ldapaddusertogroup -bin/ldapdeletegroup -bin/ldapdeleteuser -bin/ldapdeleteuserfromgroup -bin/ldapsetprimarygroup -bin/ldaprenameuser -bin/_ldaprenamemachine -bin/_ldaprenamegroup -bin/_ldappasswd -bin/_ldapfinger -bin/_ldapmodifygroup -bin/_ldapmodifymachine -bin/_ldapmodifyuser +lib/ldapscripts/runtime +@dirrmtry lib/ldapscripts +sbin/ldapdeletemachine +sbin/ldapinit +sbin/lsldap +sbin/ldapaddgroup +sbin/ldapaddmachine +sbin/ldapadduser +sbin/ldapaddusertogroup +sbin/ldapdeletegroup +sbin/ldapdeleteuser +sbin/ldapdeleteuserfromgroup +sbin/ldapsetprimarygroup +sbin/ldaprenameuser +sbin/ldaprenamemachine +sbin/ldaprenamegroup +sbin/ldapsetpasswd +sbin/ldapfinger +sbin/ldapid +sbin/ldapmodifygroup +sbin/ldapmodifymachine +sbin/ldapmodifyuser >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808131803.m7DI3NKN008666>