- Update to 3.1.8

- submitter now become maintainer
- Changes
  http://svn.apache.org/repos/asf/spamassassin/branches/3.1/Changes

PR:		ports/109186
Submitted by:	maintainer (Michael Scheidell)

5 files changed, 5 insertions, 105 deletions

diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index e43b8b442fd2..9ca507ebaab3 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	Mail-SpamAssassin
-PORTVERSION=	3.1.7
-PORTREVISION=	3
+PORTVERSION=	3.1.8
 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
 
-MAINTAINER=	perl@FreeBSD.org
+MAINTAINER=	scheidell@secnap.net
 COMMENT=	A highly efficient mail filter for identifying spam
 
 BUILD_DEPENDS=	p5-Net-DNS>=0.53:${PORTSDIR}/dns/p5-Net-DNS \
diff --git a/mail/p5-Mail-SpamAssassin/distinfo b/mail/p5-Mail-SpamAssassin/distinfo
index ea3c4d26640b..8cfba1d78c61 100644
--- a/mail/p5-Mail-SpamAssassin/distinfo
+++ b/mail/p5-Mail-SpamAssassin/distinfo
@@ -1,3 +1,3 @@
-MD5 (Mail-SpamAssassin-3.1.7.tar.gz) = 4b342c63949d47f3ce56b3fc1c8881c1
-SHA256 (Mail-SpamAssassin-3.1.7.tar.gz) = be6fd341fb35ba5efb2784318e9772bde65b7115eed18ab8dcd791a471fcef39
-SIZE (Mail-SpamAssassin-3.1.7.tar.gz) = 1168183
+MD5 (Mail-SpamAssassin-3.1.8.tar.gz) = 20a3a6b651a89dcc70634715ca833996
+SHA256 (Mail-SpamAssassin-3.1.8.tar.gz) = 01e5b0d78969cfb0580efb14a7a7212ed3af9f382829afcd61b97a91938831dd
+SIZE (Mail-SpamAssassin-3.1.8.tar.gz) = 1173847
diff --git a/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin-SpamdForkScaling.pm b/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin-SpamdForkScaling.pm
deleted file mode 100644
index 8a1568924774..000000000000
--- a/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin-SpamdForkScaling.pm
+++ /dev/null
@@ -1,53 +0,0 @@
---- lib/Mail/SpamAssassin/SpamdForkScaling.pm.orig	Wed Oct  4 22:01:16 2006
-+++ lib/Mail/SpamAssassin/SpamdForkScaling.pm	Tue Nov  7 11:15:29 2006
-@@ -426,7 +426,13 @@
-     dbg("prefork: ordered $kid to accept");
- 
-     # now wait for it to say it's done that
--    return $self->wait_for_child_to_accept($sock);
-+    my $ret = $self->wait_for_child_to_accept($kid, $sock);
-+    if ($ret) {
-+      return $ret;
-+    } else {
-+      # retry with another child
-+      return $self->order_idle_child_to_accept();
-+    }
- 
-   }
-   else {
-@@ -436,10 +442,11 @@
- }
- 
- sub wait_for_child_to_accept {
--  my ($self, $sock) = @_;
-+  my ($self, $kid, $sock) = @_;
- 
-   while (1) {
-     my $state = $self->read_one_message_from_child_socket($sock);
-+
-     if ($state == PFSTATE_BUSY) {
-       return 1;     # 1 == success
-     }
-@@ -447,7 +454,12 @@
-       return undef;
-     }
-     else {
--      die "prefork: ordered child to accept, but child reported state '$state'";
-+      warn "prefork: ordered child $kid to accept, but they reported state '$state', killing rogue";
-+      $self->child_error_kill($kid, $sock);
-+      $self->adapt_num_children();
-+      sleep 1;
-+
-+      return undef;
-     }
-   }
- }
-@@ -479,6 +491,8 @@
- 
- sub update_child_status_busy {
-   my ($self) = @_;
-+
-+# if (rand 4 < 1) { $self->report_backchannel_socket("I".pack("N",$self->{pid})."\n");return; warn "TEST for bug 4594"; die; }
-   # "B  b1 b2 b3 b4 \n "
-   $self->report_backchannel_socket("B".pack("N",$self->{pid})."\n");
- }
diff --git a/mail/p5-Mail-SpamAssassin/files/patch-sa-learn.raw b/mail/p5-Mail-SpamAssassin/files/patch-sa-learn.raw
deleted file mode 100644
index 13af04ed27d5..000000000000
--- a/mail/p5-Mail-SpamAssassin/files/patch-sa-learn.raw
+++ /dev/null
@@ -1,27 +0,0 @@
---- sa-learn.raw.ORIG	Tue Jul 25 15:02:20 2006
-+++ sa-learn.raw	Wed Aug 23 09:10:14 2006
-@@ -109,6 +109,7 @@ GetOptions(
-   'local|L'              => \$opt{'local'},
-   'no-sync|nosync'       => \$opt{'nosync'},
-   'showdots'             => \$opt{'showdots'},
-+  'quiet|q'              => \$opt{'quiet'},
-   'progress'             => \$opt{'progress'},
-   'use-ignores'          => \$opt{'use-ignores'},
-   'no-rebuild|norebuild' => sub { $opt{'nosync'} = 1; warn "The --no-rebuild option has been deprecated.  Please use --no-sync instead.\n" },
-@@ -414,7 +415,7 @@ eval {
-   $progress->final() if ($opt{progress} && $progress);
- 
-   my $phrase = defined $forget ? "Forgot" : "Learned";
--  print "$phrase tokens from $learnedcount message(s) ($messagecount message(s) examined)\n";
-+  print "$phrase tokens from $learnedcount message(s) ($messagecount message(s) examined)\n" if (!$opt{quiet});
- 
-   # If we needed to make a tempfile, go delete it.
-   if ( defined $tempfile ) {
-@@ -576,6 +577,7 @@ Options:
-  -C path, --configpath=path, --config-file=path   Path to standard configuration dir
-  -p prefs, --prefspath=file, --prefs-file=file    Set user preferences file
-  --siteconfigpath=path             Path for site configs (def: /etc/mail/spamassassin)
-+ -q, --quiet                       Reduce amount of information printed out
-  -D, --debug-level                 Print debugging messages
-  -V, --version                     Print version
-  -h, --help                        Print usage message
diff --git a/mail/p5-Mail-SpamAssassin/files/patch-spamassassin.raw b/mail/p5-Mail-SpamAssassin/files/patch-spamassassin.raw
deleted file mode 100644
index b1d22c8948a0..000000000000
--- a/mail/p5-Mail-SpamAssassin/files/patch-spamassassin.raw
+++ /dev/null
@@ -1,19 +0,0 @@
---- spamassassin.raw.orig	Tue Jul 25 15:02:20 2006
-+++ spamassassin.raw	Wed Aug 23 09:03:48 2006
-@@ -181,6 +181,7 @@ GetOptions(
-   'mbox'                                    => sub { $opt{'format'} = 'mbox'; },
-   'mbx'                                     => sub { $opt{'format'} = 'mbx'; },
-   'prefspath|prefs-file|p=s'                => \$opt{'prefspath'},
-+  'quiet'                                   => \$opt{'quiet'},
-   'remove-addr-from-whitelist=s'            => \$opt{'remove-addr-from-whitelist'},
-   'remove-from-whitelist|R'                 => \$opt{'remove-from-whitelist'},
-   'remove-markup|despamassassinify|d'       => \$opt{'remove-markup'},
-@@ -351,7 +352,7 @@ if ( defined $tempfile ) {
- # Let folks know how many messages were handled, as long as the handling
- # didn't produce output (ala: check, test, or remove_markup ...)
- if ( $opt{'report'} || $opt{'revoke'} || $doing_whitelist_operation ) {
--  print "$count message(s) examined.\n";
-+  print "$count message(s) examined.\n" unless $opt{'quiet'};
- }
- 
- # if the eval died from something, report it here and return an error.