Date: Mon, 6 Jun 2011 19:00:23 GMT From: Michael Scheidell <michael.scheidell@secnap.com> To: perl@FreeBSD.org Subject: Re: ports/157664: Fix port: mail/p5-Mail-SpamAssassin should use USERS Message-ID: <201106061900.p56J0NXX072875@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/157664; it has been noted by GNATS. From: Michael Scheidell <michael.scheidell@secnap.com> To: <bug-followup@FreeBSD.org>, <utisoft@gmail.com>, <ohauer@FreeBSD.org>, <yuri@rawbw.com> Cc: Subject: Re: ports/157664: Fix port: mail/p5-Mail-SpamAssassin should use USERS Date: Mon, 6 Jun 2011 14:51:57 -0400 --------------070300050800000907030504 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Port comitters: Please use the following patch: this incorporates utisoft's patch, bump to REVISION 4, as well as a bugfix submitted by ohauer@FreeBSD.org https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6488 -- Michael Scheidell, CTO o: 561-999-5000 d: 561-948-2259 >*| *SECNAP Network Security Corporation * Best Mobile Solutions Product of 2011 * Best Intrusion Prevention Product * Hot Company Finalist 2011 * Best Email Security Product * Certified SNORT Integrator ______________________________________________________________________ This email has been scanned and certified safe by SpammerTrap(r). For Information please see http://www.secnap.com/products/spammertrap/ ______________________________________________________________________ --------------070300050800000907030504 Content-Type: text/plain; name="saup_patch.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="saup_patch.txt" diff -bBru /var/tmp/saorig/Makefile ./Makefile --- /var/tmp/saorig/Makefile 2010-12-15 21:33:56.000000000 -0500 +++ ./Makefile 2011-06-06 14:35:41.000000000 -0400 @@ -7,7 +7,7 @@ PORTNAME= Mail-SpamAssassin PORTVERSION= 3.3.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan @@ -34,6 +34,8 @@ CONFIGURE_ARGS= SYSCONFDIR="${PREFIX}/etc" \ CONTACT_ADDRESS="${CONTACT_ADDRESS}" \ LOCALSTATEDIR="/var/db/spamassassin" +USERS= spamd +GROUPS= spamd # You can override it if you like CONTACT_ADDRESS?= The administrator of that system diff -bBru /var/tmp/saorig/files/patch-bug6488 ./files/patch-bug6488 --- /var/tmp/saorig/files/patch-bug6488 2011-06-06 14:49:57.000000000 -0400 +++ ./files/patch-bug6488 2011-06-06 14:39:13.000000000 -0400 @@ -0,0 +1,14 @@ +--- lib/Mail/SpamAssassin/Plugin/AntiVirus.pm (revision 574664) ++++ lib/Mail/SpamAssassin/Plugin/AntiVirus.pm (revision 1028149) +@@ -98,9 +98,9 @@ + my ($ctype, $boundary, $charset, $name) = + Mail::SpamAssassin::Util::parse_content_type($p->get_header('content-type')); + +- $name = lc $name || ''; ++ $name = lc($name || ''); + +- my $cte = lc $p->get_header('content-transfer-encoding') || ''; ++ my $cte = lc($p->get_header('content-transfer-encoding') || ''); + $ctype = lc $ctype; + + if ($name && $name =~ /\.(?:ade|adp|asx|bas|bat|chm|cmd|com|cpl|crt|dll|exe|hlp|hta|inf|ins|isp|js|jse|lnk|mda|mdb|mde|mdt|mdw|mdz|msc|msi|msp|mst|nws|ops|pcd|pif|prf|reg|scf|scr\??|sct|shb|shs|shm|swf|url|vb|vbe|vbs|vbx|vxd|wsc|wsf|wsh)$/) diff -bBru /var/tmp/saorig/pkg-install ./pkg-install --- /var/tmp/saorig/pkg-install 2010-04-08 09:13:00.000000000 -0400 +++ ./pkg-install 2011-06-06 14:37:18.000000000 -0400 @@ -32,28 +32,6 @@ echo "Please answer yes or no." done } - if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then - if pw groupadd ${GROUP} -g ${GID}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi - fi - - if ! pw usershow "${USER}" 2>/dev/null 1>&2; then - if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -s "/sbin/nologin" -d "${HOME}" \ - -c "SpamAssassin user"; \ - then - echo "Added user \"${USER}\"." - mkdir ${HOME} && chown ${USER}:${GROUP} ${HOME} - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi - # Create pid directory mkdir /var/run/spamd 2> /dev/null && chown ${USER}:${GROUP} /var/run/spamd /usr/bin/su root -c "${PKG_PREFIX}/bin/spamassassin -x -L --lint" --------------070300050800000907030504--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106061900.p56J0NXX072875>