From owner-svn-ports-head@FreeBSD.ORG Tue Jul 15 02:20:01 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 A640F127; Tue, 15 Jul 2014 02:20:01 +0000 (UTC) Received: from mouf.net (mouf.net [IPv6:2607:fc50:0:4400:216:3eff:fe69:33b3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mouf.net", Issuer "mouf.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 3A3592C0C; Tue, 15 Jul 2014 02:20:01 +0000 (UTC) Received: from mouf.net (swills@mouf [199.48.129.64]) by mouf.net (8.14.5/8.14.5) with ESMTP id s6F2Jpim080363 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 15 Jul 2014 02:19:56 GMT (envelope-from swills@mouf.net) Received: (from swills@localhost) by mouf.net (8.14.5/8.14.5/Submit) id s6F2Jp5A080362; Tue, 15 Jul 2014 02:19:51 GMT (envelope-from swills) Date: Tue, 15 Jul 2014 02:19:51 +0000 From: Steve Wills To: Adam Weinberger Subject: Re: svn commit: r361699 - in head/mail/spamassassin: . files Message-ID: <20140715021948.GC79274@mouf.net> References: <201407131755.s6DHtf13003527@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="kVXhAStRUZ/+rrGn" Content-Disposition: inline In-Reply-To: <201407131755.s6DHtf13003527@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (mouf.net [199.48.129.64]); Tue, 15 Jul 2014 02:19:57 +0000 (UTC) X-Spam-Status: No, score=0.0 required=4.5 tests=none autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mouf.net X-Virus-Scanned: clamav-milter 0.98.1 at mouf.net X-Virus-Status: Clean Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 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: Tue, 15 Jul 2014 02:20:01 -0000 --kVXhAStRUZ/+rrGn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, FYI: https://jenkins.freebsd.org/pci/head-amd64/poudriere/data/headamd64-default= /757/logs/errors/spamassassin-3.4.0_13.log https://jenkins.freebsd.org/pci/head-i386/poudriere/data/headi386-default/7= 57/logs/errors/spamassassin-3.4.0_13.log =3D=3D=3D=3D>> Error: Files or directories left over: @dirrm /var/spool/%%USER%% Maybe you want to do the same with the spool dir? Steve On Sun, Jul 13, 2014 at 05:55:41PM +0000, Adam Weinberger wrote: > 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/ >=20 > 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. > =20 > So, we'll do it manually for the next 6 weeks. > =20 > PR: 190005 > Submitted by: Trond.Endrestol@ximalas.info >=20 > Modified: > head/mail/spamassassin/Makefile > head/mail/spamassassin/files/sa-spamd.in >=20 > Modified: head/mail/spamassassin/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 @@ > =20 > PORTNAME=3D spamassassin > PORTVERSION=3D 3.4.0 > -PORTREVISION?=3D 12 # also bump japanese/spamassassin > +PORTREVISION?=3D 13 # also bump japanese/spamassassin > CATEGORIES?=3D mail perl5 > MASTER_SITES=3D ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CP= AN:S/$/:cpan/} > MASTER_SITE_SUBDIR=3D spamassassin/source/:apache Mail/:cpan > @@ -66,6 +66,7 @@ RELAY_COUNTRY_DESC=3D Location-based scori > SPF_QUERY_DESC=3D Verify SPF records (mail/p5-Mail-SPF) > =20 > SUB_FILES=3D pkg-message > +SUB_LIST+=3D SPAMD_OWN=3D"${USERS}:${GROUPS}" > PLIST_SUB+=3D USER=3D${USERS} GROUP=3D${GROUPS} > OPTIONS_SUB=3D yes > =20 >=20 > Modified: head/mail/spamassassin/files/sa-spamd.in > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/mail/spamassassin/files/sa-spamd.in Sun Jul 13 17:08:41 2014 (r3= 61698) > +++ head/mail/spamassassin/files/sa-spamd.in Sun Jul 13 17:55:41 2014 (r3= 61699) > @@ -33,6 +33,9 @@ rcvar=3D${name}_enable > extra_commands=3D"reload" > load_rc_config $name > =20 > +start_precmd=3D"precmd" > +restart_precmd=3D"precmd" > + > # Set defaults > : ${spamd_enable:=3D"NO"} > : ${spamd_flags=3D"-c %%SQL_FLAG%% %%RUN_AS_USER%%"} > @@ -40,6 +43,14 @@ load_rc_config $name > pidfile=3D${spamd_pidfile:-"/var/run/${name}/${name}.pid"} > command=3D%%PREFIX%%/bin/${name} > command_args=3D"-d -r ${pidfile}" > -required_dirs=3D"%%PREFIX%%/share/spamassassin /var/run/${name}" > +required_dirs=3D"%%PREFIX%%/share/spamassassin" > + > +precmd() > +{ > + if [ ! -d /var/run/${name} ]; then > + mkdir -p /var/run/${name} > + chown %%SPAMD_OWN%% /var/run/${name} > + fi > +} > =20 > run_rc_command "$1" --kVXhAStRUZ/+rrGn Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJTxI/DAAoJEPXPYrMgexuhIKcH/3xGB7QnTx7ggag+kps6FDWp nG/re9XqKnRhoGpxd3oUxoJ0yPFjRvtSli0yVguGUp/7V3DMG1qalVRSOSXsPWOq h18sV9H58U9udUT2z+5q6ZUtCnFZ6yAcKteu8mw3mspxxMrHQb4FcWRLahU5SUHj LjIVsIGcaFEgWopy6lzxnIUMO0u5kLO1DX2krDXMh6v3ih6X0BqIxg9SftP5D1e/ 0iNB6+4z4OGBeqFww7jV46LoqDpE5KwnReXBTqOJSk/JmH5YgXBn/UT6J35KACns IWRDxeer9pJHsF0xkrBaAZFQwLBfo4EsCLnEJHv1A6kcLjxr7DZReXKdQlCMKOE= =+bKB -----END PGP SIGNATURE----- --kVXhAStRUZ/+rrGn--