From owner-svn-ports-all@FreeBSD.ORG Fri Feb 28 19:28:24 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9C344AD3; Fri, 28 Feb 2014 19:28:24 +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 6D9C81D81; Fri, 28 Feb 2014 19:28:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1SJSO32043781; Fri, 28 Feb 2014 19:28:24 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1SJSOFd043779; Fri, 28 Feb 2014 19:28:24 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201402281928.s1SJSOFd043779@svn.freebsd.org> From: Adam Weinberger Date: Fri, 28 Feb 2014 19:28:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346570 - head/mail/squirrelmail X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Feb 2014 19:28:24 -0000 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 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 %%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 %%SQUIRRELDIR%%/functions/.htaccess %%SQUIRRELDIR%%/functions/abook_database.php %%SQUIRRELDIR%%/functions/abook_ldap_server.php