Date: Tue, 1 Apr 2014 14:06:58 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349854 - in head: japanese/spamassassin mail/spamassassin mail/spamassassin/files Message-ID: <201404011406.s31E6wH1006575@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Tue Apr 1 14:06:57 2014 New Revision: 349854 URL: http://svnweb.freebsd.org/changeset/ports/349854 QAT: https://qat.redports.org/buildarchive/r349854/ Log: Partially revert r348415. There are many good scenarios where preventing user-config file creation is a good thing. Recommend one of those scenarios in the rc.d description. PR: ports/187659 Submitted by: Lawrence "The Dreamer" Chen <beastie@tardisi.com> Modified: head/japanese/spamassassin/Makefile head/mail/spamassassin/Makefile head/mail/spamassassin/files/sa-spamd.in Modified: head/japanese/spamassassin/Makefile ============================================================================== --- head/japanese/spamassassin/Makefile Tue Apr 1 13:17:18 2014 (r349853) +++ head/japanese/spamassassin/Makefile Tue Apr 1 14:06:57 2014 (r349854) @@ -1,7 +1,7 @@ # Created by: TAOKA Fumiyoshi # $FreeBSD$ -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= japanese mail perl5 PKGNAMEPREFIX= ja- Modified: head/mail/spamassassin/Makefile ============================================================================== --- head/mail/spamassassin/Makefile Tue Apr 1 13:17:18 2014 (r349853) +++ head/mail/spamassassin/Makefile Tue Apr 1 14:06:57 2014 (r349854) @@ -3,7 +3,7 @@ PORTNAME= spamassassin PORTVERSION= 3.4.0 -PORTREVISION?= 7 # also bump japanese/spamassassin +PORTREVISION?= 8 # also bump japanese/spamassassin CATEGORIES?= mail perl5 MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan Modified: head/mail/spamassassin/files/sa-spamd.in ============================================================================== --- head/mail/spamassassin/files/sa-spamd.in Tue Apr 1 13:17:18 2014 (r349853) +++ head/mail/spamassassin/files/sa-spamd.in Tue Apr 1 14:06:57 2014 (r349854) @@ -22,6 +22,8 @@ # # spamd_flags="-Q" # +# and remove -c (auto-create user preference files). +# . /etc/rc.subr @@ -33,11 +35,11 @@ load_rc_config $name # Set defaults : ${spamd_enable:="NO"} -: ${spamd_flags="%%SQL_FLAG%% %%RUN_AS_USER%%"} +: ${spamd_flags="-c %%SQL_FLAG%% %%RUN_AS_USER%%"} pidfile=${spamd_pidfile:-"/var/run/${name}/${name}.pid"} command=%%PREFIX%%/bin/${name} -command_args="-c -d -r ${pidfile}" +command_args="-d -r ${pidfile}" required_dirs=%%PREFIX%%/share/spamassassin run_rc_command "$1"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404011406.s31E6wH1006575>