svn commit: r400039 - in head/irc/ratbox-services: . files

[Dmitry Marakasov]

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 at 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
- at sample etc/ratbox-services.conf.sample
+ at sample(ircservices,ircservices,640) etc/ratbox-services.conf.sample
 @rmtry /var/log/ratbox-services.log
 @rmtry /var/run/ratbox-services.pid
+ at dir(ircservices,ircservices,750) %%DBDIR%%