Date: Fri, 28 Feb 2014 20:54:12 +0100 From: Tijl Coosemans <tijl@FreeBSD.org> To: Adam Weinberger <adamw@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r346570 - head/mail/squirrelmail Message-ID: <20140228205412.17dead83@kalimero.tijl.coosemans.org> In-Reply-To: <201402281928.s1SJSOFd043779@svn.freebsd.org> References: <201402281928.s1SJSOFd043779@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 28 Feb 2014 19:28:24 +0000 (UTC) Adam Weinberger wrote: > Author: adamw > Date: Fri Feb 28 19:28:23 2014 > New Revision: 346570 > URL: http://svnweb.freebsd.org/changeset/ports/346570 > QAT: https://qat.redports.org/buildarchive/r346570/ > > Log: > STAGE makes it a bit tricky to specify permissions and ownership > on directories. It looks like chown in the plist and chmod in > do-install does the right thing. > > PORTREVISION bump as ownership on some folders has changed. The > chmod in the plist seems to be a NO-OP but I'm leaving them in in > case they magically work in the future. > > Modified: > head/mail/squirrelmail/Makefile > head/mail/squirrelmail/pkg-plist > > Modified: head/mail/squirrelmail/Makefile > ============================================================================== > --- head/mail/squirrelmail/Makefile Fri Feb 28 19:14:42 2014 (r346569) > +++ head/mail/squirrelmail/Makefile Fri Feb 28 19:28:23 2014 (r346570) > @@ -3,6 +3,7 @@ > > PORTNAME= squirrelmail > PORTVERSION= 20131229 > +PORTREVISION= 1 > CATEGORIES= mail www > MASTER_SITES= ${MASTER_SITE_LOCAL} > MASTER_SITE_SUBDIR= adamw/squirrelmail > @@ -38,7 +39,9 @@ USERS= ${SMUSER} > GROUPS= ${SMGROUP} > > PLIST_SUB= PORTVERSION=${PORTVERSION} \ > - SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}" \ > + SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}" \ > + SMUSER=${SMUSER} \ > + SMGROUP=${SMGROUP} > > SUB_FILES= pkg-message > SUB_LIST= SQUIRRELDIR=${SQUIRRELDIR} SMUSER=${SMUSER} SMGROUP=${SMGROUP} > @@ -99,7 +102,6 @@ do-install: > cd ${WRKSRC} && \ > ${FIND} attach class config data functions help images include locale plugins po scripts src themes \ > | ${CPIO} -pdmu --quiet ${STAGEDIR}${SQUIRRELDIR} > - ${CHOWN} ${SMUSER}:${SMGROUP} ${STAGEDIR}${SQUIRRELDIR}/data ${STAGEDIR}${SQUIRRELDIR}/attach > ${CHMOD} 730 ${STAGEDIR}${SQUIRRELDIR}/attach > ${CHMOD} 750 ${STAGEDIR}${SQUIRRELDIR}/data I think you can remove the chmod commands too... > Modified: head/mail/squirrelmail/pkg-plist > ============================================================================== > --- head/mail/squirrelmail/pkg-plist Fri Feb 28 19:14:42 2014 (r346569) > +++ head/mail/squirrelmail/pkg-plist Fri Feb 28 19:28:23 2014 (r346570) > @@ -1,5 +1,7 @@ > etc/periodic/daily/111.clean-squirrelmail > %%SQUIRRELDIR%%/attach/.htaccess > +@exec chown %%SMUSER%%:%%SMGROUP%% %B > +@exec chmod 730 %B ...if you do this as follows: @owner %%SMUSER%% @group %%SMGROUP%% @mode 730 %%SQUIRRELDIR%%/attach/.htaccess @owner @group @mode Are you sure that 3 for group permissions is correct? > %%SQUIRRELDIR%%/class/.htaccess > %%SQUIRRELDIR%%/class/deliver/Deliver.class.php > %%SQUIRRELDIR%%/class/deliver/Deliver_IMAP.class.php > @@ -32,6 +34,8 @@ etc/periodic/daily/111.clean-squirrelmai > %%SQUIRRELDIR%%/data/default_pref-dist > @exec if [ ! -f %D/www/squirrelmail/data/default_pref ]; then cp -p %D/%F %B/default_pref; fi > %%SQUIRRELDIR%%/data/index.php > +@exec chown %%SMUSER%%:%%SMGROUP%% %B > +@exec chmod 750 %B Same here, but you could also group it with the .htaccess file above. The pkg-plist format is explained in the pkg-create manpage by the way.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140228205412.17dead83>