ports/74540: Update port - mail/spampd to 2.20
Linh Pham
question+fbsdports at closedsrc.org
Tue Nov 30 00:50:31 UTC 2004
>Number: 74540
>Category: ports
>Synopsis: Update port - mail/spampd to 2.20
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 30 00:50:25 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Linh Pham
>Release: FreeBSD 5.2.1-RELEASE-p11 i386
>Organization:
>Environment:
System: FreeBSD q.internal.closedsrc.org 5.2.1-RELEASE-p11 FreeBSD 5.2.1-RELEASE-p11 #3: Thu Oct 14 23:10:30 PDT 2004 question at q.internal.closedsrc.org:/usr/obj/usr/src/sys/Q i386
>Description:
Update the port from 2.12 to 2.20. spampd 2.20 includes support for
SpamAssassin 3.0.x within the script, so patch-2to3 is no longer
needed. I've updated patch-setsid for the new version.
>How-To-Repeat:
>Fix:
--- spampd-2.20.diff begins here ---
diff -ruN /usr/ports/mail/spampd/Makefile spampd/Makefile
--- /usr/ports/mail/spampd/Makefile Wed Nov 10 19:09:59 2004
+++ spampd/Makefile Mon Nov 29 16:21:44 2004
@@ -6,8 +6,7 @@
#
PORTNAME= spampd
-PORTVERSION= 2.12
-PORTREVISION= 1
+PORTVERSION= 2.20
CATEGORIES= mail perl5
MASTER_SITES= http://www.worlddesign.com/Content/rd/mta/spampd/
diff -ruN /usr/ports/mail/spampd/distinfo spampd/distinfo
--- /usr/ports/mail/spampd/distinfo Thu Apr 8 01:00:34 2004
+++ spampd/distinfo Mon Nov 29 16:21:34 2004
@@ -1,2 +1,2 @@
-MD5 (spampd-2.12.tar.gz) = cf4d5959500053c83ac230cd27fd8dd1
-SIZE (spampd-2.12.tar.gz) = 21862
+MD5 (spampd-2.20.tar.gz) = 4efdb66e424bc24f8a7ce3bf6264ce31
+SIZE (spampd-2.20.tar.gz) = 22713
diff -ruN /usr/ports/mail/spampd/files/patch-2to3 spampd/files/patch-2to3
--- /usr/ports/mail/spampd/files/patch-2to3 Wed Nov 3 02:43:32 2004
+++ spampd/files/patch-2to3 Wed Dec 31 16:00:00 1969
@@ -1,63 +0,0 @@
---- spampd.orig Tue May 11 09:52:42 2004
-+++ spampd Mon Oct 4 15:06:57 2004
-@@ -395,7 +395,6 @@
- use IO::File;
- use Getopt::Long;
- use Mail::SpamAssassin;
--use Mail::SpamAssassin::NoMailAudit;
-
- BEGIN {
- # Load Time::HiRes if it's available
-@@ -464,8 +463,7 @@
- my $previous_alarm = alarm($self->{spampd}->{satimeout});
-
- # Audit the message
-- my $mail = Mail::SpamAssassin::NoMailAudit->new (
-- data => \@msglines );
-+ my $mail = $assassin->parse( \@msglines );
-
- # Check spamminess
- my $status = $assassin->check($mail);
-@@ -475,11 +473,12 @@
-
- my $addingHeader = 0;
- if ( $self->{spampd}->{addheader} && length($self->{spampd}->{myhostname}) ) {
-- $mail->put_header("X-Spam-Checked-By", $self->{spampd}->{myhostname});
-+ $mail->put_metadata("X-Spam-Checked-By", $self->{spampd}->{myhostname});
- $addingHeader = 1;
- }
-
- # Rewrite mail if high spam factor or options --tagall or --add-sc-header
-+ my $msg_resp = '';
- if ( $status->is_spam || $self->{spampd}->{tagall} || $addingHeader ) {
-
- # if spam or --tagall, have SA put in its report/headers.
-@@ -487,12 +486,14 @@
- if ( $self->{spampd}->{debug} ) {
- $self->log(2, "Rewriting mail using SpamAssassin"); }
-
-- $status->rewrite_mail;
-+ $msg_resp = $status->rewrite_mail;
-
-- }
-+ } else {
-
-- my $msg_resp = join '', $mail->header, "\r\n", @{$mail->body};
-+ $msg_resp = join '', $mail->get_pristine_header(), "\r\n", @{$mail->get_body()};
-+ }
- my @resplines = split(/\r?\n/, $msg_resp);
-+
-
- # Build the new message to relay
- # pause the timeout alarm while we do this (no point in timing
-@@ -513,8 +514,8 @@
- # Log what we did
- my $was_it_spam = 'clean message';
- if ($status->is_spam) { $was_it_spam = 'identified spam'; }
-- my $msg_score = sprintf("%.2f",$status->get_hits);
-- my $msg_threshold = sprintf("%.2f",$status->get_required_hits);
-+ my $msg_score = sprintf("%.2f",$status->get_score);
-+ my $msg_threshold = sprintf("%.2f",$status->get_required_score);
- my $proc_time = sprintf("%.2f", time - $start);
-
- $self->log(2, "$was_it_spam $msgid ($msg_score/$msg_threshold) for ".
\ No newline at end of file
diff -ruN /usr/ports/mail/spampd/files/patch-setsid spampd/files/patch-setsid
--- /usr/ports/mail/spampd/files/patch-setsid Thu Apr 8 01:00:34 2004
+++ spampd/files/patch-setsid Mon Nov 29 16:35:25 2004
@@ -1,19 +1,11 @@
-*** spampd.orig Wed Apr 7 14:32:09 2004
---- spampd Wed Apr 7 14:32:17 2004
-*************** my $server = bless {
-*** 831,837 ****
- syslog_ident => 'spampd',
- syslog_facility => 'mail',
- background => 1,
-! # setsid => 1,
- pid_file => $pidfile,
- user => $user,
- group => $group,
---- 831,837 ----
- syslog_ident => 'spampd',
- syslog_facility => 'mail',
- background => 1,
-! setsid => 1,
- pid_file => $pidfile,
- user => $user,
- group => $group,
+--- spampd.orig Mon Nov 29 16:34:40 2004
++++ spampd Mon Nov 29 16:34:50 2004
+@@ -825,7 +825,7 @@
+ syslog_ident => 'spampd',
+ syslog_facility => 'mail',
+ background => $background,
+- # setsid => 1,
++ setsid => 1,
+ pid_file => $pidfile,
+ user => $user,
+ group => $group,
--- spampd-2.20.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list