diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 2003-10-08 02:57:00 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 2003-10-08 02:57:00 +0000 |
| commit | 6eb81045c223e5822be4f58d3a4418206b8de2d2 (patch) | |
| tree | b6dfe7d7ab075a1cad4c2313a062337fe6132dd7 /mail/ricochet | |
| parent | 2-1-b1 => 2.1.b1 (diff) | |
Strip only leading/trailing spaces when reading config values
(mainly for FROM_EMAIL)
Add > before first From_ header of spam message to avoid mail splitting
here by some MUAs.
Notes
Notes:
svn path=/head/; revision=90586
Diffstat (limited to 'mail/ricochet')
| -rw-r--r-- | mail/ricochet/Makefile | 2 | ||||
| -rw-r--r-- | mail/ricochet/files/patch-complaint | 9 | ||||
| -rw-r--r-- | mail/ricochet/files/patch-ricochet | 16 |
3 files changed, 23 insertions, 4 deletions
diff --git a/mail/ricochet/Makefile b/mail/ricochet/Makefile index e77830f4aede..335b1a0d4dcc 100644 --- a/mail/ricochet/Makefile +++ b/mail/ricochet/Makefile @@ -7,7 +7,7 @@ PORTNAME= ricochet PORTVERSION= 0.98 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://vipul.net/perl/sources/spamcontrol/ricochet/ diff --git a/mail/ricochet/files/patch-complaint b/mail/ricochet/files/patch-complaint new file mode 100644 index 000000000000..666f8df1e7f1 --- /dev/null +++ b/mail/ricochet/files/patch-complaint @@ -0,0 +1,9 @@ +--- complaint-template.bak Thu Feb 8 18:09:41 2001 ++++ complaint-template Wed Oct 8 06:50:31 2003 +@@ -14,5 +14,5 @@ + + ------------ unsolicited commercial mail follows ----------- + +-{return $self->spam} ++>{return $self->spam} + diff --git a/mail/ricochet/files/patch-ricochet b/mail/ricochet/files/patch-ricochet index 917a4043ae4b..328cbabbcaf3 100644 --- a/mail/ricochet/files/patch-ricochet +++ b/mail/ricochet/files/patch-ricochet @@ -1,5 +1,5 @@ ---- ricochet.old Tue Jun 24 22:40:18 2003 -+++ ricochet Wed Sep 24 16:33:42 2003 +--- ricochet.orig Tue Jun 24 22:40:18 2003 ++++ ricochet Wed Oct 8 06:42:08 2003 @@ -566,15 +566,14 @@ my ( $domain ) = @_; $ua = new LWP::UserAgent; @@ -19,7 +19,7 @@ return \@matches; } else { return undef; -@@ -607,7 +606,8 @@ +@@ -607,13 +606,17 @@ sub initialize { my $self = shift; @@ -29,3 +29,13 @@ Carp::croak "** Ricochet configuration file $rc doesn't exist. Aborting.\n" unless -e $rc; open (RC, $rc); grep { + chomp; + s/#.*$//; +- my ($field, $value) = split /:/, $_, 2; $value =~ s/\s//g; $field =~ s/\s//g; ++ my ($field, $value) = split /:/, $_, 2; ++ $value =~ s/^\s+//; ++ $value =~ s/\s+$//; ++ $field =~ s/\s//g; + $self->{$field} = $value unless $field ne "SENDMAIL" && defined $self->{$field}; + } (<RC>); + close RC; |