From owner-svn-ports-head@FreeBSD.ORG Wed Nov 27 07:36:28 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C9081B42; Wed, 27 Nov 2013 07:36:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A8E3E2CD6; Wed, 27 Nov 2013 07:36:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAR7aSoH058408; Wed, 27 Nov 2013 07:36:28 GMT (envelope-from martymac@svn.freebsd.org) Received: (from martymac@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAR7aS56058401; Wed, 27 Nov 2013 07:36:28 GMT (envelope-from martymac@svn.freebsd.org) Message-Id: <201311270736.rAR7aS56058401@svn.freebsd.org> From: Ganael LAPLANCHE Date: Wed, 27 Nov 2013 07:36:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335002 - in head/net/ldapscripts: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Nov 2013 07:36:28 -0000 Author: martymac Date: Wed Nov 27 07:36:27 2013 New Revision: 335002 URL: http://svnweb.freebsd.org/changeset/ports/335002 Log: - Enable staging - Fix display of pkg-message not showing %%ETCDIR%% - Always stage documentation Added: head/net/ldapscripts/files/ head/net/ldapscripts/files/pkg-message.in (contents, props changed) Deleted: head/net/ldapscripts/pkg-message Modified: head/net/ldapscripts/Makefile head/net/ldapscripts/pkg-plist (contents, props changed) Modified: head/net/ldapscripts/Makefile ============================================================================== --- head/net/ldapscripts/Makefile Wed Nov 27 07:19:41 2013 (r335001) +++ head/net/ldapscripts/Makefile Wed Nov 27 07:36:27 2013 (r335002) @@ -3,6 +3,7 @@ PORTNAME= ldapscripts PORTVERSION= 2.0.5 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \ http://contribs.martymac.org/ldapscripts/ @@ -26,20 +27,10 @@ LIBDIR= ${PREFIX}/lib/${PORTNAME} MAKE_ENV+= MANDIR=${MANPREFIX}/man \ ETCDIR=${ETCDIR} -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 ldapsetpasswd.1 \ - ldapfinger.1 ldapgid.1 ldapid.1 ldapmodifygroup.1 ldapmodifymachine.1 \ - ldapmodifyuser.1 -MAN5= ldapscripts.5 +SUB_FILES= pkg-message PORTDOCS= README CHANGELOG VERSION TODO -NO_STAGE= yes -.include - # Unset 'all' target set by default to 'help' # and set paths to OpenLDAP binaries post-patch: @@ -57,12 +48,9 @@ post-patch: # Install remaining stuff post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} -.for doc in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} -.endfor -.endif - @${CAT} ${PKGMESSAGE} + @${RM} ${STAGEDIR}${ETCDIR}/ldapscripts.conf \ + ${STAGEDIR}${ETCDIR}/ldapscripts.passwd + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Added: head/net/ldapscripts/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ldapscripts/files/pkg-message.in Wed Nov 27 07:36:27 2013 (r335002) @@ -0,0 +1,18 @@ + +=============================================================== + + Security warning : + + For security reasons, ldapscripts.conf and ldapscripts.passwd + files are now set read-only for user and group owners. Do not + forget to fine-tune ownership of these two files before using + the scripts (and to make them read-only if they are not). + + e.g. : chmod 0440 %%ETCDIR%%/ldapscripts.conf + chgrp ldapadmins %%ETCDIR%%/ldapscripts.conf + chmod 0440 %%ETCDIR%%/ldapscripts.passwd + chgrp ldapadmins %%ETCDIR%%/ldapscripts.passwd + + The ldapscripts are now installed, enjoy ! + +=============================================================== Modified: head/net/ldapscripts/pkg-plist ============================================================================== --- head/net/ldapscripts/pkg-plist Wed Nov 27 07:19:41 2013 (r335001) +++ head/net/ldapscripts/pkg-plist Wed Nov 27 07:36:27 2013 (r335002) @@ -1,7 +1,7 @@ -@unexec if cmp -s %D/%%ETCDIR%%/ldapscripts.conf.sample %D/%%ETCDIR%%/ldapscripts.conf; then rm -f %D/%%ETCDIR%%/ldapscripts.conf; fi +@unexec if cmp -s %D/%%ETCDIR%%/ldapscripts.conf %D/%%ETCDIR%%/ldapscripts.conf.sample; then rm -f %D/%%ETCDIR%%/ldapscripts.conf; fi %%ETCDIR%%/ldapscripts.conf.sample @exec if [ ! -f %D/%%ETCDIR%%/ldapscripts.conf ] ; then cp -p %D/%F %B/ldapscripts.conf; fi -@unexec if cmp -s %D/%%ETCDIR%%/ldapscripts.passwd.sample %D/%%ETCDIR%%/ldapscripts.passwd; then rm -f %D/%%ETCDIR%%/ldapscripts.passwd; fi +@unexec if cmp -s %D/%%ETCDIR%%/ldapscripts.passwd %D/%%ETCDIR%%/ldapscripts.passwd.sample; 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%%/ldapaddgroup.template.sample @@ -31,3 +31,25 @@ sbin/ldapid sbin/ldapmodifygroup sbin/ldapmodifymachine sbin/ldapmodifyuser +man/man1/ldapaddgroup.1.gz +man/man1/ldapaddmachine.1.gz +man/man1/ldapadduser.1.gz +man/man1/ldapaddusertogroup.1.gz +man/man1/ldapdeletegroup.1.gz +man/man1/ldapdeletemachine.1.gz +man/man1/ldapdeleteuser.1.gz +man/man1/ldapdeleteuserfromgroup.1.gz +man/man1/ldapfinger.1.gz +man/man1/ldapgid.1.gz +man/man1/ldapid.1.gz +man/man1/ldapinit.1.gz +man/man1/ldapmodifygroup.1.gz +man/man1/ldapmodifymachine.1.gz +man/man1/ldapmodifyuser.1.gz +man/man1/ldaprenamegroup.1.gz +man/man1/ldaprenamemachine.1.gz +man/man1/ldaprenameuser.1.gz +man/man1/ldapsetpasswd.1.gz +man/man1/ldapsetprimarygroup.1.gz +man/man1/lsldap.1.gz +man/man5/ldapscripts.5.gz