From nobody@FreeBSD.org  Wed Jan  3 15:59:11 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5842816A403
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  3 Jan 2007 15:59:11 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [69.147.83.33])
	by mx1.freebsd.org (Postfix) with ESMTP id 49CEF13C43E
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  3 Jan 2007 15:59:11 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l03FxB7h070741
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 3 Jan 2007 15:59:11 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id l03FxAtI070740;
	Wed, 3 Jan 2007 15:59:10 GMT
	(envelope-from nobody)
Message-Id: <200701031559.l03FxAtI070740@www.freebsd.org>
Date: Wed, 3 Jan 2007 15:59:10 GMT
From: Ganael LAPLANCHE<martymac@martymac.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [Maintainer update] net/ldapscripts v1.4 -> v1.5
X-Send-Pr-Version: www-3.0

>Number:         107476
>Category:       ports
>Synopsis:       [Maintainer update] net/ldapscripts v1.4 -> v1.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bsam
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 03 16:00:42 GMT 2007
>Closed-Date:    Wed Jan 03 17:56:23 GMT 2007
>Last-Modified:  Wed Jan  3 18:00:23 GMT 2007
>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:
Class-Changed-From-To: maintainer-update->change-request 
Class-Changed-By: edwin 
Class-Changed-When: Wed Jan 3 16:00:49 UTC 2007 
Class-Changed-Why:  
Fix category (submitter is not maintainer) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=107476 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Jan 3 16:00:56 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=107476 

From: "ganael.laplanche" <ganael.laplanche@martymac.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/107476: [Maintainer update] net/ldapscripts v1.4 -> v1.5
Date: Wed,  3 Jan 2007 17:07:49 +0100 (CET)

 On Wed, 3 Jan 2007 16:00:54 UT, Edwin Groothuis wrote
 > Maintainer of net/ldapscripts,
 > 
 > Please note that PR ports/107476 has just been submitted.
 > 
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 
 Hi Edwin,
 
 Of course, I agree with the patch :)
 
 Thank you very much,
 
 Ganal LAPLANCHE
 ganael.laplanche@martymac.com
 http://www.martymac.com
 
State-Changed-From-To: feedback->open 
State-Changed-By: miwi 
State-Changed-When: Wed Jan 3 16:35:11 UTC 2007 
State-Changed-Why:  
Maintainer Approved! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=107476 
Responsible-Changed-From-To: freebsd-ports-bugs->bsam 
Responsible-Changed-By: bsam 
Responsible-Changed-When: Wed Jan 3 17:21:10 UTC 2007 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=107476 
State-Changed-From-To: open->closed 
State-Changed-By: bsam 
State-Changed-When: Wed Jan 3 17:52:32 UTC 2007 
State-Changed-Why:  
Committed, thanks! 
To submitter: BTW, the address at the "from" header is not the same as 
that at MAINTAINER. To be treated as the maintainer you should fix it. ;-) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=107476 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/107476: commit references a PR
Date: Wed,  3 Jan 2007 17:52:05 +0000 (UTC)

 bsam        2007-01-03 17:51:54 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/ldapscripts      Makefile distinfo pkg-plist 
   Log:
   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)
   
   PR:             107476
   Submitted by:   Ganael LAPLANCHE <martymac at martymac.com> (maintainer)
   
   Revision  Changes    Path
   1.4       +20 -14    ports/net/ldapscripts/Makefile
   1.3       +3 -3      ports/net/ldapscripts/distinfo
   1.4       +1 -0      ports/net/ldapscripts/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
