Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 3 Jan 2007 15:59:10 GMT
From:      Ganael LAPLANCHE<martymac@martymac.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/107476: [Maintainer update] net/ldapscripts v1.4 -> v1.5
Message-ID:  <200701031559.l03FxAtI070740@www.freebsd.org>
Resent-Message-ID: <200701031600.l03G0grW084306@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         107476
>Category:       ports
>Synopsis:       [Maintainer update] net/ldapscripts v1.4 -> v1.5
>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 Jan 03 16:00:42 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Ganael LAPLANCHE
>Release:        6.2-PRERELEASE
>Organization:
http://contribs.martymac.com
>Environment:
FreeBSD home.martymac.com 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Sat Dec 23 14:57:47 CET 2006     root@home.martymac.com:/usr/obj/usr/src/sys/MYKERNEL  amd64
>Description:
Update ldapscripts to v1.5

CHANGELOG :

2007/01/03 : ldapscripts 1.5
  - Fixed typos (thanks to Mikael Lammentausta)
  - Small fixes to the install script
  - ldapadduser : use $_UID instead of $_USER while chown'ing homedir (thanks to Mikael Lammentausta)
  - ldapadduser : new option to ask for the gecos (thanks to Mikael Lammentausta)
  - ldapadduser : new option to copy skeleton files to home directories (thanks to Mikael Lammentausta)
  - ldapadduser : now skip user's home dir creation if it already exists
  - ldapadduser/ldapaddmachine : modified account description attributes : set to 'User account' or 'Machine account'
  - ldapadduser/ldapaddgroup/ldapaddmachine : use $_USER and $_GROUP instead of $1 when possible
  - New _ldappasswd script to modify a user's password (suggested by Mikael Lammentausta)
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -aur ldapscripts.old/Makefile ldapscripts/Makefile
--- ldapscripts.old/Makefile	Fri May 12 00:49:13 2006
+++ ldapscripts/Makefile	Wed Jan  3 16:01:56 2007
@@ -6,28 +6,36 @@
 #
 
 PORTNAME=	ldapscripts
-PORTVERSION=	1.4
+PORTVERSION=	1.5
 CATEGORIES=	net
-MASTER_SITES=	http://contribs.martymac.com/ldapscripts/
+MASTER_SITES=	http://contribs.martymac.com/ldapscripts/ \
+				${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ganael.laplanche@martymac.com
 COMMENT=	Scripts to manage posix accounts in an OpenLDAP directory
 
-RUN_DEPENDS=	ldapadd:${PORTSDIR}/net/openldap23-client \
-		ldapsearch:${PORTSDIR}/net/openldap23-client \
-		ldapdelete:${PORTSDIR}/net/openldap23-client \
-		ldapmodify:${PORTSDIR}/net/openldap23-client \
-		ldapmodrdn:${PORTSDIR}/net/openldap23-client \
-		ldappasswd:${PORTSDIR}/net/openldap23-client
+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}
+.endif
+
+RUN_DEPENDS=	ldapadd:${PORTSDIR}/net/openldap${WANT_OPENLDAP_VER}-client \
+		ldapsearch:${PORTSDIR}/net/openldap${WANT_OPENLDAP_VER}-client \
+		ldapdelete:${PORTSDIR}/net/openldap${WANT_OPENLDAP_VER}-client \
+		ldapmodify:${PORTSDIR}/net/openldap${WANT_OPENLDAP_VER}-client \
+		ldapmodrdn:${PORTSDIR}/net/openldap${WANT_OPENLDAP_VER}-client \
+		ldappasswd:${PORTSDIR}/net/openldap${WANT_OPENLDAP_VER}-client
 
 MANLANG=	""
 MANCOMPRESSED=	no
-MAN1=		ldapaddgroup.1 ldapaddmachine.1 ldapadduser.1 ldapaddusertogroup.1 \
+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
-MAN5=		ldapscripts.5
+		_ldaprenamegroup.1 _ldapinit.1 _ldapdeletemachine.1 _ldappasswd.1
+MAN5=	ldapscripts.5
 
 # Change /etc to ${LOCALBASE}/etc
 post-patch:
@@ -41,9 +49,6 @@
 	${REINPLACE_CMD} -E -e "s|^LDAPMODRDNBIN=.*|LDAPMODRDNBIN=\"${LOCALBASE}/bin/ldapmodrdn\"|g" ${WRKSRC}/etc/ldapscripts.conf
 	${REINPLACE_CMD} -E -e "s|^LDAPPASSWDBIN=.*|LDAPPASSWDBIN=\"${LOCALBASE}/bin/ldappasswd\"|g" ${WRKSRC}/etc/ldapscripts.conf
 
-# We do not use any Makefile
-do-build:
-
 # Just copy the scripts
 do-install:
 	${CP} ${WRKSRC}/bin/_ldapdeletemachine ${PREFIX}/bin
@@ -60,6 +65,7 @@
 	${CP} ${WRKSRC}/bin/ldaprenameuser ${PREFIX}/bin
 	${CP} ${WRKSRC}/bin/_ldaprenamegroup ${PREFIX}/bin
 	${CP} ${WRKSRC}/bin/_ldaprenamemachine ${PREFIX}/bin
+	${CP} ${WRKSRC}/bin/_ldappasswd ${PREFIX}/bin
 
 	${MKDIR} ${LOCALBASE}/etc/ldapscripts
 	if [ -f ${LOCALBASE}/etc/ldapscripts/ldapscripts.conf ]; then \
diff -aur ldapscripts.old/distinfo ldapscripts/distinfo
--- ldapscripts.old/distinfo	Sun Jan  8 01:23:03 2006
+++ ldapscripts/distinfo	Wed Jan  3 15:32:39 2007
@@ -1,3 +1,3 @@
-MD5 (ldapscripts-1.4.tgz) = 3e063297a5188922803a451cdbf7dd61
-SHA256 (ldapscripts-1.4.tgz) = 472173f895c60bad047fe84f1b64638f20a291c0aed3a3da9de601f54d5ab7a5
-SIZE (ldapscripts-1.4.tgz) = 18812
+MD5 (ldapscripts-1.5.tgz) = b1afcc87fab632ea5ad75ca1971c9971
+SHA256 (ldapscripts-1.5.tgz) = 22ee9be675d3a3a529a92ae6ab16bd0727fa8cf06c9bdb90eac4394f57d2eddc
+SIZE (ldapscripts-1.5.tgz) = 20357
diff -aur ldapscripts.old/pkg-plist ldapscripts/pkg-plist
--- ldapscripts.old/pkg-plist	Sun Jan 22 03:45:50 2006
+++ ldapscripts/pkg-plist	Fri Dec 22 08:53:32 2006
@@ -20,3 +20,4 @@
 bin/ldaprenameuser
 bin/_ldaprenamemachine
 bin/_ldaprenamegroup
+bin/_ldappasswd

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200701031559.l03FxAtI070740>