From owner-svn-ports-head@FreeBSD.ORG Wed Sep 3 06:28:17 2014 Return-Path: Delivered-To: svn-ports-head@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 974A9F1D; Wed, 3 Sep 2014 06:28:17 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 77508132E; Wed, 3 Sep 2014 06:28:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s836SHVB032575; Wed, 3 Sep 2014 06:28:17 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s836SHui032573; Wed, 3 Sep 2014 06:28:17 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201409030628.s836SHui032573@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 3 Sep 2014 06:28:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367164 - head/www/yourls 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.18-1 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, 03 Sep 2014 06:28:17 -0000 Author: bapt Date: Wed Sep 3 06:28:16 2014 New Revision: 367164 URL: http://svnweb.freebsd.org/changeset/ports/367164 QAT: https://qat.redports.org/buildarchive/r367164/ Log: Properly set credentials via plist Modified: head/www/yourls/Makefile head/www/yourls/pkg-plist Modified: head/www/yourls/Makefile ============================================================================== --- head/www/yourls/Makefile Wed Sep 3 06:23:56 2014 (r367163) +++ head/www/yourls/Makefile Wed Sep 3 06:28:16 2014 (r367164) @@ -21,19 +21,10 @@ USE_PHP= bcmath curl json mysql pcre xml SUB_LIST+= PKGNAME=${PKGNAME} SUB_FILES+= pkg-message - -.include +PLIST_SUB= WWWOWN=${WWWOWN} \ + WWWGRP=${WWWGRP} do-install: @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} - @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \ - ${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST} - @${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644 - @${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type f -print0 | \ - ${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST} - @${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 - @${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type d -print0 | \ - ${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST} -.include +.include Modified: head/www/yourls/pkg-plist ============================================================================== --- head/www/yourls/pkg-plist Wed Sep 3 06:23:56 2014 (r367163) +++ head/www/yourls/pkg-plist Wed Sep 3 06:28:16 2014 (r367164) @@ -1,3 +1,5 @@ +@owner %%WWWOWN%% +@group %%WWWGRP%% %%WWWDIR%%/admin/admin-ajax.php %%WWWDIR%%/admin/index.php %%WWWDIR%%/admin/install.php @@ -365,23 +367,25 @@ %%WWWDIR%%/yourls-go.php %%WWWDIR%%/yourls-infos.php %%WWWDIR%%/yourls-loader.php -@dirrm %%WWWDIR%%/user/plugins/sample-toolbar/js -@dirrm %%WWWDIR%%/user/plugins/sample-toolbar/img -@dirrm %%WWWDIR%%/user/plugins/sample-toolbar/css -@dirrm %%WWWDIR%%/user/plugins/sample-toolbar -@dirrm %%WWWDIR%%/user/plugins/sample-plugin -@dirrm %%WWWDIR%%/user/plugins/sample-page +@dirrm %%WWWDIR%%/admin +@dirrm %%WWWDIR%%/css +@dirrm %%WWWDIR%%/images +@dirrm %%WWWDIR%%/includes/geo/flags +@dirrm %%WWWDIR%%/includes/geo +@dirrm %%WWWDIR%%/includes +@dirrm %%WWWDIR%%/js +@dirrm %%WWWDIR%%/pages +@dirrm %%WWWDIR%%/user/plugins/hyphens-in-urls @dirrm %%WWWDIR%%/user/plugins/random-bg/img @dirrm %%WWWDIR%%/user/plugins/random-bg -@dirrm %%WWWDIR%%/user/plugins/hyphens-in-urls +@dirrm %%WWWDIR%%/user/plugins/sample-page +@dirrm %%WWWDIR%%/user/plugins/sample-plugin +@dirrm %%WWWDIR%%/user/plugins/sample-toolbar/css +@dirrm %%WWWDIR%%/user/plugins/sample-toolbar/img +@dirrm %%WWWDIR%%/user/plugins/sample-toolbar/js +@dirrm %%WWWDIR%%/user/plugins/sample-toolbar @dirrm %%WWWDIR%%/user/plugins @dirrm %%WWWDIR%%/user -@dirrm %%WWWDIR%%/pages -@dirrm %%WWWDIR%%/js -@dirrm %%WWWDIR%%/includes/geo/flags -@dirrm %%WWWDIR%%/includes/geo -@dirrm %%WWWDIR%%/includes -@dirrm %%WWWDIR%%/images -@dirrm %%WWWDIR%%/css -@dirrm %%WWWDIR%%/admin @dirrm %%WWWDIR%% +@owner root +@group wheel