mirror of
https://git.proxmox.com/git/proxmox-spamassassin
synced 2025-08-15 01:31:46 +00:00
buildsys: remove unused patches.
lintian warning patch-file-present-but-not-mentioned-in-series Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
This commit is contained in:
parent
045e8a7075
commit
e1661e5e4c
34
debian/patches/bug_760277_net_dns_URIDNSBL
vendored
34
debian/patches/bug_760277_net_dns_URIDNSBL
vendored
@ -1,34 +0,0 @@
|
|||||||
Description: Fix uninitialized values in URIDNSBL.pm with Net::DNS 1.01
|
|
||||||
Origin: upstream, https://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm?r1=1676616&r2=1694126&pathrev=1694126&view=patch
|
|
||||||
Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7231
|
|
||||||
Bug-Debian: https://bugs.debian.org/760277
|
|
||||||
Last-Update: 2016-09-29
|
|
||||||
---
|
|
||||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
|
||||||
--- a/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
|
|
||||||
+++ b/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
|
|
||||||
@@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
18
debian/patches/bug_821385_dnsresolver
vendored
18
debian/patches/bug_821385_dnsresolver
vendored
@ -1,18 +0,0 @@
|
|||||||
Origin: upstream, https://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/DnsResolver.pm?r1=1691992&r2=1691991&pathrev=1691992&view=patch
|
|
||||||
Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7223
|
|
||||||
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=821385
|
|
||||||
|
|
||||||
Index: spamassassin-3.4.1/lib/Mail/SpamAssassin/DnsResolver.pm
|
|
||||||
===================================================================
|
|
||||||
--- spamassassin-3.4.1.orig/lib/Mail/SpamAssassin/DnsResolver.pm
|
|
||||||
+++ spamassassin-3.4.1/lib/Mail/SpamAssassin/DnsResolver.pm
|
|
||||||
@@ -592,6 +592,9 @@ sub new_dns_packet {
|
|
||||||
};
|
|
||||||
|
|
||||||
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) {
|
|
13
debian/patches/bug_835494_perl_INC
vendored
13
debian/patches/bug_835494_perl_INC
vendored
@ -1,13 +0,0 @@
|
|||||||
Index: spamassassin-3.4.1/spamc/configure.pl
|
|
||||||
===================================================================
|
|
||||||
--- spamassassin-3.4.1.orig/spamc/configure.pl
|
|
||||||
+++ spamassassin-3.4.1/spamc/configure.pl
|
|
||||||
@@ -66,7 +66,7 @@ print join(' ', $Config{'perlpath'}, "ve
|
|
||||||
# Do the same thing as for the preprocessor below.
|
|
||||||
package version_h;
|
|
||||||
my $Z = $0;
|
|
||||||
- local $0 = "version.h.pl";
|
|
||||||
+ local $0 = "./version.h.pl";
|
|
||||||
local @ARGV = ();
|
|
||||||
# Got to check for defined because the script returns shell error level!
|
|
||||||
unless (defined do $0) {
|
|
64
debian/patches/dkim_subdomains
vendored
64
debian/patches/dkim_subdomains
vendored
@ -1,64 +0,0 @@
|
|||||||
Description: Support signer subdomain matching in whitelist_from_dkim
|
|
||||||
Origin: upstream, https://svn.apache.org/viewvc?view=revision&revision=1693414
|
|
||||||
Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7226
|
|
||||||
Index: spamassassin-3.4.1/lib/Mail/SpamAssassin/Plugin/DKIM.pm
|
|
||||||
===================================================================
|
|
||||||
--- spamassassin-3.4.1.orig/lib/Mail/SpamAssassin/Plugin/DKIM.pm
|
|
||||||
+++ spamassassin-3.4.1/lib/Mail/SpamAssassin/Plugin/DKIM.pm
|
|
||||||
@@ -178,13 +178,18 @@ sub set_config {
|
|
||||||
|
|
||||||
Works similarly to whitelist_from, except that in addition to matching
|
|
||||||
an author address (From) to the pattern in the first parameter, the message
|
|
||||||
-must also carry a Domain Keys Identified Mail (DKIM) signature made by a
|
|
||||||
-signing domain (SDID, i.e. the d= tag) that is acceptable to us.
|
|
||||||
+must also carry a valid Domain Keys Identified Mail (DKIM) signature made by
|
|
||||||
+a signing domain (SDID, i.e. the d= tag) that is acceptable to us.
|
|
||||||
|
|
||||||
Only one whitelist entry is allowed per line, as in C<whitelist_from_rcvd>.
|
|
||||||
Multiple C<whitelist_from_dkim> lines are allowed. File-glob style characters
|
|
||||||
are allowed for the From address (the first parameter), just like with
|
|
||||||
-C<whitelist_from_rcvd>. The second parameter does not accept wildcards.
|
|
||||||
+C<whitelist_from_rcvd>.
|
|
||||||
+
|
|
||||||
+The second parameter (the signing-domain) does not accept full file-glob style
|
|
||||||
+wildcards, although a simple '*.' (or just a '.') prefix to a domain name
|
|
||||||
+is recognized and implies any subdomain of the specified domain (but not
|
|
||||||
+the domain itself).
|
|
||||||
|
|
||||||
If no signing-domain parameter is specified, the only acceptable signature
|
|
||||||
will be an Author Domain Signature (sometimes called first-party signature)
|
|
||||||
@@ -205,7 +210,8 @@ Examples of whitelisting based on third-
|
|
||||||
whitelist_from_dkim jane@example.net example.org
|
|
||||||
whitelist_from_dkim rick@info.example.net example.net
|
|
||||||
whitelist_from_dkim *@info.example.net example.net
|
|
||||||
- whitelist_from_dkim *@* remailer.example.com
|
|
||||||
+ whitelist_from_dkim *@* mail7.remailer.example.com
|
|
||||||
+ whitelist_from_dkim *@* *.remailer.example.com
|
|
||||||
|
|
||||||
=item def_whitelist_from_dkim author@example.com [signing-domain]
|
|
||||||
|
|
||||||
@@ -376,7 +382,8 @@ some valid signature on a message has no
|
|
||||||
associated with a particular domain), regardless of its key size - anyone can
|
|
||||||
prepend its own signature on a copy of some third party mail and re-send it,
|
|
||||||
which makes it no more trustworthy than without such signature. This is also
|
|
||||||
-a reason for a rule DKIM_VALID to have a near-zero score.
|
|
||||||
+a reason for a rule DKIM_VALID to have a near-zero score, i.e. a rule hit
|
|
||||||
+is only informational.
|
|
||||||
|
|
||||||
=cut
|
|
||||||
|
|
||||||
@@ -1257,8 +1264,12 @@ sub _wlcheck_list {
|
|
||||||
# identity (AUID). Nevertheless, be prepared to accept the full e-mail
|
|
||||||
# address there for compatibility, and just ignore its local-part.
|
|
||||||
|
|
||||||
- $acceptable_sdid = $1 if $acceptable_sdid =~ /\@([^\@]*)\z/;
|
|
||||||
- $matches = 1 if $sdid eq lc $acceptable_sdid;
|
|
||||||
+ $acceptable_sdid = $1 if $acceptable_sdid =~ /\@([^\@]*)\z/s;
|
|
||||||
+ if ($acceptable_sdid =~ s/^\*?\.//s) {
|
|
||||||
+ $matches = 1 if $sdid =~ /\.\Q$acceptable_sdid\E\z/si;
|
|
||||||
+ } else {
|
|
||||||
+ $matches = 1 if $sdid eq lc $acceptable_sdid;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
if ($matches) {
|
|
||||||
if (would_log("dbg","dkim")) {
|
|
25
debian/patches/fix-uninitialized-concat
vendored
25
debian/patches/fix-uninitialized-concat
vendored
@ -1,25 +0,0 @@
|
|||||||
Description: Import upstream fix for uninitialized value warning in Mail::SpamAssassin::PerMsgStatus::get_names_of_tests_hit_with_scores()
|
|
||||||
Origin: https://svn.apache.org/viewvc?view=revision&revision=1685843
|
|
||||||
Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7212
|
|
||||||
Index: spamassassin-3.4.1/lib/Mail/SpamAssassin/PerMsgStatus.pm
|
|
||||||
===================================================================
|
|
||||||
--- spamassassin-3.4.1.orig/lib/Mail/SpamAssassin/PerMsgStatus.pm
|
|
||||||
+++ spamassassin-3.4.1/lib/Mail/SpamAssassin/PerMsgStatus.pm
|
|
||||||
@@ -738,7 +738,7 @@ test names and individual scores of the
|
|
||||||
sub get_names_of_tests_hit_with_scores_hash {
|
|
||||||
my ($self) = @_;
|
|
||||||
|
|
||||||
- my ($line, %testsscores);
|
|
||||||
+ my (%testsscores);
|
|
||||||
|
|
||||||
#BASED ON CODE FOR TESTSSCORES TAG - KAM 2014-04-24
|
|
||||||
foreach my $test (@{$self->{test_names_hit}}) {
|
|
||||||
@@ -763,6 +763,8 @@ sub get_names_of_tests_hit_with_scores {
|
|
||||||
|
|
||||||
my ($line, %testsscores);
|
|
||||||
|
|
||||||
+ $line = '';
|
|
||||||
+
|
|
||||||
#BASED ON CODE FOR TESTSSCORES TAG - KAM 2014-04-24
|
|
||||||
foreach my $test (sort @{$self->{test_names_hit}}) {
|
|
||||||
my $score = $self->{conf}->{scores}->{$test};
|
|
Loading…
Reference in New Issue
Block a user