From owner-svn-ports-head@FreeBSD.ORG Mon Sep 22 10:40:07 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 23B2ED5C; Mon, 22 Sep 2014 10:40:07 +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 04528FA4; Mon, 22 Sep 2014 10:40:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8MAe6Vq002013; Mon, 22 Sep 2014 10:40:06 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8MAe6F6001828; Mon, 22 Sep 2014 10:40:06 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201409221040.s8MAe6F6001828@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 22 Sep 2014 10:40:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368846 - in head/sysutils: downtimed fcron heartbeat 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: Mon, 22 Sep 2014 10:40:07 -0000 Author: bapt Date: Mon Sep 22 10:40:05 2014 New Revision: 368846 URL: http://svnweb.freebsd.org/changeset/ports/368846 QAT: https://qat.redports.org/buildarchive/r368846/ Log: Simplify plist Modified: head/sysutils/downtimed/pkg-plist head/sysutils/fcron/pkg-plist head/sysutils/heartbeat/Makefile head/sysutils/heartbeat/pkg-plist Modified: head/sysutils/downtimed/pkg-plist ============================================================================== --- head/sysutils/downtimed/pkg-plist Mon Sep 22 10:40:00 2014 (r368845) +++ head/sysutils/downtimed/pkg-plist Mon Sep 22 10:40:05 2014 (r368846) @@ -2,6 +2,4 @@ bin/downtimes man/man1/downtimes.1.gz man/man8/downtimed.8.gz sbin/downtimed -@cwd / -@exec mkdir -p /var/db/downtimed -@dirrmtry /var/db/downtimed +@dir /var/db/downtimed Modified: head/sysutils/fcron/pkg-plist ============================================================================== --- head/sysutils/fcron/pkg-plist Mon Sep 22 10:40:00 2014 (r368845) +++ head/sysutils/fcron/pkg-plist Mon Sep 22 10:40:05 2014 (r368846) @@ -1,18 +1,15 @@ %%PAMDIR%%/fcron %%PAMDIR%%/fcrontab -@mode 6111 @owner fcron @group fcron -bin/fcrondyn -bin/fcrontab -@mode 4110 -bin/fcronsighup -@mode +@(,,6111) bin/fcrondyn +@(,,6111) bin/fcrontab +@(,,4110) bin/fcronsighup @sample etc/fcron.allow.sample @sample etc/fcron.conf.sample @sample etc/fcron.deny.sample -@owner root -@group wheel +@owner +@group man/man1/fcrondyn.1.gz man/man1/fcrontab.1.gz man/man5/fcron.conf.5.gz @@ -23,11 +20,4 @@ sbin/fcron %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fcrontab-operator %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fcrontab-root %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fcrontab.pam -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%% -@cwd / -@exec install -d -o fcron -g fcron -m 770 /var/spool/fcron -@owner fcron -@group fcron -@dirrmtry /var/spool/fcron -@owner root -@group wheel +@dir(fcron,fcron,770) /var/spool/fcron Modified: head/sysutils/heartbeat/Makefile ============================================================================== --- head/sysutils/heartbeat/Makefile Mon Sep 22 10:40:00 2014 (r368845) +++ head/sysutils/heartbeat/Makefile Mon Sep 22 10:40:05 2014 (r368846) @@ -27,11 +27,10 @@ BUILD_DEPENDS= bison:${PORTSDIR}/devel/b USE_AUTOTOOLS= autoconf autoheader automake aclocal libtoolize AUTOMAKE_ARGS= --add-missing --include-deps --copy -USES= gettext gmake libtool pkgconfig tar:bzip2 shebangfix +USES= gettext gmake libtool pkgconfig python tar:bzip2 shebangfix SHEBANG_FILES= ldirectord/ldirectord.in USE_GNOME= glib20 USE_LDCONFIG= yes -USE_PYTHON= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip Modified: head/sysutils/heartbeat/pkg-plist ============================================================================== --- head/sysutils/heartbeat/pkg-plist Mon Sep 22 10:40:00 2014 (r368845) +++ head/sysutils/heartbeat/pkg-plist Mon Sep 22 10:40:05 2014 (r368846) @@ -1,26 +1,12 @@ bin/cl_respawn -@group %%GROUP%% -@mode 2555 -bin/cl_status -@group -@mode +@(,%%GROUP%%,2555) bin/cl_status %%MGMT%%bin/hb_gui etc/ha.d/README.config -%%PORTDOCS%%@unexec if cmp -s %D/etc/ha.d/authkeys.sample %D/etc/ha.d/authkeys; then rm -f %D/etc/ha.d/authkeys; fi -@mode 0600 -%%PORTDOCS%%etc/ha.d/authkeys.sample -@mode -%%PORTDOCS%%@exec if [ ! -f %D/etc/ha.d/authkeys ]; then cp -p %D/%F %B/authkeys; fi -%%PORTDOCS%%@unexec if cmp -s %D/etc/ha.d/ha.cf.sample %D/etc/ha.d/ha.cf; then rm -f %D/etc/ha.d/ha.cf; fi -%%PORTDOCS%%etc/ha.d/ha.cf.sample -%%PORTDOCS%%@exec if [ ! -f %D/etc/ha.d/ha.cf ]; then cp -p %D/%F %B/ha.cf; fi +%%PORTDOCS%%@sample(,,0600) etc/ha.d/authkeys.sample +%%PORTDOCS%%@sample etc/ha.d/ha.cf.sample etc/ha.d/harc -%%PORTDOCS%%@unexec if cmp -s %D/etc/ha.d/logd.cf.sample %D/etc/ha.d/logd.cf; then rm -f %D/etc/ha.d/logd.cf; fi -%%PORTDOCS%%etc/ha.d/logd.cf.sample -%%PORTDOCS%%@exec if [ ! -f %D/etc/ha.d/logd.cf ]; then cp -p %D/%F %B/logd.cf; fi -%%LDIRECTORD%%@unexec if cmp -s %D/etc/ha.d/ldirectord.cf.sample %D/etc/ha.d/ldirectord.cf; then rm -f %D/etc/ha.d/ldirectord.cf; fi -%%LDIRECTORD%%etc/ha.d/ldirectord.cf.sample -%%LDIRECTORD%%@exec if [ ! -f %D/etc/ha.d/ldirectord.cf ]; then cp -p %D/%F %B/ldirectord.cf; fi +%%PORTDOCS%%@sample etc/ha.d/logd.cf.sample +%%LDIRECTORD%%@sample etc/ha.d/ldirectord.cf.sample etc/ha.d/rc.d/ask_resources etc/ha.d/rc.d/hb_takeover etc/ha.d/rc.d/ip-request @@ -606,78 +592,19 @@ sbin/stonith %%DATADIR%%/stonithdtest/STONITHDBasicSanityCheck %%MGMT%%share/locale/zh_CN/LC_MESSAGES/haclient.mo %%DATADIR%%/utillib.sh -@dirrm %%DATADIR%%/stonithdtest -@dirrm %%DATADIR%%/lrmtest/testcases -@dirrm %%DATADIR%%/lrmtest -@dirrm %%DATADIR%%/cts -%%MGMT%%@dirrm share/heartbeat-gui -@dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm lib/stonith/plugins/stonith2 -@dirrm lib/stonith/plugins/external -@dirrm lib/stonith/plugins -@dirrm lib/stonith -@dirrm lib/pils/plugins/InterfaceMgr -@dirrm lib/pils/plugins -@dirrm lib/pils -@dirrm lib/heartbeat/stonithdtest -@dirrm lib/heartbeat/plugins/tiebreaker -@dirrm lib/heartbeat/plugins/test -@dirrm lib/heartbeat/plugins/quorumd -@dirrm lib/heartbeat/plugins/quorum -@dirrm lib/heartbeat/plugins/RAExec -@dirrm lib/heartbeat/plugins/HBcompress -@dirrm lib/heartbeat/plugins/HBcomm -@dirrm lib/heartbeat/plugins/HBauth -@dirrm lib/heartbeat/plugins/AppHBNotification -@dirrm lib/heartbeat/plugins -%%MGMT%%@dirrm lib/heartbeat-gui -@dirrm lib/heartbeat -@dirrm include/stonith -@dirrm include/saf -@dirrm include/pils -@dirrm include/ocf -%%MGMT%%@dirrm include/heartbeat/mgmt -@dirrm include/heartbeat/lrm -@dirrm include/heartbeat/fencing -@dirrm include/heartbeat/crm/pengine -@dirrm include/heartbeat/crm/common -@dirrm include/heartbeat/crm -@dirrm include/heartbeat -@dirrm include/clplumbing -@dirrmtry etc/ocf/resource.d/heartbeat -@dirrmtry etc/ocf/resource.d -@dirrmtry etc/ocf -@dirrmtry etc/logrotate.d -@dirrmtry etc/ha.d/resource.d -@dirrmtry etc/ha.d/rc.d -@dirrmtry etc/ha.d -@unexec rmdir "/var/lib/heartbeat/cores/%%USER%%" >/dev/null 2>&1 || : -@exec install -d -m 700 -o %%USER%% /var/lib/heartbeat/cores/%%USER%% -@unexec rmdir "/var/lib/heartbeat/cores/nobody" >/dev/null 2>&1 || : -@exec install -d -m 700 -o nobody /var/lib/heartbeat/cores/nobody -@unexec rmdir "/var/lib/heartbeat/cores/root" >/dev/null 2>&1 || : -@exec install -d -m 700 /var/lib/heartbeat/cores/root -@unexec rmdir "/var/lib/heartbeat/cores" >/dev/null 2>&1 || : -@exec install -d -m 755 /var/lib/heartbeat/cores -@unexec rmdir "/var/lib/heartbeat/crm" >/dev/null 2>&1 || : -@exec install -d -m 750 -o %%USER%% -g %%GROUP%% /var/lib/heartbeat/crm -@unexec rmdir "/var/lib/heartbeat/fencing" >/dev/null 2>&1 || : -@exec install -d -m 770 -g %%GROUP%% /var/lib/heartbeat/fencing -@unexec rmdir "/var/lib/heartbeat/lrm" >/dev/null 2>&1 || : -@exec install -d -m 770 -g %%GROUP%% /var/lib/heartbeat/lrm -%%MGMT%%@unexec rmdir "/var/lib/heartbeat/mgmt" >/dev/null 2>&1 || : -%%MGMT%%@exec install -d -m 770 -g %%GROUP%% /var/lib/heartbeat/mgmt -@unexec rmdir "/var/lib/heartbeat/pengine" >/dev/null 2>&1 || : -@unexec rmdir "/var/lib/heartbeat" >/dev/null 2>&1 || : -@unexec rmdir "/var/lib" >/dev/null 2>&1 || : -@unexec rmdir "/var/run/heartbeat/pengine" >/dev/null 2>&1 || : -@exec install -d -m 750 -o %%USER%% -g %%GROUP%% /var/run/heartbeat/pengine -@unexec rmdir "/var/run/heartbeat/ccm" >/dev/null 2>&1 || : -@exec install -d -m 750 -o %%USER%% -g %%GROUP%% /var/run/heartbeat/ccm -@unexec rmdir "/var/run/heartbeat/crm" >/dev/null 2>&1 || : -@exec install -d -m 750 -o %%USER%% -g %%GROUP%% /var/run/heartbeat/crm -@unexec rmdir "/var/run/heartbeat" >/dev/null 2>&1 || : -@exec install -d -m 750 -o %%USER%% -g %%GROUP%% /var/run/heartbeat -@cwd / -var/run/heartbeat.pid +@dir(%%USER%%,,700) /var/lib/heartbeat/cores/%%USER%% +@dir(nobody,,700) /var/lib/heartbeat/cores/nobody +@dir(,,700) /var/lib/heartbeat/core/root +@dir /var/lib/heartbeat/cores/ +@dir(%%USER%%,,750) /var/lib/heartbeat/crm/ +@dir(,%%GROUP%%,770) /var/lib/heartbeat/fencing/ +@dir(,%%GROUP%%,770) /var/lib/heartbeat/lrm/ +@dir(,%%GROUP%%,770) /var/lib/heartbeat/mgmt/ +@dir /var/lib/heartbeat/pengine +@dir /var/lib/heartbeat/ +@dir /var/lib/ +@dir(%%USER%%,%%GROUP%%,750) /var/run/heartbeat/pengine +@dir(%%USER%%,%%GROUP%%,750) /var/run/heartbeat/ccm +@dir(%%USER%%,%%GROUP%%,750) /var/run/heartbeat/crm +@dir(%%USER%%,%%GROUP%%,750) /var/run/heartbeat +/var/run/heartbeat.pid