Date: Thu, 8 Oct 2015 13:19:42 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398821 - head/security/maia Message-ID: <201510081319.t98DJg1g056186@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Oct 8 13:19:42 2015 New Revision: 398821 URL: https://svnweb.freebsd.org/changeset/ports/398821 Log: - Move file owner handling to plist, fix stage as non-root PR: 203287 Submitted by: amdmi3 Approved by: maintainer timeout (ek@purplehat.org, 2 weeks) Modified: head/security/maia/Makefile head/security/maia/pkg-plist Modified: head/security/maia/Makefile ============================================================================== --- head/security/maia/Makefile Thu Oct 8 12:56:37 2015 (r398820) +++ head/security/maia/Makefile Thu Oct 8 13:19:42 2015 (r398821) @@ -338,7 +338,6 @@ post-patch: do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} @cd ${WRKSRC}/php && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}/ ${LN} -s ${PREFIX}/share/smarty ${STAGEDIR}${WWWDIR}/libs/Smarty ${MKDIR} -p ${STAGEDIR}${DATADIR} @cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scripts @@ -350,11 +349,10 @@ do-install: ${INSTALL} -m 640 ${WRKSRC}/maiad.conf.dist ${STAGEDIR}${ETCDIR}/maiad.conf.dist ${INSTALL} -m 640 ${WRKSRC}/maia.conf.dist ${STAGEDIR}${ETCDIR}/maia.conf.dist -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.post.mk> Modified: head/security/maia/pkg-plist ============================================================================== --- head/security/maia/pkg-plist Thu Oct 8 12:56:37 2015 (r398820) +++ head/security/maia/pkg-plist Thu Oct 8 13:19:42 2015 (r398821) @@ -40,6 +40,8 @@ sbin/maiad %%DATADIR%%/scripts/send-quarantine-reminders.pl %%DATADIR%%/scripts/stats-snapshot.pl @mode +@owner %%WWWOWN%% +@group %%WWWGRP%% %%WWWDIR%%/admin/configtest.php %%WWWDIR%%/admin/dblib.php %%WWWDIR%%/admin/internal-init.php @@ -59,11 +61,7 @@ sbin/maiad %%WWWDIR%%/chart_rules.php %%WWWDIR%%/chart_stats.php %%WWWDIR%%/chart_virus.php -@mode 640 -@group %%WWWGRP%% -%%WWWDIR%%/config.php.dist -@group -@mode +@(%%WWWOWN%%,%%WWWGRP%%,640) %%WWWDIR%%/config.php.dist %%WWWDIR%%/confirm.php %%WWWDIR%%/constants.php %%WWWDIR%%/core.php @@ -909,7 +907,53 @@ sbin/maiad %%WWWDIR%%/ximpersonate.php %%WWWDIR%%/xlogin.php %%WWWDIR%%/xsettings.php -@dir %%WWWDIR%%/themes/desert_sand/compiled -@dir %%WWWDIR%%/themes/dgm/compiled -@dir %%WWWDIR%%/themes/ocean_surf/compiled @dir %%WWWDIR%%/web +@dir %%WWWDIR%%/themes/ocean_surf/templates/settings +@dir %%WWWDIR%%/themes/ocean_surf/templates +@dir %%WWWDIR%%/themes/ocean_surf/javascript +@dir %%WWWDIR%%/themes/ocean_surf/images +@dir %%WWWDIR%%/themes/ocean_surf/css/images +@dir %%WWWDIR%%/themes/ocean_surf/css +@dir %%WWWDIR%%/themes/ocean_surf/compiled +@dir %%WWWDIR%%/themes/ocean_surf/code +@dir %%WWWDIR%%/themes/ocean_surf +@dir %%WWWDIR%%/themes/dgm/templates +@dir %%WWWDIR%%/themes/dgm/images +@dir %%WWWDIR%%/themes/dgm/css +@dir %%WWWDIR%%/themes/dgm/compiled +@dir %%WWWDIR%%/themes/dgm/code +@dir %%WWWDIR%%/themes/dgm +@dir %%WWWDIR%%/themes/desert_sand/templates/welcome +@dir %%WWWDIR%%/themes/desert_sand/templates/settings +@dir %%WWWDIR%%/themes/desert_sand/templates +@dir %%WWWDIR%%/themes/desert_sand/javascript +@dir %%WWWDIR%%/themes/desert_sand/images +@dir %%WWWDIR%%/themes/desert_sand/css/images +@dir %%WWWDIR%%/themes/desert_sand/css +@dir %%WWWDIR%%/themes/desert_sand/compiled +@dir %%WWWDIR%%/themes/desert_sand/code +@dir %%WWWDIR%%/themes/desert_sand +@dir %%WWWDIR%%/themes +@dir %%WWWDIR%%/overlib/mini +@dir %%WWWDIR%%/overlib +@dir %%WWWDIR%%/maia_db +@dir %%WWWDIR%%/locale/sv +@dir %%WWWDIR%%/locale/ru +@dir %%WWWDIR%%/locale/pt +@dir %%WWWDIR%%/locale/no +@dir %%WWWDIR%%/locale/nl +@dir %%WWWDIR%%/locale/it +@dir %%WWWDIR%%/locale/hu +@dir %%WWWDIR%%/locale/fr +@dir %%WWWDIR%%/locale/en +@dir %%WWWDIR%%/locale/de +@dir %%WWWDIR%%/locale/da +@dir %%WWWDIR%%/locale/cs +@dir %%WWWDIR%%/libs/jquery/images +@dir %%WWWDIR%%/libs/jquery +@dir %%WWWDIR%%/libs +@dir %%WWWDIR%%/images +@dir %%WWWDIR%%/admin +@dir %%WWWDIR%% +@owner +@group
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510081319.t98DJg1g056186>