Bug#771495: pu: package spamassassin/3.3.2-5+deb7u2

[Noah Meyerhans <noahm@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: pu

Hi stable release team. I've prepared an update to spamassassin as
including in wheezy to fix bug 771408. This change is necessary to avoid
issuing warnings when invoking spamassassin, sa-learn, sa-update, etc on
systems using sa-update to refresh spamassassin's ruleset.  Please see
the attached debdiff against 3.3.2-5+deb7u1, which is currently in
stable.

This is similar to my unblock request for jessie in bug 771493.

Are we still releasing updates to oldstable? Should I prepare a similar
fix there?

Thanks
noah

diff -Nru spamassassin-3.3.2/debian/changelog spamassassin-3.3.2/debian/changelog
--- spamassassin-3.3.2/debian/changelog	2014-02-13 21:10:21.000000000 -0800
+++ spamassassin-3.3.2/debian/changelog	2014-11-29 22:57:14.000000000 -0800
@@ -1,3 +1,9 @@
+spamassassin (3.3.2-5+deb7u2) stable; urgency=medium
+
+  * Export perl_version to rules. (Closes: 771408)
+
+ -- Noah Meyerhans <noahm@debian.org>  Sat, 29 Nov 2014 22:51:40 -0800
+
 spamassassin (3.3.2-5+deb7u1) stable; urgency=low
 
   * Import Ubuntu's patch to remove 'xxx' from the list of common fake
diff -Nru spamassassin-3.3.2/debian/patches/bug_771408_perl_version spamassassin-3.3.2/debian/patches/bug_771408_perl_version
--- spamassassin-3.3.2/debian/patches/bug_771408_perl_version	1969-12-31 16:00:00.000000000 -0800
+++ spamassassin-3.3.2/debian/patches/bug_771408_perl_version	2014-11-29 22:57:14.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.2/debian/patches/series spamassassin-3.3.2/debian/patches/series
--- spamassassin-3.3.2/debian/patches/series	2014-02-13 21:09:06.000000000 -0800
+++ spamassassin-3.3.2/debian/patches/series	2014-11-29 22:57:14.000000000 -0800
@@ -10,3 +10,4 @@
 91_no_rfc_ignorant
 95_bug694504-spamdforkscaling-crash
 96_disable_njabl
+bug_771408_perl_version