spamassassin: update to 3.4.2.
This commit is contained in:
		| @@ -1,27 +0,0 @@ | ||||
| --- lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm	2015/04/28 20:36:05	1676616 | ||||
| +++ lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm	2015/08/04 23:16:38	1694126 | ||||
| @@ -942,9 +942,8 @@ | ||||
|      next unless (defined($str) && defined($dom)); | ||||
|      dbg("uridnsbl: got($j) NS for $dom: $str"); | ||||
|   | ||||
| -    if ($str =~ /IN\s+NS\s+(\S+)/) { | ||||
| -      my $nsmatch = lc $1; | ||||
| -      $nsmatch =~ s/\.$//; | ||||
| +    if ($rr->type eq 'NS') { | ||||
| +      my $nsmatch = lc $rr->nsdname;  # available since at least Net::DNS 0.14 | ||||
|        my $nsrhblstr = $nsmatch; | ||||
|        my $fullnsrhblstr = $nsmatch; | ||||
|   | ||||
| @@ -1025,9 +1024,9 @@ | ||||
|      } | ||||
|      dbg("uridnsbl: complete_a_lookup got(%d) A for %s: %s", $j,$hname,$str); | ||||
|   | ||||
| -    local $1; | ||||
| -    if ($str =~ /IN\s+A\s+(\S+)/) { | ||||
| -      $self->lookup_dnsbl_for_ip($pms, $ent->{obj}, $1); | ||||
| +    if ($rr->type eq 'A') { | ||||
| +      my $ip_address = $rr->rdatastr; | ||||
| +      $self->lookup_dnsbl_for_ip($pms, $ent->{obj}, $ip_address); | ||||
|      } | ||||
|    } | ||||
|  } | ||||
| @@ -1,14 +0,0 @@ | ||||
| https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7223 | ||||
|  | ||||
| --- lib/Mail/SpamAssassin/DnsResolver.pm	2015/07/20 18:23:18	1691991 | ||||
| +++ lib/Mail/SpamAssassin/DnsResolver.pm	2015/07/20 18:24:48	1691992 | ||||
| @@ -592,6 +592,9 @@ | ||||
|    }; | ||||
|   | ||||
|    if ($packet) { | ||||
| +    # RD flag needs to be set explicitly since Net::DNS 1.01, Bug 7223	 | ||||
| +    $packet->header->rd(1); | ||||
| + | ||||
|    # my $udp_payload_size = $self->{res}->udppacketsize; | ||||
|      my $udp_payload_size = $self->{conf}->{dns_options}->{edns}; | ||||
|      if ($udp_payload_size && $udp_payload_size > 512) { | ||||
| @@ -1,25 +0,0 @@ | ||||
| https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7369 | ||||
|  | ||||
| --- lib/Mail/SpamAssassin/PerMsgStatus.pm	2017/04/11 05:54:45	1790926 | ||||
| +++ lib/Mail/SpamAssassin/PerMsgStatus.pm	2017/04/11 18:56:16	1791013 | ||||
| @@ -916,16 +916,16 @@ | ||||
|      $str .= shift @{$ary}; | ||||
|    } | ||||
|    undef $ary; | ||||
| -  chomp ($str); $str .= " [...]\n"; | ||||
|   | ||||
|    # in case the last line was huge, trim it back to around 200 chars | ||||
|    local $1; | ||||
| -  $str =~ s/^(.{,200}).*$/$1/gs; | ||||
| +  $str =~ s/^(.{200}).+$/$1 [...]/gm; | ||||
| +  chomp ($str); $str .= "\n"; | ||||
|   | ||||
|    # now, some tidy-ups that make things look a bit prettier | ||||
| -  $str =~ s/-----Original Message-----.*$//gs; | ||||
| +  $str =~ s/-----Original Message-----.*$//gm; | ||||
|    $str =~ s/This is a multi-part message in MIME format\.//gs; | ||||
| -  $str =~ s/[-_\*\.]{10,}//gs; | ||||
| +  $str =~ s/[-_*.]{10,}//gs; | ||||
|    $str =~ s/\s+/ /gs; | ||||
|   | ||||
|    # add "Content preview:" ourselves, so that the text aligns | ||||
| @@ -1,7 +1,7 @@ | ||||
| # Template file for 'spamassassin' | ||||
| pkgname=spamassassin | ||||
| version=3.4.1 | ||||
| revision=4 | ||||
| version=3.4.2 | ||||
| revision=1 | ||||
| build_style=perl-module | ||||
| # Missing optional dependencies: | ||||
| #  Mail::SPF, Geo::IP, Razor2, Encode::Detect, Net::Patricia | ||||
| @@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.eu>" | ||||
| license="Apache-2.0" | ||||
| homepage="https://spamassassin.apache.org/" | ||||
| distfiles="http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${version}.tar.gz" | ||||
| checksum=9b7a95a594cdca4f265707364478b57813b82a0ec7e520d9bc818bfbcafdd726 | ||||
| checksum=8a1c139ee08f140d3d3fdf13e03d98cf68a5cae27a082c4a614d154565a3c34f | ||||
| wrksrc="Mail-SpamAssassin-${version}" | ||||
| nocross="https://build.voidlinux.eu/builders/armv6l-musl_builder/builds/9678" | ||||
| conf_files=" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Leah Neukirchen
					Leah Neukirchen