Spamassassin has received a couple updates in stable over the past few months that should also be propagated back to squeeze-lts. A proposed debdiff is attached. Let me know if I should go ahead with this upload, or if anything else is needed. noah
diff -Nru spamassassin-3.3.1/debian/changelog spamassassin-3.3.1/debian/changelog --- spamassassin-3.3.1/debian/changelog 2013-03-12 08:06:16.000000000 -0700 +++ spamassassin-3.3.1/debian/changelog 2015-01-31 22:51:43.000000000 -0800 @@ -1,3 +1,11 @@ +spamassassin (3.3.1-1.2) squeeze-lts; urgency=medium + + * Export perl_version to rules. (Closes: 771408) + * Remove references to ahbl.org DNSBL, which has ceased operation. + (Closes: #774768) + + -- Noah Meyerhans <noahm@debian.org> Sat, 31 Jan 2015 22:46:29 -0800 + spamassassin (3.3.1-1.1) stable; urgency=high * Fix the RCVD_ILLEGAL_IP rule to no longer consider addresses @@ -5,7 +13,7 @@ * Remove tests referencing the NJABL blacklist, which shut down as of 1 March, 2013. (Closes: #702839) - -- Noah Meyerhans <noahm@debian.org> Tue, 12 Mar 2013 08:06:07 -0700 + -- Noah Meyerhans <noahm@debian.org> Sat, 31 Jan 2015 22:46:23 -0800 spamassassin (3.3.1-1) unstable; urgency=low diff -Nru spamassassin-3.3.1/debian/patches/bug_771408_perl_version spamassassin-3.3.1/debian/patches/bug_771408_perl_version --- spamassassin-3.3.1/debian/patches/bug_771408_perl_version 1969-12-31 16:00:00.000000000 -0800 +++ spamassassin-3.3.1/debian/patches/bug_771408_perl_version 2015-01-31 22:42:41.000000000 -0800 @@ -0,0 +1,14 @@ +Index: spamassassin-3.3.2/lib/Mail/SpamAssassin/Conf/Parser.pm +=================================================================== +--- spamassassin-3.3.2.orig/lib/Mail/SpamAssassin/Conf/Parser.pm ++++ spamassassin-3.3.2/lib/Mail/SpamAssassin/Conf/Parser.pm +@@ -505,6 +505,9 @@ sub handle_conditional { + elsif ($token eq 'version') { + $eval .= $Mail::SpamAssassin::VERSION." "; + } ++ elsif ($token eq 'perl_version') { ++ $eval .= $]." "; ++ } + elsif ($token =~ /^\w[\w\:]+$/) { # class name + $eval .= '"' . untaint_var($token) . '" '; + } diff -Nru spamassassin-3.3.1/debian/patches/bug_774768_disable_ahbl spamassassin-3.3.1/debian/patches/bug_774768_disable_ahbl --- spamassassin-3.3.1/debian/patches/bug_774768_disable_ahbl 1969-12-31 16:00:00.000000000 -0800 +++ spamassassin-3.3.1/debian/patches/bug_774768_disable_ahbl 2015-01-31 22:44:25.000000000 -0800 @@ -0,0 +1,41 @@ +Index: spamassassin-3.3.1/pkgrules/20_dnsbl_tests.cf +=================================================================== +--- spamassassin-3.3.1.orig/pkgrules/20_dnsbl_tests.cf ++++ spamassassin-3.3.1/pkgrules/20_dnsbl_tests.cf +@@ -158,12 +158,6 @@ reuse __DNS_FROM_RFC_WHOIS DNS_FROM + # --------------------------------------------------------------------------- + # Now, single zone BLs follow: + +-# another domain-based blacklist +-header DNS_FROM_AHBL_RHSBL eval:check_rbl_envfrom('ahbl', 'rhsbl.ahbl.org.') +-describe DNS_FROM_AHBL_RHSBL Envelope sender listed in dnsbl.ahbl.org +-tflags DNS_FROM_AHBL_RHSBL net +-reuse DNS_FROM_AHBL_RHSBL +- + # --------------------------------------------------------------------------- + # NOTE: donation tests, see README file for details + +Index: spamassassin-3.3.1/pkgrules/30_text_de.cf +=================================================================== +--- spamassassin-3.3.1.orig/pkgrules/30_text_de.cf ++++ spamassassin-3.3.1/pkgrules/30_text_de.cf +@@ -90,7 +90,6 @@ lang de describe RCVD_IN_SBL Transportie + lang de describe RCVD_IN_XBL Transportiert via Rechner in XBL-Liste (http://www.spamhaus.org/xbl/) + lang de describe DNS_FROM_RFC_DSN Absender in dsn-Liste von www.rfc-ignorant.org + lang de describe DNS_FROM_RFC_BOGUSMX Absender in bogusmx-Liste von www.rfc-ignorant.org +-lang de describe DNS_FROM_AHBL_RHSBL Absenderadresse in Liste von dnsbl.ahbl.org + lang de describe RCVD_IN_BL_SPAMCOP_NET Transportiert via Rechner in Liste von www.spamcop.net + lang de describe RCVD_IN_MAPS_RBL Transportiert via Rechner in Liste von http://www.mail-abuse.org/rbl/ + lang de describe RCVD_IN_MAPS_DUL Transportiert via Rechner in Liste von http://www.mail-abuse.org/dul/ +Index: spamassassin-3.3.1/pkgrules/50_scores.cf +=================================================================== +--- spamassassin-3.3.1.orig/pkgrules/50_scores.cf ++++ spamassassin-3.3.1/pkgrules/50_scores.cf +@@ -744,7 +744,6 @@ score RCVD_IN_SORBS_WEB 0 0.614 0 0.770 + score RCVD_IN_SORBS_ZOMBIE 0 # n=0 n=1 n=2 n=3 + score RCVD_IN_XBL 0 0.724 0 0.375 # n=0 n=2 + score RCVD_IN_PBL 0 3.558 0 3.335 # n=0 n=2 +-score DNS_FROM_AHBL_RHSBL 0 2.438 0 2.699 # n=0 n=2 + score DNS_FROM_RFC_BOGUSMX 0 1.464 0 1.668 # n=0 n=2 + score DNS_FROM_RFC_DSN 0 0.001 0 0.001 # n=0 n=2 + score NO_DNS_FOR_FROM 0 0.379 0 0.001 # n=0 n=2 diff -Nru spamassassin-3.3.1/debian/patches/series spamassassin-3.3.1/debian/patches/series --- spamassassin-3.3.1/debian/patches/series 2013-03-12 08:02:16.000000000 -0700 +++ spamassassin-3.3.1/debian/patches/series 2015-01-31 22:47:53.000000000 -0800 @@ -7,3 +7,5 @@ 80_fix_man_warnings 85_fix_ip_delegation 96_disable_njabl +bug_771408_perl_version +bug_774768_disable_ahbl
Attachment:
signature.asc
Description: Digital signature