"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "lib/Mail/SpamAssassin/Plugin/URILocalBL.pm" between
Mail-SpamAssassin-3.4.4.tar.bz2 and Mail-SpamAssassin-3.4.5.tar.bz2

About: SpamAssassin is a mail filter that uses a wide range of heuristic tests on mail headers and body text to identify "spam" (also known as unsolicited commercial email) incl. Bayesian (statistical) spam filter and several internet-based realtime blacklists.

URILocalBL.pm  (Mail-SpamAssassin-3.4.4.tar.bz2):URILocalBL.pm  (Mail-SpamAssassin-3.4.5.tar.bz2)
skipping to change at line 483 skipping to change at line 483
# need GeoIP C library 1.6.3 and GeoIP perl API 1.4.4 or later to avoid mess ages leaking - Bug 7153 # need GeoIP C library 1.6.3 and GeoIP perl API 1.4.4 or later to avoid mess ages leaking - Bug 7153
my $gic_wanted = version->parse('v1.6.3'); my $gic_wanted = version->parse('v1.6.3');
my $gic_have = version->parse(Geo::IP->lib_version()); my $gic_have = version->parse(Geo::IP->lib_version());
my $gip_wanted = version->parse('v1.4.4'); my $gip_wanted = version->parse('v1.4.4');
my $gip_have = version->parse($Geo::IP::VERSION); my $gip_have = version->parse($Geo::IP::VERSION);
# this code burps an ugly message if it fails, but that's redirected elsewhe re # this code burps an ugly message if it fails, but that's redirected elsewhe re
my $flags = 0; my $flags = 0;
my $flag_isp = 0; my $flag_isp = 0;
my $flag_silent = 0; my $flag_silent = 0;
eval '$flags = GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE' if ($gip_wanted >= $g eval '$flags = GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE' if ($gip_have >= $gip
ip_have); _wanted);
eval '$flag_silent = Geo::IP::GEOIP_SILENCE' if ($gip_wanted >= $gip_have); eval '$flag_silent = GEOIP_SILENCE' if ($gip_have >= $gip_wanted);
eval '$flag_isp = GEOIP_ISP_EDITION' if ($gip_wanted >= $gip_have); eval '$flag_isp = GEOIP_ISP_EDITION' if ($gip_have >= $gip_wanted);
eval { eval {
if ($flag_silent && $gic_wanted >= $gic_have) { if ($flag_silent && $gic_have >= $gic_wanted) {
$self->{geoip} = Geo::IP->new($flags | $flag_silent); $self->{geoip} = Geo::IP->new($flags | $flag_silent);
$self->{geoisp} = Geo::IP->open_type($flag_isp | $flag_silent | $flags); $self->{geoisp} = Geo::IP->open_type($flag_isp, $flag_silent | $flags);
} else { } else {
open(OLDERR, ">&STDERR"); open(OLDERR, ">&STDERR");
open(STDERR, ">", "/dev/null"); open(STDERR, ">", "/dev/null");
$self->{geoip} = Geo::IP->new($flags); $self->{geoip} = Geo::IP->new($flags);
$self->{geoisp} = Geo::IP->open_type($flag_isp); $self->{geoisp} = Geo::IP->open_type($flag_isp);
open(STDERR, ">&OLDERR"); open(STDERR, ">&OLDERR");
close(OLDERR); close(OLDERR);
} }
}; };
if ($@ || !($self->{geoip} || $self->{geoisp})) { if ($@ || !($self->{geoip} || $self->{geoisp})) {
 End of changes. 3 change blocks. 
6 lines changed or deleted 6 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)