svn commit: r347653 - in head: japanese/p5-Mail-SpamAssassin japanese/p5-Mail-SpamAssassin/files mail/p5-Mail-SpamAssassin mail/p5-Mail-SpamAssassin-Alt mail/p5-Mail-SpamAssassin/files
Adam Weinberger
adamw at FreeBSD.org
Sun Mar 9 15:54:55 UTC 2014
Author: adamw
Date: Sun Mar 9 15:54:52 2014
New Revision: 347653
URL: http://svnweb.freebsd.org/changeset/ports/347653
QAT: https://qat.redports.org/buildarchive/r347653/
Log:
Update SpamAssassin to 3.4.0, and take maintainership.
As part of this upgrade, the SPAMC option has been removed. First
and foremost, it was a NO-OP as spamc/spamd was being built anyway.
A number of other OPTIONS and dependencies have been cleaned up as
well.
I am also taking maintainership of p5-Mail-SpamAssassin-Alt, and I
intend to deprecate it unless I hear otherwise.
The patch/plist for japanese/p5-M-SA is no longer versioned. It'll
make future updates cleaner.
PR: ports/186756
The patch is a collaborative effort between myself and
Takefu <takefu at airport.fm>
Added:
head/japanese/p5-Mail-SpamAssassin/files/spamassassin-ja.patch
- copied, changed from r347650, head/japanese/p5-Mail-SpamAssassin/files/spamassassin-3.3.2-ja-1.patch
head/japanese/p5-Mail-SpamAssassin/files/spamassassin-ja.plist
- copied unchanged from r347650, head/japanese/p5-Mail-SpamAssassin/files/spamassassin-3.3.2-ja-1.plist
head/mail/p5-Mail-SpamAssassin/files/pkg-message.in
- copied, changed from r346955, head/mail/p5-Mail-SpamAssassin/pkg-message
Deleted:
head/japanese/p5-Mail-SpamAssassin/files/spamassassin-3.3.2-ja-1.patch
head/japanese/p5-Mail-SpamAssassin/files/spamassassin-3.3.2-ja-1.plist
head/mail/p5-Mail-SpamAssassin/files/patch-bug6624
head/mail/p5-Mail-SpamAssassin/files/patch-bug6655
head/mail/p5-Mail-SpamAssassin/files/patch-bug6698
head/mail/p5-Mail-SpamAssassin/files/patch-bug6745
head/mail/p5-Mail-SpamAssassin/files/patch-bug6937
head/mail/p5-Mail-SpamAssassin/pkg-deinstall
head/mail/p5-Mail-SpamAssassin/pkg-message
Modified:
head/japanese/p5-Mail-SpamAssassin/Makefile
head/japanese/p5-Mail-SpamAssassin/pkg-message
head/mail/p5-Mail-SpamAssassin-Alt/Makefile
head/mail/p5-Mail-SpamAssassin/Makefile
head/mail/p5-Mail-SpamAssassin/distinfo
head/mail/p5-Mail-SpamAssassin/pkg-descr
head/mail/p5-Mail-SpamAssassin/pkg-plist
Modified: head/japanese/p5-Mail-SpamAssassin/Makefile
==============================================================================
--- head/japanese/p5-Mail-SpamAssassin/Makefile Sun Mar 9 15:28:37 2014 (r347652)
+++ head/japanese/p5-Mail-SpamAssassin/Makefile Sun Mar 9 15:54:52 2014 (r347653)
@@ -1,7 +1,7 @@
# Created by: TAOKA Fumiyoshi
# $FreeBSD$
-PORTREVISION= 5
+PORTREVISION= 0
CATEGORIES= japanese mail perl5
PKGNAMEPREFIX= ja-p5-
@@ -10,13 +10,13 @@ COMMENT= SpamAssassin with patches to ha
LICENSE= APACHE20
-MASTERDIR= ${.CURDIR}/../../mail/p5-Mail-SpamAssassin
+MASTERDIR= ${.CURDIR}/../p5-Mail-SpamAssassin
-RUN_DEPENDS+= ja-p5-MeCab>=0.98:${PORTSDIR}/japanese/p5-MeCab
+BUILD_DEPENDS= ja-p5-MeCab>=0.98:${PORTSDIR}/japanese/p5-MeCab
CONFLICTS= p5-Mail-SpamAssassin-[0-9]*
-EXTRA_PATCHES= ${.CURDIR}/files/spamassassin-3.3.2-ja-1.patch
+EXTRA_PATCHES= ${.CURDIR}/files/spamassassin-ja.patch
PKGMESSAGE= ${.CURDIR}/pkg-message
PLIST= ${WRKDIR}/pkg-plist
@@ -30,6 +30,6 @@ pre-install:
@${CAT} ${PKGDIR}/pkg-plist >> ${PLIST}
post-install::
- @${CP} ${.CURDIR}/files/${TOKENIZER_PRE} ${STAGEDIR}${ETCDIR}/${TOKENIZER_PRE}.sample
+ ${INSTALL_DATA} ${.CURDIR}/files/${TOKENIZER_PRE} ${STAGEDIR}${ETCDIR}/${TOKENIZER_PRE}.sample
.include "${MASTERDIR}/Makefile"
Copied and modified: head/japanese/p5-Mail-SpamAssassin/files/spamassassin-ja.patch (from r347650, head/japanese/p5-Mail-SpamAssassin/files/spamassassin-3.3.2-ja-1.patch)
==============================================================================
--- head/japanese/p5-Mail-SpamAssassin/files/spamassassin-3.3.2-ja-1.patch Sun Mar 9 15:13:14 2014 (r347650, copy source)
+++ head/japanese/p5-Mail-SpamAssassin/files/spamassassin-ja.patch Sun Mar 9 15:54:52 2014 (r347653)
@@ -1,8 +1,7 @@
-diff -uNr lib/Mail/SpamAssassin/HTML.pm lib/Mail/SpamAssassin/HTML.pm
---- lib/Mail/SpamAssassin/HTML.pm 2011-06-07 08:59:17.000000000 +0900
-+++ lib/Mail/SpamAssassin/HTML.pm 2011-07-14 22:35:46.000000000 +0900
-@@ -84,7 +84,7 @@
- $ok_attributes{span}{$_} = 1 for qw( style );
+--- lib/Mail/SpamAssassin/HTML.pm.orig 2014-02-07 17:36:28.000000000 +0900
++++ lib/Mail/SpamAssassin/HTML.pm 2014-03-04 11:18:44.000000000 +0900
+@@ -86,7 +86,7 @@
+ $ok_attributes{div}{$_} = 1 for qw( style );
sub new {
- my ($class) = @_;
@@ -10,7 +9,7 @@ diff -uNr lib/Mail/SpamAssassin/HTML.pm
my $self = $class->SUPER::new(
api_version => 3,
handlers => [
-@@ -97,6 +97,7 @@
+@@ -99,6 +99,7 @@
declaration => ["html_declaration", "self,text"],
],
marked_sections => 1);
@@ -18,7 +17,7 @@ diff -uNr lib/Mail/SpamAssassin/HTML.pm
$self;
}
-@@ -672,7 +673,14 @@
+@@ -681,7 +682,14 @@
}
}
else {
@@ -34,9 +33,8 @@ diff -uNr lib/Mail/SpamAssassin/HTML.pm
# trim leading whitespace if previous element was whitespace
# and current element is not invisible
if (@{ $self->{text} } && !$display{invisible} &&
-diff -uNr lib/Mail/SpamAssassin/Message/Node.pm lib/Mail/SpamAssassin/Message/Node.pm
---- lib/Mail/SpamAssassin/Message/Node.pm 2011-06-07 08:59:17.000000000 +0900
-+++ lib/Mail/SpamAssassin/Message/Node.pm 2011-07-14 22:35:46.000000000 +0900
+--- lib/Mail/SpamAssassin/Message/Node.pm.orig 2014-02-07 17:36:23.000000000 +0900
++++ lib/Mail/SpamAssassin/Message/Node.pm 2014-03-04 11:22:38.000000000 +0900
@@ -42,6 +42,7 @@
use Mail::SpamAssassin::Constants qw(:sa);
use Mail::SpamAssassin::HTML;
@@ -45,7 +43,7 @@ diff -uNr lib/Mail/SpamAssassin/Message/
=item new()
-@@ -387,27 +388,10 @@
+@@ -385,27 +386,10 @@
sub _normalize {
my ($self, $data, $charset) = @_;
@@ -76,7 +74,7 @@ diff -uNr lib/Mail/SpamAssassin/Message/
}
=item rendered()
-@@ -430,8 +414,12 @@
+@@ -428,8 +412,12 @@
# text/x-aol is ignored here, but looks like text/html ...
return(undef,undef) unless ( $self->{'type'} =~ /^text\/(?:plain|html)$/i );
@@ -90,7 +88,7 @@ diff -uNr lib/Mail/SpamAssassin/Message/
# render text/html always, or any other text|text/plain part as text/html
# based on a heuristic which simulates a certain common mail client
-@@ -441,7 +429,7 @@
+@@ -439,7 +427,7 @@
{
$self->{rendered_type} = 'text/html';
@@ -99,10 +97,9 @@ diff -uNr lib/Mail/SpamAssassin/Message/
$html->parse($text); # parse+render text
$self->{rendered} = $html->get_rendered_text();
$self->{visible_rendered} = $html->get_rendered_text(invisible => 0);
-diff -uNr lib/Mail/SpamAssassin/Message.pm lib/Mail/SpamAssassin/Message.pm
---- lib/Mail/SpamAssassin/Message.pm 2011-06-07 08:59:17.000000000 +0900
-+++ lib/Mail/SpamAssassin/Message.pm 2011-07-14 22:35:46.000000000 +0900
-@@ -559,6 +559,8 @@
+--- lib/Mail/SpamAssassin/Message.pm.orig 2014-02-07 17:36:28.000000000 +0900
++++ lib/Mail/SpamAssassin/Message.pm 2014-03-04 11:27:31.000000000 +0900
+@@ -604,6 +604,8 @@
delete $self->{'pristine_headers'};
delete $self->{'line_ending'};
delete $self->{'missing_head_body_separator'};
@@ -111,7 +108,7 @@ diff -uNr lib/Mail/SpamAssassin/Message.
my @toclean = ( $self );
-@@ -585,6 +587,8 @@
+@@ -630,6 +632,8 @@
delete $part->{'invisible_rendered'};
delete $part->{'type'};
delete $part->{'rendered_type'};
@@ -120,7 +117,7 @@ diff -uNr lib/Mail/SpamAssassin/Message.
# if there are children nodes, add them to the queue of nodes to clean up
if (exists $part->{'body_parts'}) {
-@@ -1014,7 +1018,14 @@
+@@ -1085,7 +1089,14 @@
# whitespace handling (warning: small changes have large effects!)
$text =~ s/\n+\s*\n+/\f/gs; # double newlines => form feed
@@ -136,7 +133,7 @@ diff -uNr lib/Mail/SpamAssassin/Message.
$text =~ tr/\f/\n/; # form feeds => newline
# warn "message: $text";
-@@ -1071,7 +1082,14 @@
+@@ -1142,7 +1153,14 @@
# whitespace handling (warning: small changes have large effects!)
$text =~ s/\n+\s*\n+/\f/gs; # double newlines => form feed
@@ -152,7 +149,7 @@ diff -uNr lib/Mail/SpamAssassin/Message.
$text =~ tr/\f/\n/; # form feeds => newline
my @textary = split_into_array_of_short_lines ($text);
-@@ -1122,7 +1140,14 @@
+@@ -1193,7 +1211,14 @@
# whitespace handling (warning: small changes have large effects!)
$text =~ s/\n+\s*\n+/\f/gs; # double newlines => form feed
@@ -168,7 +165,7 @@ diff -uNr lib/Mail/SpamAssassin/Message.
$text =~ tr/\f/\n/; # form feeds => newline
my @textary = split_into_array_of_short_lines ($text);
-@@ -1198,6 +1223,28 @@
+@@ -1269,6 +1294,28 @@
# ---------------------------------------------------------------------------
@@ -197,18 +194,17 @@ diff -uNr lib/Mail/SpamAssassin/Message.
1;
=back
-diff -uNr lib/Mail/SpamAssassin/PerMsgStatus.pm lib/Mail/SpamAssassin/PerMsgStatus.pm
---- lib/Mail/SpamAssassin/PerMsgStatus.pm 2011-06-07 08:59:17.000000000 +0900
-+++ lib/Mail/SpamAssassin/PerMsgStatus.pm 2011-07-14 22:35:46.000000000 +0900
+--- lib/Mail/SpamAssassin/PerMsgStatus.pm.orig 2014-02-07 17:36:28.000000000 +0900
++++ lib/Mail/SpamAssassin/PerMsgStatus.pm 2014-03-04 11:30:25.000000000 +0900
@@ -53,6 +53,7 @@
use warnings;
use re 'taint';
+use Encode;
+ use Errno qw(ENOENT);
use Time::HiRes qw(time);
- use Mail::SpamAssassin::Constants qw(:sa);
-@@ -733,19 +734,41 @@
+@@ -996,19 +997,41 @@
# the report charset
my $report_charset = "; charset=iso-8859-1";
@@ -255,9 +251,8 @@ diff -uNr lib/Mail/SpamAssassin/PerMsgSt
}
# get original headers, "pristine" if we can do it
-diff -uNr lib/Mail/SpamAssassin/Plugin/Bayes.pm lib/Mail/SpamAssassin/Plugin/Bayes.pm
---- lib/Mail/SpamAssassin/Plugin/Bayes.pm 2011-06-07 08:59:17.000000000 +0900
-+++ lib/Mail/SpamAssassin/Plugin/Bayes.pm 2011-07-14 22:35:46.000000000 +0900
+--- lib/Mail/SpamAssassin/Plugin/Bayes.pm.orig 2014-02-07 17:36:27.000000000 +0900
++++ lib/Mail/SpamAssassin/Plugin/Bayes.pm 2014-03-04 11:34:46.000000000 +0900
@@ -223,6 +223,15 @@
# will require a longer token than English ones.)
use constant MAX_TOKEN_LENGTH => 15;
@@ -274,7 +269,7 @@ diff -uNr lib/Mail/SpamAssassin/Plugin/B
###########################################################################
sub new {
-@@ -983,9 +992,28 @@
+@@ -1039,9 +1048,28 @@
$msgdata->{bayes_token_body} = $msg->{msg}->get_visible_rendered_body_text_array();
$msgdata->{bayes_token_inviz} = $msg->{msg}->get_invisible_rendered_body_text_array();
@{$msgdata->{bayes_token_uris}} = $msg->get_uri_list();
@@ -303,7 +298,7 @@ diff -uNr lib/Mail/SpamAssassin/Plugin/B
###########################################################################
# The calling functions expect a uniq'ed array of tokens ...
-@@ -1039,7 +1067,7 @@
+@@ -1095,7 +1123,7 @@
# include quotes, .'s and -'s for URIs, and [$,]'s for Nigerian-scam strings,
# and ISO-8859-15 alphas. Do not split on @'s; better results keeping it.
# Some useful tokens: "$31,000,000" "www.clock-speed.net" "f*ck" "Hits!"
@@ -312,7 +307,7 @@ diff -uNr lib/Mail/SpamAssassin/Plugin/B
# DO split on "..." or "--" or "---"; common formatting error resulting in
# hapaxes. Keep the separator itself as a token, though, as long ones can
-@@ -1068,6 +1096,11 @@
+@@ -1124,6 +1152,11 @@
#
next if ( defined $magic_re && $token =~ /$magic_re/ );
@@ -324,7 +319,7 @@ diff -uNr lib/Mail/SpamAssassin/Plugin/B
# *do* keep 3-byte tokens; there's some solid signs in there
my $len = length($token);
-@@ -1096,14 +1129,16 @@
+@@ -1152,14 +1185,16 @@
# the domain ".net" appeared in the To header.
#
if ($len > MAX_TOKEN_LENGTH && $token !~ /\*/) {
@@ -349,8 +344,8 @@ diff -uNr lib/Mail/SpamAssassin/Plugin/B
}
if (($region == 0 && HDRS_TOKENIZE_LONG_TOKENS_AS_SKIPS)
-diff -uNr lib/Mail/SpamAssassin/Plugin/Tokenizer/MeCab.pm lib/Mail/SpamAssassin/Plugin/Tokenizer/MeCab.pm
---- lib/Mail/SpamAssassin/Plugin/Tokenizer/MeCab.pm 1970-01-01 09:00:00.000000000 +0900
+diff -uNr /dev/null lib/Mail/SpamAssassin/Plugin/Tokenizer/MeCab.pm
+--- /dev/null 1970-01-01 09:00:00.000000000 +0900
+++ lib/Mail/SpamAssassin/Plugin/Tokenizer/MeCab.pm 2011-07-14 22:29:19.000000000 +0900
@@ -0,0 +1,84 @@
+# <@LICENSE>
@@ -437,8 +432,8 @@ diff -uNr lib/Mail/SpamAssassin/Plugin/T
+
+1;
+
-diff -uNr lib/Mail/SpamAssassin/Plugin/Tokenizer/SimpleJA.pm lib/Mail/SpamAssassin/Plugin/Tokenizer/SimpleJA.pm
---- lib/Mail/SpamAssassin/Plugin/Tokenizer/SimpleJA.pm 1970-01-01 09:00:00.000000000 +0900
+diff -uNr /dev/null lib/Mail/SpamAssassin/Plugin/Tokenizer/SimpleJA.pm
+--- /dev/null 1970-01-01 09:00:00.000000000 +0900
+++ lib/Mail/SpamAssassin/Plugin/Tokenizer/SimpleJA.pm 2011-07-14 22:29:19.000000000 +0900
@@ -0,0 +1,111 @@
+# <@LICENSE>
@@ -552,8 +547,8 @@ diff -uNr lib/Mail/SpamAssassin/Plugin/T
+
+1;
+
-diff -uNr lib/Mail/SpamAssassin/Plugin/Tokenizer.pm lib/Mail/SpamAssassin/Plugin/Tokenizer.pm
---- lib/Mail/SpamAssassin/Plugin/Tokenizer.pm 1970-01-01 09:00:00.000000000 +0900
+diff -uNr /dev/null lib/Mail/SpamAssassin/Plugin/Tokenizer.pm
+--- /dev/null 1970-01-01 09:00:00.000000000 +0900
+++ lib/Mail/SpamAssassin/Plugin/Tokenizer.pm 2011-07-14 22:35:46.000000000 +0900
@@ -0,0 +1,115 @@
+# <@LICENSE>
@@ -671,8 +666,8 @@ diff -uNr lib/Mail/SpamAssassin/Plugin/T
+
+1;
+
-diff -uNr lib/Mail/SpamAssassin/Util/Charset.pm lib/Mail/SpamAssassin/Util/Charset.pm
---- lib/Mail/SpamAssassin/Util/Charset.pm 1970-01-01 09:00:00.000000000 +0900
+diff -uNr /dev/null lib/Mail/SpamAssassin/Util/Charset.pm
+--- /dev/null 1970-01-01 09:00:00.000000000 +0900
+++ lib/Mail/SpamAssassin/Util/Charset.pm 2011-07-14 22:29:19.000000000 +0900
@@ -0,0 +1,471 @@
+# <@LICENSE>
Copied: head/japanese/p5-Mail-SpamAssassin/files/spamassassin-ja.plist (from r347650, head/japanese/p5-Mail-SpamAssassin/files/spamassassin-3.3.2-ja-1.plist)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/japanese/p5-Mail-SpamAssassin/files/spamassassin-ja.plist Sun Mar 9 15:54:52 2014 (r347653, copy of r347650, head/japanese/p5-Mail-SpamAssassin/files/spamassassin-3.3.2-ja-1.plist)
@@ -0,0 +1,12 @@
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer/MeCab.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer/SimpleJA.pm
+ at dirrm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Util/Charset.pm
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Tokenizer.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Tokenizer::MeCab.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Tokenizer::SimpleJA.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Util::Charset.3.gz
+ at unexec if cmp -s %D/%%ETCDIR%%/%%TOKENIZER_PRE%%.sample %D/%%ETCDIR%%/%%TOKENIZER_PRE%%; then rm -f %D/%%ETCDIR%%/%%TOKENIZER_PRE%%; fi
+%%ETCDIR%%/%%TOKENIZER_PRE%%.sample
+ at exec if [ ! -f %B/%%TOKENIZER_PRE%% ]; then cp -p %B/%f %B/%%TOKENIZER_PRE%%; fi
Modified: head/japanese/p5-Mail-SpamAssassin/pkg-message
==============================================================================
--- head/japanese/p5-Mail-SpamAssassin/pkg-message Sun Mar 9 15:28:37 2014 (r347652)
+++ head/japanese/p5-Mail-SpamAssassin/pkg-message Sun Mar 9 15:54:52 2014 (r347653)
@@ -1,42 +1,3 @@
-*************************************************************************
-* _ _____ _____ _____ _ _ _____ ___ ___ _ _ *
-* / \|_ _|_ _| ____| \ | |_ _|_ _/ _ \| \ | | *
-* / _ \ | | | | | _| | \| | | | | | | | | \| | *
-* / ___ \| | | | | |___| |\ | | | | | |_| | |\ | *
-* /_/ \_\_| |_| |_____|_| \_| |_| |___\___/|_| \_| *
-* *
-* See PREFIX/share/doc/p5-Mail-SpamAssassin/INSTALL, *
-* and PREFIX/share/doc/p5-Mail-SpamAssassin/UPGRADE, *
-* or http://spamassassin.org/dist/INSTALL and *
-* http://spamassassin.org/dist/UPGRADE BEFORE enabling *
-* this version of SpamAssassin for important information *
-* regarding changes in this version. *
-* *
-* SpamAssassin may require additional configuration in *
-* PREFIX/etc/mail/spamassassin/init.pre depending on *
-* the options you have installed. Otherwise, annoying *
-* (but harmless) error messages may result. Read the *
-* files listed above. *
-* *
-*************************************************************************
-You may wish to run sa-update now to obtain the latest rules.
-
-NOTE: FREEBSD users: If you are updating from a version prior to 3.20.
-sa-update now places state files in /var/db/spamassassin and not
-/var/lib/spamassassin. This is to be consistant with Freebsd file
-directory conventions.
-
-If you run sa-compile, you will notice that files are in
-/var/db/spamassassin/compiled/<perlversion>/<version> instead of
-/var/db/spamassassin/compiled/<version>.
-No attempts have been made to move old versions over. You must recompile.
-
-If you are running with spamd, you must add the following to rc.conf:
-spamd_enable="YES"
-
-Security Note: If you did NOT deselected AS_ROOT, spamd will be running
-as root. To change this, also add this to rc.conf:
-spamd_flags="-u spamd -H /var/spool/spamd"
************************************************************************
For Japanese users, see documents in
Modified: head/mail/p5-Mail-SpamAssassin-Alt/Makefile
==============================================================================
--- head/mail/p5-Mail-SpamAssassin-Alt/Makefile Sun Mar 9 15:28:37 2014 (r347652)
+++ head/mail/p5-Mail-SpamAssassin-Alt/Makefile Sun Mar 9 15:54:52 2014 (r347653)
@@ -1,13 +1,12 @@
# $FreeBSD$
-PORTREVISION= 2
+PORTREVISION= 0
PKGNAMESUFFIX= -Alt
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= adamw at FreeBSD.org
COMMENT= Provides optional SpamAssassin tuning
CONFLICTS= p5-Mail-SpamAssassin-[0-9]* ja-p5-Mail-SpamAssassin-[0-9]* p5-Mail-SpamAssassin-devel-[0-9]*
-LATEST_LINK= p5-Mail-SpamAssassin-Alt
OPTIONS_DEFINE= AWL FREEMAIL
AWL_DESC= Auto WhiteList support
Modified: head/mail/p5-Mail-SpamAssassin/Makefile
==============================================================================
--- head/mail/p5-Mail-SpamAssassin/Makefile Sun Mar 9 15:28:37 2014 (r347652)
+++ head/mail/p5-Mail-SpamAssassin/Makefile Sun Mar 9 15:54:52 2014 (r347653)
@@ -1,145 +1,106 @@
# Created by: Anthony Kim
# $FreeBSD$
-PORTNAME= Mail-SpamAssassin
-PORTVERSION= 3.3.2
-PORTREVISION?= 9 # committer: please bump PORTREVISION on Slaves
+PORTNAME= Mail-SpamAssassin
+PORTVERSION= 3.4.0
+PORTREVISION?= 0 # committer: please bump PORTREVISION on Slaves
CATEGORIES?= mail perl5
MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan
PKGNAMEPREFIX?= p5-
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:apache,cpan
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:apache,cpan
-MAINTAINER?= perl at FreeBSD.org
-COMMENT?= Highly efficient mail filter for identifying spam
+MAINTAINER?= adamw at FreeBSD.org
+COMMENT?= Highly efficient mail filter for identifying spam
LICENSE= APACHE20
BUILD_DEPENDS= p5-NetAddr-IP>=4.00.7:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
- p5-Net-DNS>=0.63:${PORTSDIR}/dns/p5-Net-DNS \
- p5-HTML-Parser>=3.46:${PORTSDIR}/www/p5-HTML-Parser \
- p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
- p5-Encode-Detect>=0:${PORTSDIR}/converters/p5-Encode-Detect \
- p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+ p5-Net-DNS>=0.63:${PORTSDIR}/dns/p5-Net-DNS \
+ p5-HTML-Parser>=3.46:${PORTSDIR}/www/p5-HTML-Parser \
+ p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+ p5-Encode-Detect>=0:${PORTSDIR}/converters/p5-Encode-Detect \
+ p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
+RUN_DEPENDS= ${BUILD_DEPENDS}
CONFLICTS?= ja-p5-Mail-SpamAssassin-[0-9]* p5-Mail-SpamAssassin-devel-[0-9]* p5-Mail-SpamAssassin-Alt-[0-9]*
USES= perl5
USE_PERL5= configure
USE_LDCONFIG= yes
+
+DATADIR= ${PREFIX}/share/spamassassin
DBDIR?= /var/db
+DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
ETCDIR?= ${PREFIX}/etc/mail/spamassassin
+
CONTACT_ADDRESS?= The administrator of that system
USERS?= spamd
GROUPS?= spamd
CONFIGURE_ARGS= SYSCONFDIR="${PREFIX}/etc" \
- CONTACT_ADDRESS="${CONTACT_ADDRESS}" \
- LOCALSTATEDIR="${DBDIR}/spamassassin"
+ CONTACT_ADDRESS="${CONTACT_ADDRESS}" \
+ LOCALSTATEDIR="${DBDIR}/spamassassin" \
+ BUILD_SPAMC=yes
+
+OPTIONS_DEFINE= AS_ROOT SACOMPILE DKIM SSL GNUPG MYSQL PGSQL RAZOR \
+ SPF_QUERY RELAY_COUNTRY DCC IPV6
+OPTIONS_DEFAULT= AS_ROOT DKIM SSL GNUPG RAZOR
-OPTIONS_DEFINE= AS_ROOT SPAMC SACOMPILE DKIM SSL GNUPG MYSQL PGSQL RAZOR \
- SPF_QUERY RELAY_COUNTRY DCC IPV6
-OPTIONS_DEFAULT= AS_ROOT SPAMC DKIM SSL GNUPG RAZOR
AS_ROOT_DESC= Run spamd as root (recommended)
-SPAMC_DESC= Build spamd/spamc (not for amavisd)
-SACOMPILE_DESC= sa-compile
-DKIM_DESC= DKIM/DomainKeys Identified Mail
-SSL_DESC= Build with SSL support for spamd/spamc
-GNUPG_DESC= Install GnuPG (for sa-update)
-RAZOR_DESC= Add Vipul's Razor support
-SPF_QUERY_DESC= Add SPF query support
+DCC_DESC= Add DCC support (see LICENSE)
+DKIM_DESC= DKIM/DomainKeys Identified Mail
+GNUPG_DESC= Install GnuPG (for sa-update, optional)
+IPV6_DESC= IPv6 sockets support
+RAZOR_DESC= Add Vipul's Razor support
RELAY_COUNTRY_DESC= Relay country support
-DCC_DESC= Add DCC support (see LICENSE)
-IPV6_DESC= IPv6 sockets support
+SACOMPILE_DESC= Compile rulesets (improves speed)
+SPF_QUERY_DESC= Add SPF query support
+SSL_DESC= Build spamd/spamc with SSL support
-SUB_FILES= pkg-install
+SUB_FILES= pkg-install pkg-message
SUB_LIST= USER=${USERS} GROUP=${GROUPS} INSTALL="${INSTALL}"
+PLIST_SUB+= USER=${USERS} GROUP=${GROUPS}
+OPTIONS_SUB=yes
-.include <bsd.port.options.mk>
+DCC_RUN_DEPENDS= dcc-dccd>=1.3.111:${PORTSDIR}/mail/dcc-dccd
+DKIM_RUN_DEPENDS= p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
+ p5-Mail-DKIM>=0.37:${PORTSDIR}/mail/p5-Mail-DKIM \
+ p5-Crypt-OpenSSL-RSA>=0.26_1:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA
+GNUPG_RUN_DEPENDS= gnupg1>=1.4.7:${PORTSDIR}/security/gnupg1
+IPV6_RUN_DEPENDS= p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
+MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+PGSQL_RUN_DEPENDS= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+RAZOR_RUN_DEPENDS= razor-agents>=2.84:${PORTSDIR}/mail/razor-agents
+RELAY_COUNTRY_RUN_DEPENDS= p5-IP-Country>=0:${PORTSDIR}/net/p5-IP-Country
+SACOMPILE_RUN_DEPENDS= re2c>=.12.0:${PORTSDIR}/devel/re2c
+SPF_QUERY_RUN_DEPENDS= p5-Mail-SPF>=0:${PORTSDIR}/mail/p5-Mail-SPF
+
+SSL_USE= OPENSSL=yes
+SSL_RUN_DEPENDS= p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
+SSL_CONFIGURE_ON= ENABLE_SSL=yes
+SSL_CONFIGURE_OFF= ENABLE_SSL=no
-.if ${PORT_OPTIONS:MSSL}
-USE_OPENSSL= yes
-.endif
+DOCS= CREDITS Changes INSTALL NOTICE PACKAGING README TRADEMARK UPGRADE USAGE procmailrc.example
+DOCSSQL= README README.awl README.bayes awl_mysql.sql awl_pg.sql bayes_mysql.sql bayes_pg.sql userpref_mysql.sql userpref_pg.sql
+DOCSLDAP= README README.testing sa_test.ldif
+PORTDOCS= ${DOCS} sql ldap
-.if ${PORT_OPTIONS:MSPAMC}
-CONFIGURE_ARGS+= BUILD_SPAMC=yes
-.else
-CONFIGURE_ARGS+= BUILD_SPAMC=no
-WITH_AS_ROOT=
-WITHOUT_SSL=1
-.endif
+USE_RC_SUBR= sa-spamd
-.if ${PORT_OPTIONS:MSPF_QUERY}
-RUN_DEPENDS+= p5-Mail-SPF>=0:${PORTSDIR}/mail/p5-Mail-SPF
-.endif
-.if ${PORT_OPTIONS:MIPV6}
-RUN_DEPENDS+= p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
-.endif
+.include <bsd.port.pre.mk>
.if ${PORT_OPTIONS:MSSL}
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-RUN_DEPENDS+= p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
CFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
-CONFIGURE_ARGS+= ENABLE_SSL=yes
-PLIST_SUB+= SSL=""
-.else
-CONFIGURE_ARGS+= ENABLE_SSL=no
-PLIST_SUB+= SSL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGNUPG}
-RUN_DEPENDS+= gnupg1>=1.4.7:${PORTSDIR}/security/gnupg1
.endif
-.if ${PORT_OPTIONS:MMYSQL}
-RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MRAZOR}
-RUN_DEPENDS+= razor-agents>=2.84:${PORTSDIR}/mail/razor-agents
-.else
-.endif
-
-.if ${PORT_OPTIONS:MDKIM}
-RUN_DEPENDS+= p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
-RUN_DEPENDS+= p5-Mail-DKIM>=0.37:${PORTSDIR}/mail/p5-Mail-DKIM
-RUN_DEPENDS+= p5-Crypt-OpenSSL-RSA>=0.26_1:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA
-.endif
-
-.if ${PORT_OPTIONS:MSACOMPILE}
-RUN_DEPENDS+= re2c>=.12.0:${PORTSDIR}/devel/re2c
-.endif
-
-.if ${PORT_OPTIONS:MRELAY_COUNTRY}
-RUN_DEPENDS+= p5-IP-Country>=0:${PORTSDIR}/net/p5-IP-Country
-.endif
-
-.if ${PORT_OPTIONS:MDCC}
-RUN_DEPENDS+= dcc-dccd>=1.3.111:${PORTSDIR}/mail/dcc-dccd
-.endif
-
-DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-DATADIR= ${PREFIX}/share/spamassassin
-DOCS= CREDITS Changes INSTALL NOTICE PACKAGING README TRADEMARK UPGRADE USAGE procmailrc.example
-DOCSSQL= README README.awl README.bayes awl_mysql.sql awl_pg.sql bayes_mysql.sql bayes_pg.sql userpref_mysql.sql userpref_pg.sql
-DOCSLDAP= README README.testing sa_test.ldif
-PORTDOCS= ${DOCS} sql ldap
-
-USE_RC_SUBR= sa-spamd
-
.if ${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MPGSQL}
SUB_LIST+= SQL_FLAG="-Q"
.else
SUB_LIST+= SQL_FLAG=""
.endif
-.if ! ${PORT_OPTIONS:MAS_ROOT}
+
+.if empty(PORT_OPTIONS:MAS_ROOT)
SUB_LIST+= RUN_AS_USER="-u ${USERS} -H /var/spool/spamd"
.else
SUB_LIST+= RUN_AS_USER=""
@@ -153,6 +114,7 @@ post-patch::
-e 's#B_CONFDIR)/v312.pre#B_CONFDIR)/v312.pre.sample#g' \
-e 's#B_CONFDIR)/v320.pre#B_CONFDIR)/v320.pre.sample#g' \
-e 's#B_CONFDIR)/v330.pre#B_CONFDIR)/v330.pre.sample#g' \
+ -e 's#B_CONFDIR)/v340.pre#B_CONFDIR)/v340.pre.sample#g' \
-e 's/require DBI/0/' \
${WRKSRC}/Makefile.PL
@${REINPLACE_CMD} -e '/^CC =/d; \
@@ -164,10 +126,10 @@ post-patch::
.if ${PORT_OPTIONS:MRELAY_COUNTRY}
${REINPLACE_CMD} -e '/RelayCountry/s/^# ?loadplugin/loadplugin/' ${WRKSRC}/rules/init.pre
.endif
-.if ! ${PORT_OPTIONS:MDKIM}
+.if empty(PORT_OPTIONS:MDKIM)
${REINPLACE_CMD} -e '/DKIM/s/^loadplugin/#loadplugin/' ${WRKSRC}/rules/v312.pre
.endif
-.if ! ${PORT_OPTIONS:MSPF_QUERY}
+.if empty(PORT_OPTIONS:MSPF_QUERY)
${REINPLACE_CMD} -e '/SPF/s/^loadplugin/#loadplugin/' ${WRKSRC}/rules/init.pre
.endif
.if ${PORT_OPTIONS:MDCC}
@@ -178,31 +140,27 @@ post-patch::
.endif
post-build:
- @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} spamc/libspamc.so)
+ (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} spamc/libspamc.so)
.if ${PORT_OPTIONS:MSSL}
- @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} spamc/libsslspamc.so)
+ (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} spamc/libsslspamc.so)
.endif
pre-su-install:
@${MKDIR} ${STAGEDIR}${DATADIR}
- @${INSTALL_PROGRAM} ${WRKSRC}/spamc/libspamc.so ${STAGEDIR}${PREFIX}/lib/libspamc.so.0
+ ${INSTALL_LIB} ${WRKSRC}/spamc/libspamc.so ${STAGEDIR}${PREFIX}/lib/libspamc.so.0
@${LN} -sf libspamc.so.0 ${STAGEDIR}${PREFIX}/lib/libspamc.so
.if ${PORT_OPTIONS:MSSL}
- @${INSTALL_PROGRAM} ${WRKSRC}/spamc/libsslspamc.so ${STAGEDIR}${PREFIX}/lib/libsslspamc.so.0
- @${LN} -sf libsslspamc.so.0 ${STAGEDIR}${PREFIX}/lib/libsslspamc.so
+ ${INSTALL_LIB} ${WRKSRC}/spamc/libsslspamc.so ${STAGEDIR}${PREFIX}/lib/libsslspamc.so.0
+ ${LN} -sf libsslspamc.so.0 ${STAGEDIR}${PREFIX}/lib/libsslspamc.so
.endif
- @${INSTALL_DATA} ${WRKSRC}/spamc/libspamc.h ${STAGEDIR}${PREFIX}/include
+ ${INSTALL_DATA} ${WRKSRC}/spamc/libspamc.h ${STAGEDIR}${PREFIX}/include
post-install::
-.if ${PORT_OPTIONS:MSPAMC}
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spamc
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spamc
+ @${MKDIR} ${STAGEDIR}/var/lib/spamassassin ${STAGEDIR}${DBDIR}/spamassassin
@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/sql ${STAGEDIR}${DOCSDIR}/ldap
- @${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
- @${INSTALL_DATA} ${DOCSSQL:S|^|${WRKSRC}/sql/|} ${STAGEDIR}${DOCSDIR}/sql
- @${INSTALL_DATA} ${DOCSLDAP:S|^|${WRKSRC}/ldap/|} ${STAGEDIR}${DOCSDIR}/ldap
-.endif
+ ${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/sql/* ${STAGEDIR}${DOCSDIR}/sql
+ ${INSTALL_DATA} ${WRKSRC}/ldap/* ${STAGEDIR}${DOCSDIR}/ldap
.include <bsd.port.post.mk>
Modified: head/mail/p5-Mail-SpamAssassin/distinfo
==============================================================================
--- head/mail/p5-Mail-SpamAssassin/distinfo Sun Mar 9 15:28:37 2014 (r347652)
+++ head/mail/p5-Mail-SpamAssassin/distinfo Sun Mar 9 15:54:52 2014 (r347653)
@@ -1,2 +1,2 @@
-SHA256 (Mail-SpamAssassin-3.3.2.tar.gz) = 5323038939a0ef9fc97d5264defce3ae1d95e98b3a94c4c3b583341c927f32df
-SIZE (Mail-SpamAssassin-3.3.2.tar.gz) = 1208182
+SHA256 (Mail-SpamAssassin-3.4.0.tar.gz) = 244914c30976844878a7f129fd503eb40986c68a3800f416c3a68b14507c0a64
+SIZE (Mail-SpamAssassin-3.4.0.tar.gz) = 1269753
Copied and modified: head/mail/p5-Mail-SpamAssassin/files/pkg-message.in (from r346955, head/mail/p5-Mail-SpamAssassin/pkg-message)
==============================================================================
--- head/mail/p5-Mail-SpamAssassin/pkg-message Mon Mar 3 19:02:30 2014 (r346955, copy source)
+++ head/mail/p5-Mail-SpamAssassin/files/pkg-message.in Sun Mar 9 15:54:52 2014 (r347653)
@@ -1,39 +1,26 @@
-*************************************************************************
-* _ _____ _____ _____ _ _ _____ ___ ___ _ _ *
-* / \|_ _|_ _| ____| \ | |_ _|_ _/ _ \| \ | | *
-* / _ \ | | | | | _| | \| | | | | | | | | \| | *
-* / ___ \| | | | | |___| |\ | | | | | |_| | |\ | *
-* /_/ \_\_| |_| |_____|_| \_| |_| |___\___/|_| \_| *
-* *
-* See PREFIX/share/doc/p5-Mail-SpamAssassin/INSTALL, *
-* and PREFIX/share/doc/p5-Mail-SpamAssassin/UPGRADE, *
-* or http://spamassassin.org/dist/INSTALL and *
-* http://spamassassin.org/dist/UPGRADE BEFORE enabling *
-* this version of SpamAssassin for important information *
-* regarding changes in this version. *
-* *
-* SpamAssassin may require additional configuration in *
-* PREFIX/etc/mail/spamassassin/init.pre depending on *
-* the options you have installed. Otherwise, annoying *
-* (but harmless) error messages may result. Read the *
-* files listed above. *
-* *
-*************************************************************************
-You may wish to run sa-update now to obtain the latest rules.
+==========================================================================
-NOTE: FREEBSD users: If you are updating from a version prior to 3.20.
-sa-update now places state files in /var/db/spamassassin and not
-/var/lib/spamassassin. This is to be consistant with FreeBSD file
-directory conventions.
+You should complete the following post-installation tasks:
-If you run sa-compile, you will notice that files are in
-/var/db/spamassassin/compiled/<perlversion>/<version> instead of
-/var/db/spamassassin/compiled/<version>.
-No attempts have been made to move old versions over. You must recompile.
-
-If you are running with spamd, you must add the following to rc.conf:
-spamd_enable="YES"
-
-Security Note: If you did NOT deselect AS_ROOT, spamd will be running
-as root. To change this, also add this to rc.conf:
+ 1) Read %%DOCSDIR%%/INSTALL
+ and %%DOCSDIR%%/UPGRADE
+ BEFORE enabling SpamAssassin for important changes
+
+ 2) Edit the configuration in %%ETCDIR%%,
+ in particular %%ETCDIR%%/init.pre
+ You may get lots of annoying (but harmless) error messages
+ if you skip this step.
+
+ 3) Run 'sa-update' to obtain the latest rules.
+ Then, run 'sa-compile' for a big speed boost (if you
+ enabled SA_COMPILE)
+
+ 4) To run spamd, add the following to /etc/rc.conf:
+ spamd_enable="YES"
+
+SECURITY NOTE:
+Unless you deselected the default AS_ROOT, spamd will be running
+as root. If you wish to change this, add the following to /etc/rc.conf:
spamd_flags="-u spamd -H /var/spool/spamd"
+
+==========================================================================
Modified: head/mail/p5-Mail-SpamAssassin/pkg-descr
==============================================================================
--- head/mail/p5-Mail-SpamAssassin/pkg-descr Sun Mar 9 15:28:37 2014 (r347652)
+++ head/mail/p5-Mail-SpamAssassin/pkg-descr Sun Mar 9 15:54:52 2014 (r347653)
@@ -11,4 +11,4 @@ filtering using the user's own mail user
Additional drop-in rule sets are available at
http://wiki.apache.org/spamassassin/CustomRulesets
-WWW: http://spamassassin.apache.org/
+WWW: http://spamassassin.apache.org/
Modified: head/mail/p5-Mail-SpamAssassin/pkg-plist
==============================================================================
--- head/mail/p5-Mail-SpamAssassin/pkg-plist Sun Mar 9 15:28:37 2014 (r347652)
+++ head/mail/p5-Mail-SpamAssassin/pkg-plist Sun Mar 9 15:54:52 2014 (r347653)
@@ -7,23 +7,26 @@ bin/sa-update
bin/spamassassin
bin/spamc
bin/spamd
- at unexec rm -rf %D/etc/mail/spamassassin/sa-update-keys
-etc/mail/spamassassin/local.cf.sample
+ at unexec rm -rf %D/%%ETCDIR%%/sa-update-keys
+%%ETCDIR%%/local.cf.sample
@unexec if cmp -s %B/init.pre.sample %B/init.pre; then rm -f %B/init.pre; fi
-etc/mail/spamassassin/init.pre.sample
+%%ETCDIR%%/init.pre.sample
@exec [ -f %B/init.pre ] || cp %B/%f %B/init.pre
@unexec if cmp -s %B/v310.pre.sample %B/v310.pre; then rm -f %B/v310.pre; fi
-etc/mail/spamassassin/v310.pre.sample
+%%ETCDIR%%/v310.pre.sample
@exec [ -f %B/v310.pre ] || cp %B/%f %B/v310.pre
@unexec if cmp -s %B/v312.pre.sample %B/v312.pre; then rm -f %B/v312.pre; fi
-etc/mail/spamassassin/v312.pre.sample
+%%ETCDIR%%/v312.pre.sample
@exec [ -f %B/v312.pre ] || cp %B/%f %B/v312.pre
@unexec if cmp -s %B/v320.pre.sample %B/v320.pre; then rm -f %B/v320.pre; fi
-etc/mail/spamassassin/v320.pre.sample
+%%ETCDIR%%/v320.pre.sample
@exec [ -f %B/v320.pre ] || cp %B/%f %B/v320.pre
@unexec if cmp -s %B/v330.pre.sample %B/v330.pre; then rm -f %B/v330.pre;fi
-etc/mail/spamassassin/v330.pre.sample
+%%ETCDIR%%/v330.pre.sample
@exec [ -f %B/v330.pre ] || cp %B/%f %B/v330.pre
+ at unexec if cmp -s %B/v340.pre.sample %B/v340.pre; then rm -f %B/v340.pre;fi
+%%ETCDIR%%/v340.pre.sample
+ at exec [ -f %B/v340.pre ] || cp %B/%f %B/v340.pre
include/libspamc.h
lib/libspamc.so
lib/libspamc.so.0
@@ -39,6 +42,7 @@ lib/libspamc.so.0
%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore::BDB.3.gz
%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore::MySQL.3.gz
%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore::PgSQL.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore::Redis.3.gz
%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore::SQL.3.gz
%%PERL5_MAN3%%/Mail::SpamAssassin::Client.3.gz
%%PERL5_MAN3%%/Mail::SpamAssassin::Conf.3.gz
@@ -61,12 +65,14 @@ lib/libspamc.so.0
%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::AWL.3.gz
%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::AccessDB.3.gz
%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::AntiVirus.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::AskDNS.3.gz
%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::AutoLearnThreshold.3.gz
%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Bayes.3.gz
%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::BodyRuleBaseExtractor.3.gz
%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Check.3.gz
%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::DCC.3.gz
%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::DKIM.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::DNSEval.3.gz
%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Hashcash.3.gz
%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::MIMEHeader.3.gz
%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::OneLineBodyRuleType.3.gz
@@ -116,6 +122,7 @@ man/man1/spamd.1.gz
%%SITE_PERL%%/Mail/SpamAssassin/BayesStore/DBM.pm
%%SITE_PERL%%/Mail/SpamAssassin/BayesStore/MySQL.pm
%%SITE_PERL%%/Mail/SpamAssassin/BayesStore/PgSQL.pm
+%%SITE_PERL%%/Mail/SpamAssassin/BayesStore/Redis.pm
%%SITE_PERL%%/Mail/SpamAssassin/BayesStore/SDBM.pm
%%SITE_PERL%%/Mail/SpamAssassin/BayesStore/SQL.pm
%%SITE_PERL%%/Mail/SpamAssassin/Client.pm
@@ -151,6 +158,7 @@ man/man1/spamd.1.gz
%%SITE_PERL%%/Mail/SpamAssassin/Plugin/AWL.pm
%%SITE_PERL%%/Mail/SpamAssassin/Plugin/AccessDB.pm
%%SITE_PERL%%/Mail/SpamAssassin/Plugin/AntiVirus.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/AskDNS.pm
%%SITE_PERL%%/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm
%%SITE_PERL%%/Mail/SpamAssassin/Plugin/Bayes.pm
%%SITE_PERL%%/Mail/SpamAssassin/Plugin/BodyEval.pm
@@ -199,15 +207,12 @@ man/man1/spamd.1.gz
%%SITE_PERL%%/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
%%SITE_PERL%%/Mail/SpamAssassin/Util/ScopedTimer.pm
%%SITE_PERL%%/Mail/SpamAssassin/Util/TieOneStringHash.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Util/TinyRedis.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin/.packlist
%%SITE_PERL%%/spamassassin-run.pod
%%DATADIR%%/languages
%%DATADIR%%/sa-update-pubkey.txt
%%DATADIR%%/user_prefs.template
- at unexec rm -rf /var/lib/spamassassin/2*
- at unexec rmdir /var/lib/spamassassin 2>/dev/null || true
- at unexec rmdir /var/lib 2>/dev/null || true
- at unexec rmdir /var/db/spamassassin 2>/dev/null || true
@dirrm %%DATADIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
@@ -222,7 +227,13 @@ man/man1/spamd.1.gz
@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Bayes
@dirrm %%SITE_PERL%%/Mail/SpamAssassin
@dirrmtry %%SITE_PERL%%/Mail
- at dirrmtry etc/mail/spamassassin
+ at dirrmtry %%ETCDIR%%
@dirrmtry etc/mail
@unexec rm -rf /var/run/spamd
- at unexec rm -rf /var/spool/spamd
+ at unexec rm -rf /var/lib/spamassassin/2*
+ at dirrmtry /var/lib/spamassassin
+ at dirrmtry /var/lib
+ at dirrmtry /var/db/spamassassin
+ at unexec [ -d /var/db/spamassassin ] && echo "If you are no longer using SpamAssassin, remove /var/db/spamassassin"
+ at unexec pw usershow "%%USER%%" 2>/dev/null 1>&2 && echo "To delete %%USER%% permanently, 'rmuser %%USER%%'"
+ at unexec pw usershow "%%USER%%" 2>/dev/null 1>&2 && [ -d /var/spool/spamd ] && echo " Note that this will remove /var/spool/spamd"
More information about the svn-ports-head
mailing list