[Python-modules-commits] r24544 - in packages/pyspf/trunk/debian (changelog patches/missed_py3)

[kitterman at users.alioth.debian.org]

    Date: Sunday, May 26, 2013 @ 04:02:56
  Author: kitterman
Revision: 24544

* Urgency medium because this issue has been reported to affect mail
  delivery
* Update debian/patches/missed_py3 to fix one additional instance of
  python3 incompatibility

Modified:
  packages/pyspf/trunk/debian/changelog
  packages/pyspf/trunk/debian/patches/missed_py3

Modified: packages/pyspf/trunk/debian/changelog
===================================================================
--- packages/pyspf/trunk/debian/changelog	2013-05-25 23:45:57 UTC (rev 24543)
+++ packages/pyspf/trunk/debian/changelog	2013-05-26 04:02:56 UTC (rev 24544)
@@ -1,9 +1,16 @@
-pyspf (2.0.7-4) UNRELEASED; urgency=low
+pyspf (2.0.7-4) unstable; urgency=medium
 
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:02:01 +0200
+  [ Scott Kitterman ]
+  * Urgency medium because this issue has been reported to affect mail
+    delivery
+  * Update debian/patches/missed_py3 to fix one additional instance of
+    python3 incompatibility
 
+ -- Scott Kitterman <scott at kitterman.com>  Sat, 25 May 2013 23:52:59 -0400
+
 pyspf (2.0.7-3) unstable; urgency=low
 
   * override dh_python3 to not act on spf-tools-python so that its shebangs

Modified: packages/pyspf/trunk/debian/patches/missed_py3
===================================================================
--- packages/pyspf/trunk/debian/patches/missed_py3	2013-05-25 23:45:57 UTC (rev 24543)
+++ packages/pyspf/trunk/debian/patches/missed_py3	2013-05-26 04:02:56 UTC (rev 24544)
@@ -4,9 +4,18 @@
 
 Index: pyspf-2.0.7/spf.py
 ===================================================================
---- pyspf-2.0.7.orig/spf.py	2012-02-09 17:05:32.039191110 -0500
-+++ pyspf-2.0.7/spf.py	2012-02-09 17:09:08.479184717 -0500
-@@ -1968,9 +1984,9 @@
+--- pyspf-2.0.7.orig/spf.py	2013-05-25 23:35:47.738250685 -0400
++++ pyspf-2.0.7/spf.py	2013-05-25 23:42:34.254238674 -0400
+@@ -1279,7 +1279,7 @@
+     def cidrmatch(self, ipaddrs, n):
+         """Match connect IP against a list of other IP addresses."""
+         try:
+-            if self.v == 'ip6':
++            if self.v == 'ip6' and sys.version_info[0] ==2:
+                 MASK = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+                 bin = bin2long6
+             else:
+@@ -1968,9 +1968,9 @@
      elif len(argv) == 3:
          q = query(i=argv[0], s=argv[1], h=argv[2],
              receiver=socket.gethostname(), verbose=verbose)