Date: Sun, 30 Nov 2014 21:26:36 +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: r373689 - in head: japanese/spamassassin mail/spamassassin mail/spamassassin/files Message-ID: <201411302126.sAULQa2T094715@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Sun Nov 30 21:26:35 2014 New Revision: 373689 URL: https://svnweb.freebsd.org/changeset/ports/373689 QAT: https://qat.redports.org/buildarchive/r373689/ Log: Add a patch from SA bug #7107, to quiet warnings due to bad usage of $^V that show up during sa-learn, sa-compile, etc. Note that other warnings can still show up, ex.: zoom: rule __FOR_SALE_PRC_100K will loop on SpamAssassin older than 3.3.2 running under Perl 5.12 or older, Bug 6558 While here, go with the @dir new world order. SA is not poudriere clean at this time; /var/spool/spamd is the homedir of user spamd, so I am pretty sure it shouldn't be listed with @dir. QA sees this as a leftover dir. PR: 195524 Submitted by: Bernard Spil Added: head/mail/spamassassin/files/patch-bug7107 (contents, props changed) Modified: head/japanese/spamassassin/Makefile head/mail/spamassassin/Makefile head/mail/spamassassin/pkg-plist Modified: head/japanese/spamassassin/Makefile ============================================================================== --- head/japanese/spamassassin/Makefile Sun Nov 30 20:50:59 2014 (r373688) +++ head/japanese/spamassassin/Makefile Sun Nov 30 21:26:35 2014 (r373689) @@ -1,7 +1,7 @@ # Created by: TAOKA Fumiyoshi # $FreeBSD$ -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= japanese mail perl5 PKGNAMEPREFIX= ja- Modified: head/mail/spamassassin/Makefile ============================================================================== --- head/mail/spamassassin/Makefile Sun Nov 30 20:50:59 2014 (r373688) +++ head/mail/spamassassin/Makefile Sun Nov 30 21:26:35 2014 (r373689) @@ -3,7 +3,7 @@ PORTNAME= spamassassin PORTVERSION= 3.4.0 -PORTREVISION?= 14 # also bump japanese/spamassassin +PORTREVISION?= 15 # 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 Added: head/mail/spamassassin/files/patch-bug7107 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/spamassassin/files/patch-bug7107 Sun Nov 30 21:26:35 2014 (r373689) @@ -0,0 +1,35 @@ +--- lib/Mail/SpamAssassin/Conf/Parser.pm 2014/11/27 18:51:04 1642206 ++++ lib/Mail/SpamAssassin/Conf/Parser.pm 2014/11/27 18:54:32 1642207 +@@ -533,6 +533,9 @@ + elsif ($token eq 'version') { + $eval .= $Mail::SpamAssassin::VERSION." "; + } ++ elsif ($token eq 'perl_version') { ++ $eval .= $]." "; ++ } + elsif ($token =~ /^\w[\w\:]+$/) { # class name + my $u = untaint_var($token); + $eval .= '"' . $u . '" '; +--- lib/Mail/SpamAssassin/Conf.pm 2014/11/27 18:51:04 1642206 ++++ lib/Mail/SpamAssassin/Conf.pm 2014/11/27 18:54:32 1642207 +@@ -3886,6 +3886,20 @@ + version, and z is maintenance version. So 3.0.0 is C<3.000000>, and 3.4.80 is + C<3.004080>. + ++=item perl_version ++ ++This will be replaced with the version number of the currently-running ++perl engine. Note: The version used is in the $] version format which is ++C<x.yyyzzz>, where x is major version, y is minor version, and z is maintenance ++version. So 5.8.8 is C<5.008008>, and 5.10.0 is C<5.010000>. Use to protect rules ++that incorporate RE syntax elements introduced in later versions of perl, such ++as the C<++> non-backtracking match. For example: ++ ++ # Avoid lint error on older perl installs ++ if perl_version >= 5.010000 ++ body INVALID_RE_SYNTAX_IN_PERL_5_8_8 /\w++/ ++ endif ++ + =item plugin(Name::Of::Plugin) + + This is a function call that returns C<1> if the plugin named Modified: head/mail/spamassassin/pkg-plist ============================================================================== --- head/mail/spamassassin/pkg-plist Sun Nov 30 20:50:59 2014 (r373688) +++ head/mail/spamassassin/pkg-plist Sun Nov 30 21:26:35 2014 (r373689) @@ -200,14 +200,11 @@ man/man1/spamd.1.gz %%DATADIR%%/languages %%DATADIR%%/sa-update-pubkey.txt %%DATADIR%%/user_prefs.template -@dirrm %%DATADIR%% -@dirrmtry %%ETCDIR%% -@dirrmtry etc/mail @unexec rm -rf /var/lib/spamassassin/2* 2>&1 >/dev/null || true -@dirrmtry /var/lib/spamassassin -@dirrmtry /var/lib -@dirrmtry /var/db/spamassassin +@dir /var/lib/spamassassin +@dir /var/lib +@dir /var/db/spamassassin @unexec [ -d /var/db/spamassassin ] && echo "If you are no longer using SpamAssassin, remove /var/db/spamassassin" @unexec pw usershow "%%USER%%" 2>/dev/null 1>&2 && echo "To delete %%USER%% permanently, 'rmuser %%USER%%'" @@ -215,7 +212,7 @@ man/man1/spamd.1.gz @owner %%USER%% @group %%GROUP%% -@dirrmtry /var/run/spamd +@dir /var/run/spamd @group @owner
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411302126.sAULQa2T094715>