[Python-modules-commits] r31514 - in packages/pyspf/trunk/debian (6 files)

[kitterman at users.alioth.debian.org]

    Date: Sunday, November 30, 2014 @ 16:35:47
  Author: kitterman
Revision: 31514

* Backport upstream fix for multiple spaces between SPF record terms
  issue (Closes: #771547)
* Switch to source format 3.0(quilt) as the lowest impact way to add a
  patch system.

Added:
  packages/pyspf/trunk/debian/patches/
  packages/pyspf/trunk/debian/patches/fix-multispace.diff
  packages/pyspf/trunk/debian/patches/series
  packages/pyspf/trunk/debian/source/
  packages/pyspf/trunk/debian/source/format
Modified:
  packages/pyspf/trunk/debian/changelog

Modified: packages/pyspf/trunk/debian/changelog
===================================================================
--- packages/pyspf/trunk/debian/changelog	2014-11-30 00:48:25 UTC (rev 31513)
+++ packages/pyspf/trunk/debian/changelog	2014-11-30 16:35:47 UTC (rev 31514)
@@ -1,3 +1,12 @@
+pyspf (2.0.10-2) unstable; urgency=medium
+
+  * Backport upstream fix for multiple spaces between SPF record terms
+    issue (Closes: #771547)
+  * Switch to source format 3.0(quilt) as the lowest impact way to add a
+    patch system.
+
+ -- Scott Kitterman <scott at kitterman.com>  Sun, 30 Nov 2014 11:19:09 -0500
+
 pyspf (2.0.10-1) unstable; urgency=medium
 
   * New upstream release

Added: packages/pyspf/trunk/debian/patches/fix-multispace.diff
===================================================================
--- packages/pyspf/trunk/debian/patches/fix-multispace.diff	                        (rev 0)
+++ packages/pyspf/trunk/debian/patches/fix-multispace.diff	2014-11-30 16:35:47 UTC (rev 31514)
@@ -0,0 +1,27 @@
+Patch from upstream (will be included in pyspf 2.0.11).
+Index: pyspf-2.0.10/spf.py
+===================================================================
+--- pyspf-2.0.10.orig/spf.py	2014-09-02 15:17:08.000000000 -0400
++++ pyspf-2.0.10/spf.py	2014-11-30 11:25:24.175981174 -0500
+@@ -776,7 +776,11 @@
+ 
+         # Split string by space, drop the 'v=spf1'.  Split by all whitespace
+         # casuses things like carriage returns being treated as valid space
+-        # separators, so split() is not sufficient.
++        # separators, so split() is not sufficient.  Just to make it even more
++        # fun, the relevant piece of the ABNF for term separations is
++        # *( 1*SP ( directive / modifier ) ), so it's one or more spaces, not
++        # just one.  The re removes multiple spaces and then the split splits
++        # on the single remaining space.
+         spf = spf.split(' ')
+         # Catch case where SPF record has no spaces.
+         # Can never happen with conforming dns_spf(), however
+@@ -787,7 +791,7 @@
+             if self.strict > 1:
+                 raise AmbiguityWarning('Invalid SPF record in', self.d)
+             return ('none', 250, EXPLANATIONS['none'])
+-        spf = spf[1:]
++        spf = [mech for mech in spf[1:] if mech]
+ 
+         # copy of explanations to be modified by exp=
+         exps = self.exps

Added: packages/pyspf/trunk/debian/patches/series
===================================================================
--- packages/pyspf/trunk/debian/patches/series	                        (rev 0)
+++ packages/pyspf/trunk/debian/patches/series	2014-11-30 16:35:47 UTC (rev 31514)
@@ -0,0 +1 @@
+fix-multispace.diff

Added: packages/pyspf/trunk/debian/source/format
===================================================================
--- packages/pyspf/trunk/debian/source/format	                        (rev 0)
+++ packages/pyspf/trunk/debian/source/format	2014-11-30 16:35:47 UTC (rev 31514)
@@ -0,0 +1 @@
+3.0 (quilt)