diff options
| -rw-r--r-- | mail/p5-Mail-SpamAssassin/Makefile | 2 | ||||
| -rw-r--r-- | mail/p5-Mail-SpamAssassin/files/patch-bug6698 | 2 | ||||
| -rw-r--r-- | mail/p5-Mail-SpamAssassin/pkg-plist | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile index 03d2e356de74..6f23773f59ec 100644 --- a/mail/p5-Mail-SpamAssassin/Makefile +++ b/mail/p5-Mail-SpamAssassin/Makefile @@ -7,7 +7,7 @@ PORTNAME= Mail-SpamAssassin PORTVERSION= 3.3.2 -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 diff --git a/mail/p5-Mail-SpamAssassin/files/patch-bug6698 b/mail/p5-Mail-SpamAssassin/files/patch-bug6698 index 4df2383b16fc..36bab4875e63 100644 --- a/mail/p5-Mail-SpamAssassin/files/patch-bug6698 +++ b/mail/p5-Mail-SpamAssassin/files/patch-bug6698 @@ -1060,7 +1060,7 @@ + } + if ($tag eq "dcc:") { + # query instead of report if there is an X-DCC header from upstream -+ unshift(@opts, '-Q', 'many') if defined $permsgstatus->{dcc_raw_x_dcc}; ++ unshift(@opts, '-Q') if defined $permsgstatus->{dcc_raw_x_dcc}; + } else { + # learn or report spam + unshift(@opts, '-t', 'many'); diff --git a/mail/p5-Mail-SpamAssassin/pkg-plist b/mail/p5-Mail-SpamAssassin/pkg-plist index ba54cd6073ce..4683e75c491a 100644 --- a/mail/p5-Mail-SpamAssassin/pkg-plist +++ b/mail/p5-Mail-SpamAssassin/pkg-plist @@ -7,7 +7,7 @@ bin/sa-update bin/spamassassin bin/spamc bin/spamd -@unexec rm -rf %D/etc/mail/spamassassin/sa-update-keys || true +@unexec rm -rf %D/etc/mail/spamassassin/sa-update-keys etc/mail/spamassassin/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 @@ -130,7 +130,7 @@ lib/libspamc.so.0 %%DATADIR%%/languages %%DATADIR%%/sa-update-pubkey.txt %%DATADIR%%/user_prefs.template -@unexec rm -rf /var/lib/spamassassin/2* || true +@unexec rm -rf /var/lib/spamassassin/2* @unexec rmdir /var/lib/spamassassin 2>/dev/null || true @unexec rmdir /var/lib 2>/dev/null || true @unexec rmdir /var/db/spamassassin 2>/dev/null || true @@ -150,4 +150,4 @@ lib/libspamc.so.0 @dirrmtry %%SITE_PERL%%/Mail @dirrmtry etc/mail/spamassassin @dirrmtry etc/mail -@unexec rm -rf /var/run/spamd || true +@unexec rm -rf /var/run/spamd |