Date: Sun, 13 Jul 2014 17:55:41 +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: r361699 - in head/mail/spamassassin: . files Message-ID: <201407131755.s6DHtf13003527@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Sun Jul 13 17:55:41 2014 New Revision: 361699 URL: http://svnweb.freebsd.org/changeset/ports/361699 QAT: https://qat.redports.org/buildarchive/r361699/ Log: Create /var/run/spamd manually in the rc(8) script, as pkg_tools does not create the directory from the @dirrm /var/run/spamd in the plist. So, we'll do it manually for the next 6 weeks. PR: 190005 Submitted by: Trond.Endrestol@ximalas.info Modified: head/mail/spamassassin/Makefile head/mail/spamassassin/files/sa-spamd.in Modified: head/mail/spamassassin/Makefile ============================================================================== --- head/mail/spamassassin/Makefile Sun Jul 13 17:08:41 2014 (r361698) +++ head/mail/spamassassin/Makefile Sun Jul 13 17:55:41 2014 (r361699) @@ -3,7 +3,7 @@ PORTNAME= spamassassin PORTVERSION= 3.4.0 -PORTREVISION?= 12 # also bump japanese/spamassassin +PORTREVISION?= 13 # 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 @@ -66,6 +66,7 @@ RELAY_COUNTRY_DESC= Location-based scori SPF_QUERY_DESC= Verify SPF records (mail/p5-Mail-SPF) SUB_FILES= pkg-message +SUB_LIST+= SPAMD_OWN="${USERS}:${GROUPS}" PLIST_SUB+= USER=${USERS} GROUP=${GROUPS} OPTIONS_SUB= yes Modified: head/mail/spamassassin/files/sa-spamd.in ============================================================================== --- head/mail/spamassassin/files/sa-spamd.in Sun Jul 13 17:08:41 2014 (r361698) +++ head/mail/spamassassin/files/sa-spamd.in Sun Jul 13 17:55:41 2014 (r361699) @@ -33,6 +33,9 @@ rcvar=${name}_enable extra_commands="reload" load_rc_config $name +start_precmd="precmd" +restart_precmd="precmd" + # Set defaults : ${spamd_enable:="NO"} : ${spamd_flags="-c %%SQL_FLAG%% %%RUN_AS_USER%%"} @@ -40,6 +43,14 @@ load_rc_config $name pidfile=${spamd_pidfile:-"/var/run/${name}/${name}.pid"} command=%%PREFIX%%/bin/${name} command_args="-d -r ${pidfile}" -required_dirs="%%PREFIX%%/share/spamassassin /var/run/${name}" +required_dirs="%%PREFIX%%/share/spamassassin" + +precmd() +{ + if [ ! -d /var/run/${name} ]; then + mkdir -p /var/run/${name} + chown %%SPAMD_OWN%% /var/run/${name} + fi +} run_rc_command "$1"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407131755.s6DHtf13003527>