Here's the diff...

diff --git a/debian/changelog b/debian/changelog
index f8f1198..11cd5cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+spamassassin (3.4.0-5) unstable; urgency=medium
+
+  * Import upstream fix for perl_version warnings (Closes: 771408)
+
+ -- Noah Meyerhans <no...@debian.org>  Sat, 29 Nov 2014 11:48:48 -0800
+
 spamassassin (3.4.0-4) unstable; urgency=low
 
   * Improve detection of Net::DNS versions. (Closes: 766718)
diff --git a/debian/patches/bug_771408_perl_version b/debian/patches/bug_771408_perl_version
new file mode 100644
index 0000000..f746b88
--- /dev/null
+++ b/debian/patches/bug_771408_perl_version
@@ -0,0 +1,15 @@
+upstream fix for bug #771408
+Index: spamassassin-3.4.0/lib/Mail/SpamAssassin/Conf/Parser.pm
+===================================================================
+--- spamassassin-3.4.0.orig/lib/Mail/SpamAssassin/Conf/Parser.pm
++++ spamassassin-3.4.0/lib/Mail/SpamAssassin/Conf/Parser.pm
+@@ -533,6 +533,9 @@ sub handle_conditional {
+     elsif ($token eq 'version') {
+       $eval .= $Mail::SpamAssassin::VERSION." ";
+     }
++    elsif ($token eq 'perl_version') {
++      $eval .= $]." ";
++    }
+     elsif ($token =~ /^\w[\w\:]+$/) { # class name
+       my $u = untaint_var($token);
+       $eval .= '"' . $u . '" ';
diff --git a/debian/patches/series b/debian/patches/series
index 92b85f6..433efa9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 97_bug720499-pod-5.18
 98_sa-compile-quiet
 bug_766718-net-dns-vers
+bug_771408_perl_version

Reply via email to