From owner-svn-ports-all@freebsd.org Fri Oct 23 16:51:53 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE592A1C9BB; Fri, 23 Oct 2015 16:51:53 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 7790B7BC; Fri, 23 Oct 2015 16:51:53 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9NGpq5s041424; Fri, 23 Oct 2015 16:51:52 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9NGpqNg041422; Fri, 23 Oct 2015 16:51:52 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201510231651.t9NGpqNg041422@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 23 Oct 2015 16:51:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400039 - in head/irc/ratbox-services: . 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-all@freebsd.org X-Mailman-Version: 2.1.20 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, 23 Oct 2015 16:51:54 -0000 Author: amdmi3 Date: Fri Oct 23 16:51:52 2015 New Revision: 400039 URL: https://svnweb.freebsd.org/changeset/ports/400039 Log: - Move owner/group/perm handling into plist, fixing packaging from non-root PR: 203567 Submitted by: amdmi3 Approved by: maintainer timeout (moggie@elasticmind.net, 2 weeks) Modified: head/irc/ratbox-services/files/pkg-install.in head/irc/ratbox-services/pkg-plist Modified: head/irc/ratbox-services/files/pkg-install.in ============================================================================== --- head/irc/ratbox-services/files/pkg-install.in Fri Oct 23 16:51:47 2015 (r400038) +++ head/irc/ratbox-services/files/pkg-install.in Fri Oct 23 16:51:52 2015 (r400039) @@ -19,22 +19,6 @@ touch $lf \ && chown ircservices:ircservices $lf \ && chmod 640 $lf - -mkdir -p %%DBDIR%% \ -&& chown ircservices:ircservices %%DBDIR%% \ -&& chmod 750 %%DBDIR%% - -# Secure permissions if we think this is a fresh install -conffile="%%PREFIX%%/etc/ratbox-services.conf" -samplefile="%%PREFIX%%/etc/ratbox-services.conf.sample" -if cmp -s $conffile $samplefile; then - echo "Setting permissions for config file." - chown ircservices:ircservices $conffile - chmod 640 $conffile -else - echo "Modified ratbox-services.conf file found, skipping perms setting." -fi - cd %%DATADIR%% \ && %%PERL%% ./generate-schema.pl Modified: head/irc/ratbox-services/pkg-plist ============================================================================== --- head/irc/ratbox-services/pkg-plist Fri Oct 23 16:51:47 2015 (r400038) +++ head/irc/ratbox-services/pkg-plist Fri Oct 23 16:51:52 2015 (r400039) @@ -567,6 +567,7 @@ include/client.h @rmtry %%DATADIR%%/schema-mysql.txt @rmtry %%DATADIR%%/schema-pgsql.txt @rmtry %%DATADIR%%/schema-sqlite.txt -@sample etc/ratbox-services.conf.sample +@sample(ircservices,ircservices,640) etc/ratbox-services.conf.sample @rmtry /var/log/ratbox-services.log @rmtry /var/run/ratbox-services.pid +@dir(ircservices,ircservices,750) %%DBDIR%%