Date: Mon, 21 Sep 2015 09:47:27 +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: r397481 - head/mail/dspam Message-ID: <201509210947.t8L9lRDY033894@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Sep 21 09:47:26 2015 New Revision: 397481 URL: https://svnweb.freebsd.org/changeset/ports/397481 Log: - Clean up plist user/group/mode handling [1] - Add DSPAM_SAMPLE_MODE variable PR: 203200 Submitted by: amdmi3 [1] Approved by: danny@dannywarren.com (maintainer) Modified: head/mail/dspam/Makefile head/mail/dspam/pkg-plist Modified: head/mail/dspam/Makefile ============================================================================== --- head/mail/dspam/Makefile Mon Sep 21 07:34:40 2015 (r397480) +++ head/mail/dspam/Makefile Mon Sep 21 09:47:26 2015 (r397481) @@ -7,6 +7,7 @@ PORTNAME= dspam PORTVERSION= 3.10.2 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -109,6 +110,7 @@ DSPAM_HOME?= ${_VAR_DIR}/db/dspam DSPAM_HOME_OWNER?= ${DSPAM_OWNER} DSPAM_HOME_GROUP?= ${DSPAM_GROUP} DSPAM_HOME_MODE?= 0770 +DSPAM_SAMPLE_MODE?= 0640 PLIST_SUB+= DSPAM_HOME=${DSPAM_HOME} \ DSPAM_OWNER=${DSPAM_OWNER} \ @@ -116,7 +118,8 @@ PLIST_SUB+= DSPAM_HOME=${DSPAM_HOME} \ DSPAM_MODE=${DSPAM_MODE} \ DSPAM_HOME_OWNER=${DSPAM_HOME_OWNER} \ DSPAM_HOME_GROUP=${DSPAM_HOME_GROUP} \ - DSPAM_HOME_MODE=${DSPAM_HOME_MODE} + DSPAM_HOME_MODE=${DSPAM_HOME_MODE} \ + DSPAM_SAMPLE_MODE=${DSPAM_SAMPLE_MODE} CONFIGURE_ARGS+= --sysconfdir=${DSPAM_ETC} CONFIGURE_ARGS+= --with-logdir=${LOG_DIR} Modified: head/mail/dspam/pkg-plist ============================================================================== --- head/mail/dspam/pkg-plist Mon Sep 21 07:34:40 2015 (r397480) +++ head/mail/dspam/pkg-plist Mon Sep 21 09:47:26 2015 (r397481) @@ -2,15 +2,7 @@ %%HASH%%bin/csscompress %%HASH%%bin/cssconvert %%HASH%%bin/cssstat -@owner %%DSPAM_OWNER%% -@group %%DSPAM_GROUP%% -@mode %%DSPAM_MODE%% -bin/dspam -@exec chown %%DSPAM_OWNER%%:%%DSPAM_GROUP%% %D/%F -@exec chmod %%DSPAM_MODE%% %D/%F -@mode -@group wheel -@owner root +@(%%DSPAM_OWNER%%,%%DSPAM_GROUP%%,%%DSPAM_MODE%%) bin/dspam bin/dspamc bin/dspam_2sql bin/dspam_admin @@ -23,15 +15,7 @@ bin/dspam_notify %%PGSQL%%bin/dspam_pg2int8 bin/dspam_stats bin/dspam_train -@mode 0640 -@owner %%DSPAM_OWNER%% -@group %%DSPAM_GROUP%% -@sample etc/dspam.conf.sample -@exec chown %%DSPAM_OWNER%%:%%DSPAM_GROUP%% %D/%F -@exec chmod 0640 %D/%F -@group wheel -@owner root -@mode +@sample(%%DSPAM_OWNER%%,%%DSPAM_GROUP%%,%%DSPAM_SAMPLE_MODE%%) etc/dspam.conf.sample include/dspam/buffer.h include/dspam/config.h include/dspam/config_shared.h @@ -222,17 +206,8 @@ libdata/pkgconfig/dspam.pc %%WebUI%%%%WWWDIR%%/templates/ro/nav_preferences.html %%WebUI%%%%WWWDIR%%/templates/ro/nav_quarantine.html %%WebUI%%%%WWWDIR%%/templates/ro/nav_viewmessage.html -@cwd %%DSPAM_HOME%% -firstrun.txt.sample -firstspam.txt.sample -quarantinefull.txt.sample -@cwd / -@owner %%DSPAM_HOME_OWNER%% -@group %%DSPAM_HOME_GROUP%% -@mode %%DSPAM_HOME_MODE%% -@mode -@exec chown %%DSPAM_HOME_OWNER%%:%%DSPAM_HOME_GROUP%% %%DSPAM_HOME%% -@exec chmod %%DSPAM_HOME_MODE%% %%DSPAM_HOME%% -@exec chown %%DSPAM_HOME_OWNER%%:%%DSPAM_HOME_GROUP%% %%LOG_DIR%% -@group wheel -@owner root +%%DSPAM_HOME%%/firstrun.txt.sample +%%DSPAM_HOME%%/firstspam.txt.sample +%%DSPAM_HOME%%/quarantinefull.txt.sample +@dir(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%,%%DSPAM_HOME_MODE%%) %%DSPAM_HOME%% +@dir(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%) %%LOG_DIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509210947.t8L9lRDY033894>