sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 2.20

Browse source 
PR:		ports/74540
Submitted by:	maintainer
This commit is contained in:
Sergey Matveychuk 2004-12-06 13:59:54 +00:00
parent 7e87245213
commit c2e74a7ca9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=123314
4 changed files with 14 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mail/spampd/Makefile
View file

@ -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/

4
mail/spampd/distinfo
View file

@ -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

63
mail/spampd/files/patch-2to3
View file

@ -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 ".

30
mail/spampd/files/patch-setsid
View file

@ -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,